Revert "media: enable Codec 2.0 by default"
This reverts commit 3c4b455145752aa57ee4777ac94e8b4c32fd59f7.
Reason for revert: Possibly causing b/132887737 and blocking presubmit
Change-Id: Ib6da7c3e1506965a5d2c202e8bd6cf0e4a81dc3c
diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
index c54c601..1919597 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", 4);
+ int option = ::android::base::GetIntProperty("debug.stagefright.ccodec", 1);
// Obtain Codec2Client
std::vector<Traits> traits = Codec2Client::ListComponents();
diff --git a/media/libstagefright/StagefrightPluginLoader.cpp b/media/libstagefright/StagefrightPluginLoader.cpp
index ee28966..b90649c 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("ro.media.codec2.enable", 1) == 0) {
+ if (android::base::GetIntProperty("debug.media.codec2", 0) == 0) {
ALOGD("CCodec is disabled.");
return;
}