commit 504394a06c1991dabd8c4601d7f923dc45d4190d
author Linus Nilsson <lnilsson@google.com> Wed Dec 16 11:10:10 2020 -0800
committer Linus Nilsson <lnilsson@google.com> Wed Dec 16 11:15:05 2020 -0800
tree 70486b4225008fb9956ed20b918677d25a1608ec
parent 204fafe47572aa3362658aebaf84f9c860b64bcf

Transcoder: Don't set operating rate for 4K

4K is failing on some devices due to operating rate.

Bug: 175406816
Test: Unit test
Change-Id: I9b518ad34fed1a8c5ba8aa86a37099f1aada1f60

media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp

diff --git a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp b/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
index 22ab7a5..0695bdb 100644
--- a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
+++ b/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
@@ -40,12 +40,10 @@
 // Default key frame interval in seconds.
 static constexpr float kDefaultKeyFrameIntervalSeconds = 1.0f;
 // Default codec operating rate.
-static int32_t kDefaultCodecOperatingRate7200P = base::GetIntProperty(
+static int32_t kDefaultCodecOperatingRate720P = base::GetIntProperty(
         "debug.media.transcoding.codec_max_operating_rate_720P", /*default*/ 480);
 static int32_t kDefaultCodecOperatingRate1080P = base::GetIntProperty(
         "debug.media.transcoding.codec_max_operating_rate_1080P", /*default*/ 240);
-static int32_t kDefaultCodecOperatingRate4K = base::GetIntProperty(
-        "debug.media.transcoding.codec_max_operating_rate_4K", /*default*/ 120);
 // Default codec priority.
 static constexpr int32_t kDefaultCodecPriority = 1;
 // Default bitrate, in case source estimation fails.
@@ -193,15 +191,12 @@
     if (AMediaFormat_getInt32(encoderFormat, AMEDIAFORMAT_KEY_WIDTH, &width) && (width > 0) &&
         AMediaFormat_getInt32(encoderFormat, AMEDIAFORMAT_KEY_HEIGHT, &height) && (height > 0)) {
         if ((width == 1280 && height == 720) || (width == 720 && height == 1280)) {
-            return kDefaultCodecOperatingRate1080P;
+            return kDefaultCodecOperatingRate720P;
         } else if ((width == 1920 && height == 1080) || (width == 1080 && height == 1920)) {
             return kDefaultCodecOperatingRate1080P;
-        } else if (((width == 3840 && height == 2160) || (width == 2160 && height == 3840))) {
-            return kDefaultCodecOperatingRate4K;
         } else {
             LOG(WARNING) << "Could not find default operating rate: " << width << " " << height;
-            // Use 4K as that should be the lowest for the devices.
-            return kDefaultCodecOperatingRate4K;
+            // Don't set operating rate if the correct dimensions are not found.
         }
     } else {
         LOG(ERROR) << "Failed to get default operating rate due to missing resolution";