commit 2c7246b900bfa78e09759ca1de3b74a9c594b37f
author Jean-Michel Trivi <jmtrivi@google.com> Wed May 09 14:10:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 09 14:10:16 2018 -0700
tree 4ef9748a87680c98cdbf92f453cbe450d118d9df
parent 8962c5352d4a9e83ddb83772bc3c4fdcaf2a346e
parent 725128d79e5cd98cc3f289586a3a4b4d4619ec6f

Merge "AAC decoder reads default DRC effect type" into pi-dev
am: 725128d79e

Change-Id: I298c332e7067bc9adc4dd0b0fddb182605cd2f3a

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index ecd2512..417ca55 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -45,7 +45,7 @@
 #define PROP_DRC_OVERRIDE_BOOST      "aac_drc_boost"
 #define PROP_DRC_OVERRIDE_HEAVY      "aac_drc_heavy"
 #define PROP_DRC_OVERRIDE_ENC_LEVEL "aac_drc_enc_target_level"
-#define PROP_DRC_OVERRIDE_EFFECT     "aac_drc_effect_type"
+#define PROP_DRC_OVERRIDE_EFFECT     "ro.aac_drc_effect_type"
 
 namespace android {
 
@@ -210,10 +210,8 @@
         mDrcWrap.setParam(DRC_PRES_MODE_WRAP_ENCODER_TARGET, DRC_DEFAULT_MOBILE_ENC_LEVEL);
     }
     // AAC_UNIDRC_SET_EFFECT
-    int32_t effectType = DRC_DEFAULT_MOBILE_DRC_EFFECT;
-    // FIXME can't read default property for DRC effect type
-    //int32_t effectType =
-    //        property_get_int32(PROP_DRC_OVERRIDE_EFFECT, DRC_DEFAULT_MOBILE_DRC_EFFECT);
+    int32_t effectType =
+            property_get_int32(PROP_DRC_OVERRIDE_EFFECT, DRC_DEFAULT_MOBILE_DRC_EFFECT);
     if (effectType < -1 || effectType > 8) {
         effectType = DRC_DEFAULT_MOBILE_DRC_EFFECT;
     }