diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-16 02:39:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-16 02:39:38 +0000 |
| commit | 30d7b4883bf3198bfba0d0acf14e0bcbb67716d1 (patch) | |
| tree | a3c16d8833d2479acc82d8392d2a8d178cc777ea /media | |
| parent | 187b196e48ed6ea655c7a0e48908d92d670627a8 (diff) | |
| parent | ebada74ec20c6bd46e81d2f4c160ac176c10784d (diff) | |
| download | frameworks_av-30d7b4883bf3198bfba0d0acf14e0bcbb67716d1.zip frameworks_av-30d7b4883bf3198bfba0d0acf14e0bcbb67716d1.tar.gz frameworks_av-30d7b4883bf3198bfba0d0acf14e0bcbb67716d1.tar.bz2 | |
Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 9f20b1d..91d9db5 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -2800,8 +2800,10 @@ void MPEG4Writer::Track::writeMp4aEsdsBox() { mOwner->writeInt16(0x03); // XXX mOwner->writeInt8(0x00); // buffer size 24-bit - mOwner->writeInt32(96000); // max bit rate - mOwner->writeInt32(96000); // avg bit rate + int32_t bitRate; + bool success = mMeta->findInt32(kKeyBitRate, &bitRate); + mOwner->writeInt32(success ? bitRate : 96000); // max bit rate + mOwner->writeInt32(success ? bitRate : 96000); // avg bit rate mOwner->writeInt8(0x05); // DecoderSpecificInfoTag mOwner->writeInt8(mCodecSpecificDataSize); |