commit 4f60bb544bd286b32e1a41e49de9169e48f1e383
author Ray Essick <essick@google.com> Thu Apr 08 20:59:05 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 08 20:59:05 2021 +0000
tree e814032cce02295c074f4d4c6e41488c674b687a
parent 04e3155367e27568c46864af3e76b8231ce41c63
parent d71c11da39ce78b52aefc7263afd19951db1474a

Merge "Enable media format shaping by default" into sc-dev

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index ad67379..c21ea8f 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1422,6 +1422,7 @@
  * MediaFormat Shaping forward declarations
  * including the property name we use for control.
  */
+static int enableMediaFormatShapingDefault = 1;
 static const char enableMediaFormatShapingProperty[] = "debug.stagefright.enableshaping";
 static void mapFormat(AString componentName, const sp<AMessage> &format, const char *kind,
                       bool reverse);
@@ -1497,7 +1498,8 @@
     }
 
     if (flags & CONFIGURE_FLAG_ENCODE) {
-        int8_t enableShaping = property_get_bool(enableMediaFormatShapingProperty, 0);
+        int8_t enableShaping = property_get_bool(enableMediaFormatShapingProperty,
+                                                 enableMediaFormatShapingDefault);
         if (!enableShaping) {
             ALOGI("format shaping disabled, property '%s'", enableMediaFormatShapingProperty);
         } else {