commit 498f828eb0b122247773f41baedaec327fbea7ac
author Shuhei,Miyazaki <shuhei.miyazaki@sonymobile.com> Mon Sep 25 18:03:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 25 18:03:02 2017 +0000
tree 5d17bcae9367e0e2caa6ceffe4600844b11ef066
parent 15af32c526056ae99cb0c07b719c5876cf59c91a
parent 0267f8c82ae2bb1d80107e0b68d2554be35363aa

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

Change-Id: Iead730511d4b2c40a2b7f720e79c747b9d4edaa1

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 6f178ae..54c2362 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3517,6 +3517,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(