diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-16 03:17:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 03:17:43 +0000 |
| commit | c08efe00b75f86dfdf92a6c2a996f8099af21e09 (patch) | |
| tree | 51744512d6970446381e68c4c49373453359da04 /media/libstagefright/MPEG4Writer.cpp | |
| parent | 3409cc3405d5a2553e524b56d831d0218f5b906c (diff) | |
| parent | f16511ca737b8bf8a33ce589a28630e98c3aaae5 (diff) | |
| download | frameworks_av-c08efe00b75f86dfdf92a6c2a996f8099af21e09.zip frameworks_av-c08efe00b75f86dfdf92a6c2a996f8099af21e09.tar.gz frameworks_av-c08efe00b75f86dfdf92a6c2a996f8099af21e09.tar.bz2 | |
am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"
* commit 'f16511ca737b8bf8a33ce589a28630e98c3aaae5':
MPEG4Writer: Set the correct audio bit rate for camera recorded content
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
| -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 6f6e362..9882695 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -2839,8 +2839,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); |