diff options
author | Glenn Kasten <gkasten@google.com> | 2013-02-27 09:39:39 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-02-27 09:39:55 -0800 |
commit | 3c3c527a792249d07938c5c6cb9b465344a22383 (patch) | |
tree | 07e9c4f4902d084c29f6c5ab6d688f3ecbba9f4c | |
parent | 48af7e8dd40883d6154e7029d9500072b551b5fa (diff) | |
download | frameworks_av-3c3c527a792249d07938c5c6cb9b465344a22383.zip frameworks_av-3c3c527a792249d07938c5c6cb9b465344a22383.tar.gz frameworks_av-3c3c527a792249d07938c5c6cb9b465344a22383.tar.bz2 |
Revert "Logging to investigate a crash"
This reverts commit f0ff908da019a44115109f1b4d1b6864b35a8a29.
-rw-r--r-- | include/media/AudioBufferProvider.h | 12 | ||||
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 6 |
2 files changed, 1 insertions, 17 deletions
diff --git a/include/media/AudioBufferProvider.h b/include/media/AudioBufferProvider.h index 865ed7e..43e4de7 100644 --- a/include/media/AudioBufferProvider.h +++ b/include/media/AudioBufferProvider.h @@ -36,11 +36,8 @@ public: size_t frameCount; }; -protected: - AudioBufferProvider() : mValid(kValid) { } - virtual ~AudioBufferProvider() { mValid = kDead; } + virtual ~AudioBufferProvider() {} -public: // value representing an invalid presentation timestamp static const int64_t kInvalidPTS = 0x7FFFFFFFFFFFFFFFLL; // <stdint.h> is too painful @@ -50,13 +47,6 @@ public: virtual status_t getNextBuffer(Buffer* buffer, int64_t pts = kInvalidPTS) = 0; virtual void releaseBuffer(Buffer* buffer) = 0; - - int getValid() const { return mValid; } - static const int kValid = 'GOOD'; - static const int kDead = 'DEAD'; - -private: - int mValid; }; // ---------------------------------------------------------------------------- diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 2a8a955..17b6a8a 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -1113,12 +1113,6 @@ void AudioMixer::process__genericNoResampling(state_t* state, int64_t pts) e0 &= ~(1<<i); track_t& t = state->tracks[i]; t.buffer.frameCount = state->frameCount; - int valid = t.bufferProvider->getValid(); - if (valid != AudioBufferProvider::kValid) { - ALOGE("invalid bufferProvider=%p name=%d frameCount=%d valid=%#x enabledTracks=%#x", - t.bufferProvider, i, t.buffer.frameCount, valid, enabledTracks); - // expect to crash - } t.bufferProvider->getNextBuffer(&t.buffer, pts); t.frameCount = t.buffer.frameCount; t.in = t.buffer.raw; |