diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-16 02:54:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 02:54:59 +0000 |
| commit | 0a4d22e5385755049bb2ebc684255ba5e9ae2ec7 (patch) | |
| tree | 354cd01562989cec513ae9163d6fd014b0285f45 /media | |
| parent | e7a53499125586272adb2c7592db5c4038dabe3b (diff) | |
| parent | 9985f6af71061c9340fffa9a6e7c8fea5dac04ab (diff) | |
| download | frameworks_av-0a4d22e5385755049bb2ebc684255ba5e9ae2ec7.zip frameworks_av-0a4d22e5385755049bb2ebc684255ba5e9ae2ec7.tar.gz frameworks_av-0a4d22e5385755049bb2ebc684255ba5e9ae2ec7.tar.bz2 | |
am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"
* commit '9985f6af71061c9340fffa9a6e7c8fea5dac04ab':
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); |