commit f79de9a284e5685dadc668b04132457bdb1bda05
author Shuhei,Miyazaki <shuhei.miyazaki@sonymobile.com> Mon Sep 25 18:05:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 25 18:05:03 2017 +0000
tree 2ccce80d56268f7355978663465825db1dcef26b
parent 7725397209b78f857c79f81c146d0113591bab52
parent 498f828eb0b122247773f41baedaec327fbea7ac

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

Change-Id: Ie32caf77d8a59da446d28e4dc3e629f64dd52090

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index f112b10..27599be 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(