commit babfa822d539837e2029ae7805c782a859addd96
author Eric Laurent <elaurent@google.com> Mon Mar 29 16:57:37 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 29 16:57:37 2021 +0000
tree 3040eb94c67a58e7607cb9f615afe29ca2f210b9
parent 80f8f542970b677d25f4bd55a4dd77d185a5655b
parent 9fee705b22a4e17b4e5a3771c7e78346410b3257

Merge changes I4ff28737,I8433c40a into sc-dev am: 9fee705b22

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13996967

Change-Id: I7fe94a182537ac323c9beb8ce3b08f9f0629e977

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index 6a8c708..4a65f71 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -1962,7 +1962,7 @@
             ALOGV("Mime \"%s\" mapped to audio_format 0x%x",
                     mime.c_str(), audioFormat);
 
-            int avgBitRate = -1;
+            int avgBitRate = 0;
             format->findInt32("bitrate", &avgBitRate);
 
             int32_t aacProfile = -1;

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 51d9730..5ede871 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -2169,7 +2169,7 @@
     }
     info->duration_us = duration;
 
-    int32_t brate = -1;
+    int32_t brate = 0;
     if (!meta->findInt32(kKeyBitRate, &brate)) {
         ALOGV("track of type '%s' does not publish bitrate", mime);
     }