Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ea03126 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "Revert "media: enable Codec 2.0 by default""

parents d30ed8b9 61363834

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -313,7 +313,7 @@ status_t Codec2InfoBuilder::buildMediaCodecList(MediaCodecListWriter* writer) { 
    //

    //

    // Note: Currently, OMX components have default rank 0x100, while all

    // Note: Currently, OMX components have default rank 0x100, while all

    // Codec2.0 software components have default rank 0x200.

    // 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

    // Obtain Codec2Client

    std::vector<Traits> traits = Codec2Client::ListComponents();

    std::vector<Traits> traits = Codec2Client::ListComponents();

media/libstagefright/StagefrightPluginLoader.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ constexpr const char kCCodecPluginPath[] = "libsfplugin_ccodec.so"; 
}  // unnamed namespace

}  // unnamed namespace





StagefrightPluginLoader::StagefrightPluginLoader(const char *libPath) {

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.");

        ALOGD("CCodec is disabled.");

        return;

        return;

    }

    }