commit ad764cd0e198a0ede404c53e2da5fd38ecb1e049
author Shuhei,Miyazaki <shuhei.miyazaki@sonymobile.com> Mon Sep 25 18:07:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 25 18:07:32 2017 +0000
tree 84bd707d04361d3e3eac3d9a55ac9c149fb76053
parent d0ca2f28eb68c9e506e67f2d2bb00cb9fc92a51c
parent f79de9a284e5685dadc668b04132457bdb1bda05

Merge "Set bit rate infomation to meta for MPEG4Extractor" am: 4b4727f06f am: 0267f8c82a am: 498f828eb0
am: f79de9a284

Change-Id: I520c4c3ac7107d406d57caf1dd76acf3d59d565f

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index e130b4a..cef4945 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3543,6 +3543,18 @@
         return ERROR_UNSUPPORTED;
     }
 
+    if (mLastTrack != NULL) {
+        uint32_t maxBitrate = 0;
+        uint32_t avgBitrate = 0;
+        esds.getBitRate(&maxBitrate, &avgBitrate);
+        if (maxBitrate > 0 && maxBitrate < INT32_MAX) {
+            mLastTrack->meta->setInt32(kKeyMaxBitRate, (int32_t)maxBitrate);
+        }
+        if (avgBitrate > 0 && avgBitrate < INT32_MAX) {
+            mLastTrack->meta->setInt32(kKeyBitRate, (int32_t)avgBitrate);
+        }
+    }
+
     const uint8_t *csd;
     size_t csd_size;
     if (esds.getCodecSpecificInfo(