commit 9a4c8ebc809ec927ff1332c24c4fdfec0c8be051
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed May 29 15:41:20 2019 -0700
committer Wonsik Kim <wonsik@google.com> Fri May 31 12:10:42 2019 -0700
tree 00eca968b9fa305fe5c7fd4d74230f53e69ec465
parent 8cce89de1ae336910f2f5b5d20e027671f34396e

codec2: Remove quality from output format for CBR, VBR mode

Test: Manually verify output format using AMediaCodec based application
Test: atest android.media.cts.VideoEncoderTest#testGoogH265FlexMaxMax
Bug: 133263311

Change-Id: If084d33c7cf114874fa7db86b0561efdee0725d5

media/codec2/sfplugin/CCodecConfig.cpp

diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp
index 4c3fff7..077a91f 100644
--- a/media/codec2/sfplugin/CCodecConfig.cpp
+++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -532,7 +532,6 @@
             }
             return C2Value();
         }));
-    add(ConfigMapper(KEY_QUALITY, C2_PARAMKEY_QUALITY, "value"));
     deprecated(ConfigMapper(PARAMETER_KEY_REQUEST_SYNC_FRAME,
                      "coding.request-sync", "value")
         .limitTo(D::PARAM & D::ENCODER)
@@ -798,11 +797,12 @@
             }
         }));
 
-    add(ConfigMapper(KEY_QUALITY, C2_PARAMKEY_QUALITY, "value"));
+    add(ConfigMapper(KEY_QUALITY, C2_PARAMKEY_QUALITY, "value")
+        .limitTo(D::ENCODER & (D::CONFIG | D::PARAM)));
     add(ConfigMapper(KEY_FLAC_COMPRESSION_LEVEL, C2_PARAMKEY_COMPLEXITY, "value")
         .limitTo(D::AUDIO & D::ENCODER));
     add(ConfigMapper("complexity", C2_PARAMKEY_COMPLEXITY, "value")
-        .limitTo(D::ENCODER));
+        .limitTo(D::ENCODER & (D::CONFIG | D::PARAM)));
 
     add(ConfigMapper(KEY_GRID_COLUMNS, C2_PARAMKEY_TILE_LAYOUT, "columns")
         .limitTo(D::IMAGE));