diff options
| -rw-r--r-- | include/media/AudioBufferProvider.h | 12 | ||||
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 3 | ||||
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 6 |
3 files changed, 3 insertions, 18 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/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 14986b2..056b47a 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -2612,7 +2612,8 @@ void MPEG4Writer::Track::writeVideoFourCCBox() { mOwner->writeInt32(0x480000); // vert resolution mOwner->writeInt32(0); // reserved mOwner->writeInt16(1); // frame count - mOwner->write(" ", 32); + mOwner->writeInt8(0); // compressor string length + mOwner->write(" ", 31); mOwner->writeInt16(0x18); // depth mOwner->writeInt16(-1); // predefined 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; |