commit 597435f828316dca72cbb25759fc5141cbd6a32b
author Wonsik Kim <wonsik@google.com> Tue Oct 27 17:02:51 2020 -0700
committer Wonsik Kim <wonsik@google.com> Fri Feb 12 12:41:58 2021 -0800
tree 2329016b28ca5195b8549eee2f1520bffb6f15c8
parent 65a62a34a1908903979cf117c66570a345d4414a

RELAND aacdec: don't report DRC_COMPRESSION_MODE back

DRC_COMPRESSION_MODE is not meant to be read back from components

Bug: 149751672
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Test: atest CtsMediaTestCases:DecoderTestAacDrc
Change-Id: I39f15cc497e7e9d7a5c651ad32bf9a3671f286a1

media/codec2/components/aac/C2SoftAacDec.cpp

diff --git a/media/codec2/components/aac/C2SoftAacDec.cpp b/media/codec2/components/aac/C2SoftAacDec.cpp
index f3341ab..3e6b0ff 100644
--- a/media/codec2/components/aac/C2SoftAacDec.cpp
+++ b/media/codec2/components/aac/C2SoftAacDec.cpp
@@ -877,10 +877,14 @@
             work->worklets.front()->output.configUpdate.push_back(
                     C2Param::Copy(currentBoostFactor));
 
-            C2StreamDrcCompressionModeTuning::input currentCompressMode(0u,
-                    (C2Config::drc_compression_mode_t) compressMode);
-            work->worklets.front()->output.configUpdate.push_back(
-                    C2Param::Copy(currentCompressMode));
+            if (android_get_device_api_level() < __ANDROID_API_S__) {
+                // We used to report DRC compression mode in the output format
+                // in Q and R, but stopped doing that in S
+                C2StreamDrcCompressionModeTuning::input currentCompressMode(0u,
+                        (C2Config::drc_compression_mode_t) compressMode);
+                work->worklets.front()->output.configUpdate.push_back(
+                        C2Param::Copy(currentCompressMode));
+            }
 
             C2StreamDrcEncodedTargetLevelTuning::input currentEncodedTargetLevel(0u,
                     (C2FloatValue) (encTargetLevel*-0.25));