commit 3c4b455145752aa57ee4777ac94e8b4c32fd59f7
author Lajos Molnar <lajos@google.com> Fri May 10 22:06:40 2019 -0700
committer Lajos Molnar <lajos@google.com> Mon May 13 15:26:40 2019 -0700
tree 102ee0819f59326a29e13ee04462b227b4391ca1
parent 00ffd9e0c4cd97529b77248eae5c819a7d3f8a13

media: enable Codec 2.0 by default

Bug: 129710438
Change-Id: Idb114c7a95f9e751788f36850f0e8299eb805c9d

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..ee28966 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("ro.media.codec2.enable", 1) == 0) {
         ALOGD("CCodec is disabled.");
         return;
     }