commit 4f1b69083719207f8cde2a6bf22bd3ebef80fdd8
author Lajos Molnar <lajos@google.com> Sat May 18 05:32:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 18 05:32:23 2019 +0000
tree 52df7fe644069290cb13c0405a89317454afc4d9
parent 62acb7fbe65ea28c4a277327bdfbe92ebd201305
parent 8635fc832085b0548b40232b13646bbca15842ff

Merge "media: enable Codec 2.0 by default again" into qt-dev

media/codec2/sfplugin/Codec2InfoBuilder.cpp

diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
index 1919597..c54c601 100644
--- a/media/codec2/sfplugin/Codec2InfoBuilder.cpp
+++ b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
@@ -313,7 +313,7 @@
     //
     // Note: Currently, OMX components have default rank 0x100, while all
     // Codec2.0 software components have default rank 0x200.
-    int option = ::android::base::GetIntProperty("debug.stagefright.ccodec", 1);
+    int option = ::android::base::GetIntProperty("debug.stagefright.ccodec", 4);
 
     // Obtain Codec2Client
     std::vector<Traits> traits = Codec2Client::ListComponents();

media/libstagefright/StagefrightPluginLoader.cpp

diff --git a/media/libstagefright/StagefrightPluginLoader.cpp b/media/libstagefright/StagefrightPluginLoader.cpp
index b90649c..fb03c5e 100644
--- a/media/libstagefright/StagefrightPluginLoader.cpp
+++ b/media/libstagefright/StagefrightPluginLoader.cpp
@@ -35,7 +35,7 @@
 }  // unnamed namespace
 
 StagefrightPluginLoader::StagefrightPluginLoader(const char *libPath) {
-    if (android::base::GetIntProperty("debug.media.codec2", 0) == 0) {
+    if (android::base::GetIntProperty("debug.stagefright.ccodec", 1) == 0) {
         ALOGD("CCodec is disabled.");
         return;
     }