commit 1184f93913a0ebda5234c3b4c040e0c0079e8ebf
author Linus Nilsson <lnilsson@google.com> Mon Apr 12 16:13:39 2021 -0700
committer Linus Nilsson <lnilsson@google.com> Mon Apr 12 16:34:53 2021 -0700
tree d98f7c5fde06b043839f92431ef4604278d84821
parent 02ebd761a23f00365816f1eb84d2e1604844d713

Transcoder: Don't fail test if codec changes configured bitrate.

Change VideoTrackTranscoderTests#PreserveBitrate to check the
bitrate passed in to the encoder rather than what comes out of the encoder.
Recent minimum quality work allows the encoder to "shape" the
MediaFormat if the quality is too low. This test triggered that.

Test: Transcoder unit test
Fixes: 184920307
Change-Id: Ia5edfc86ff1dff28d591cb5c011f26f9febd7a1d

media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp

diff --git a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp b/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
index 4405180..d56bec0 100644
--- a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
+++ b/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
@@ -220,16 +220,15 @@
         return AMEDIA_ERROR_INVALID_PARAMETER;
     }
 
-    int32_t bitrate;
-    if (!AMediaFormat_getInt32(encoderFormat, AMEDIAFORMAT_KEY_BIT_RATE, &bitrate)) {
-        status = mMediaSampleReader->getEstimatedBitrateForTrack(mTrackIndex, &bitrate);
+    if (!AMediaFormat_getInt32(encoderFormat, AMEDIAFORMAT_KEY_BIT_RATE, &mConfiguredBitrate)) {
+        status = mMediaSampleReader->getEstimatedBitrateForTrack(mTrackIndex, &mConfiguredBitrate);
         if (status != AMEDIA_OK) {
             LOG(ERROR) << "Unable to estimate bitrate. Using default " << kDefaultBitrateMbps;
-            bitrate = kDefaultBitrateMbps;
+            mConfiguredBitrate = kDefaultBitrateMbps;
         }
 
-        LOG(INFO) << "Configuring bitrate " << bitrate;
-        AMediaFormat_setInt32(encoderFormat, AMEDIAFORMAT_KEY_BIT_RATE, bitrate);
+        LOG(INFO) << "Configuring bitrate " << mConfiguredBitrate;
+        AMediaFormat_setInt32(encoderFormat, AMEDIAFORMAT_KEY_BIT_RATE, mConfiguredBitrate);
     }
 
     SetDefaultFormatValueFloat(AMEDIAFORMAT_KEY_I_FRAME_INTERVAL, encoderFormat,