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

Commit fd41a706 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Enable CodecBase plugin in MediaCodec by default" into pi-dev 

am: 9f39994c

Change-Id: I6f1a0a60ddd982c21b67cd52407d582a53e514af
parents b33e0b07 9f39994c

media/libstagefright/MediaCodec.cpp

+1 −2
Original line number Diff line number Diff line
@@ -854,8 +854,7 @@ static CodecBase *CreateCCodec() { 


//static

sp<CodecBase> MediaCodec::GetCodecBase(const AString &name) {

    static bool ccodecEnabled = property_get_bool("debug.stagefright.ccodec", false);

    if (ccodecEnabled && name.startsWithIgnoreCase("c2.")) {

    if (name.startsWithIgnoreCase("c2.")) {

        return CreateCCodec();

    } else if (name.startsWithIgnoreCase("omx.")) {

        // at this time only ACodec specifies a mime type.

media/libstagefright/MediaCodecList.cpp

+1 −3
Original line number Diff line number Diff line
@@ -93,9 +93,7 @@ MediaCodecListBuilderBase *GetCodec2InfoBuilder() { 


std::vector<MediaCodecListBuilderBase *> GetBuilders() {

    std::vector<MediaCodecListBuilderBase *> builders {&sOmxInfoBuilder};

    if (property_get_bool("debug.stagefright.ccodec", false)) {

    builders.push_back(GetCodec2InfoBuilder());

    }

    return builders;

}