From c761a965c57c48b3bdb3ba1c06064c208ad52936 Mon Sep 17 00:00:00 2001
From: "Shuhei,Miyazaki" <shuhei.miyazaki@sonymobile.com>
Date: Fri, 9 Dec 2016 15:06:00 +0900
Subject: [PATCH] Set bit rate infomation to meta for MPEG4Extractor

In order to get bit rate information correctly for offload,
Set Max Bitrate and average bitrate to meta
when MPEG4Extractor is used.

Bug: 66376238
Test: Playback AAC file then check sound.
Change-Id: Ie357c3c94db3ee894333be9659001c46b9ddcef8
---
 media/libstagefright/MPEG4Extractor.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 941c759fca..489d6c65d4 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3467,6 +3467,18 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
         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(