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

Commit c4f2a4f4 authored by Divya Narayanan Poojary's avatar Divya Narayanan Poojary
Browse files

audio : Fixed usage of QTI_FLAC_DECODER 

QTI FLAC Decoder specific code is not placed under QTI_FLAC_DECODER
properly in some places in the framework. This is causing an issue for
the customer who has their own FLACDecoder.

Made sure that Qcom FLAC specific code is placed properly under
QTI_FLAC_DECODER

Change-Id: Ifc49f86643412095682477f35659760b228ec633
CRs-fixed: 769129
parent 83b3831b

media/libmediaplayerservice/MediaPlayerFactory.cpp

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ class StagefrightPlayerFactory : 
                               int64_t /*length*/,

                               float /*curScore*/) {



#ifdef QTI_FLAC_DECODER

        // Flac playback forced to Awesomeplayer

        if (fd) {

            char symName[40] = {0};
@@ -201,6 +202,7 @@ class StagefrightPlayerFactory : 
                }

            }

        }

#endif

        if (getDefaultPlayerType()

                == STAGEFRIGHT_PLAYER) {

            char buf[20];

media/libstagefright/ACodec.cpp

+6 −2
Original line number Diff line number Diff line
@@ -4773,7 +4773,9 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { 
                "OMX.qcom.audio.encoder.aac",  // OMX.qcom.audio.encoder.aac

                0,     // flags

                &matchingCodecs);

    } else if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_AUDIO_FLAC) && !encoder) {

    }

#ifdef QTI_FLAC_DECODER

    else if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_AUDIO_FLAC) && !encoder) {

        //use google's raw decoder

        OMXCodec::findMatchingCodecs(

                MEDIA_MIMETYPE_AUDIO_RAW,
@@ -4781,7 +4783,9 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { 
                "OMX.google.raw.decoder",

                0, //flags

                &matchingCodecs);

    } else

    }

#endif

     else

        OMXCodec::findMatchingCodecs(

                mime.c_str(),

                encoder, // createEncoder

media/libstagefright/NuMediaExtractor.cpp

+5 −3
Original line number Diff line number Diff line
@@ -286,16 +286,18 @@ status_t NuMediaExtractor::selectTrack(size_t index) { 


    const char *mime;

    CHECK(source->getFormat()->findCString(kKeyMIMEType, &mime));

    if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) {

#ifdef QTI_FLAC_DECODER

    if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) {

        sp<MediaSource> mFlacSource = new FLACDecoder(source);

        info->mSource = mFlacSource;

        mFlacSource->start();

#endif

    } else {

    }

#else

    {

        CHECK_EQ((status_t)OK, source->start());

        info->mSource = source;

    }

#endif



    info->mTrackIndex = index;

    info->mFinalResult = OK;

media/libstagefright/OMXCodec.cpp

+6 −2
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ void OMXCodec::findMatchingCodecs( 
        return;

    }



    if (matchComponentName && !strncmp("FLACDecoder", matchComponentName, 10)) {

#ifdef QTI_FLAC_DECODER

    if (matchComponentName && !strncmp("FLACDecoder", matchComponentName, strlen("FLACDecoder"))) {

            matchingCodecs->add();



            CodecNameAndQuirks *entry = &matchingCodecs->editItemAt(index);
@@ -318,6 +319,7 @@ void OMXCodec::findMatchingCodecs( 
            entry->mQuirks = 0;

            return;

    }

#endif

#endif



    for (;;) {
@@ -447,10 +449,12 @@ sp<MediaSource> OMXCodec::Create( 


    Vector<CodecNameAndQuirks> matchingCodecs;



    if (!strncmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC, 10)) {

#ifdef QTI_FLAC_DECODER

    if (!strncmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC, strlen(MEDIA_MIMETYPE_AUDIO_FLAC))) {

        findMatchingCodecs(mime, createEncoder,

            "FLACDecoder", flags, &matchingCodecs);

    } else

#endif

        findMatchingCodecs(

            mime, createEncoder, matchComponentName, flags, &matchingCodecs);