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

Unverified Commit fd7d0e33 authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
Browse files

stagefright: Explicitly handle ALAC files 

 * Previously this was handled by the catchall path, but we need
   to handle it explicitly if we want to use the DSP offload
   capability present on new QCOM chipsets.

Change-Id: Id18d9c6739e6ce9f3d91e64908ad3553dd0a8df0
parent 4cc8a697

include/media/stagefright/FFMPEGSoftCodec.h

+4 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ private: 
            const sp<AMessage> &msg, sp<IOMX> OMXhandle,

            IOMX::node_id nodeID);



    static status_t setALACFormat(

            const sp<AMessage> &msg, sp<IOMX> OMXhandle,

            IOMX::node_id nodeID);



    static status_t setAPEFormat(

            const sp<AMessage> &msg, sp<IOMX> OMXhandle,

            IOMX::node_id nodeID);

media/libstagefright/FFMPEGSoftCodec.cpp

+61 −0
Original line number Diff line number Diff line
@@ -628,6 +628,25 @@ status_t FFMPEGSoftCodec::getAudioPortFormat(OMX_U32 portIndex, int coding, 
            notify->setInt32("sample-rate", params.nSamplingRate);

            break;

        }

        case OMX_AUDIO_CodingALAC:

        {

            OMX_AUDIO_PARAM_ALACTYPE params;

            InitOMXParams(&params);

            params.nPortIndex = portIndex;



            err = OMXHandle->getParameter(

                    nodeId, (OMX_INDEXTYPE)OMX_IndexParamAudioAlac, &params, sizeof(params));

            if (err != OK) {

                return err;

            }



            notify->setString("mime", MEDIA_MIMETYPE_AUDIO_ALAC);

            notify->setInt32("channel-count", params.nChannels);

            notify->setInt32("sample-rate", params.nSamplingRate);

            notify->setInt32("bits-per-sample", params.nBitsPerSample);

            break;

        }



        case OMX_AUDIO_CodingAPE:

        {

            OMX_AUDIO_PARAM_APETYPE params;
@@ -761,6 +780,11 @@ status_t FFMPEGSoftCodec::setAudioFormat( 
        if (err != OK) {

            ALOGE("setAC3Format() failed (err = %d)", err);

        }

    } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_ALAC, mime))  {

        err = setALACFormat(msg, OMXhandle, nodeID);

        if (err != OK) {

            ALOGE("setALACFormat() failed (err = %d)", err);

        }

    } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_APE, mime))  {

        err = setAPEFormat(msg, OMXhandle, nodeID);

        if (err != OK) {
@@ -809,6 +833,8 @@ const char* FFMPEGSoftCodec::getComponentRole( 
          "audio_decoder.mp2", NULL },

        { MEDIA_MIMETYPE_AUDIO_AC3,

          "audio_decoder.ac3", NULL },

        { MEDIA_MIMETYPE_AUDIO_ALAC,

          "audio_decoder.alac", NULL },

        { MEDIA_MIMETYPE_AUDIO_APE,

          "audio_decoder.ape", NULL },

        { MEDIA_MIMETYPE_AUDIO_DTS,
@@ -1276,6 +1302,41 @@ status_t FFMPEGSoftCodec::setAC3Format( 
            nodeID, (OMX_INDEXTYPE)OMX_IndexParamAudioAndroidAc3, &param, sizeof(param));

}



status_t FFMPEGSoftCodec::setALACFormat(

        const sp<AMessage> &msg, sp<IOMX> OMXhandle, IOMX::node_id nodeID)

{

    int32_t numChannels = 0;

    int32_t sampleRate = 0;

    AudioEncoding encoding = kAudioEncodingPcm16bit;

    OMX_AUDIO_PARAM_ALACTYPE param;



    CHECK(msg->findInt32(getMsgKey(kKeyChannelCount), &numChannels));

    CHECK(msg->findInt32(getMsgKey(kKeySampleRate), &sampleRate));

    CHECK(msg->findInt32(getMsgKey(kKeyPcmEncoding), (int32_t*)&encoding));



    ALOGV("Channels:%d, SampleRate:%d, Encoding:%d",

            numChannels, sampleRate, encoding);



    status_t err = setRawAudioFormat(msg, OMXhandle, nodeID);

    if (err != OK)

        return err;



    InitOMXParams(&param);

    param.nPortIndex = kPortIndexInput;



    err = OMXhandle->getParameter(

            nodeID, (OMX_INDEXTYPE)OMX_IndexParamAudioAlac, &param, sizeof(param));

    if (err != OK)

        return err;



    param.nChannels = numChannels;

    param.nSamplingRate = sampleRate;

    param.nBitsPerSample = audioEncodingToBits(encoding);



    return OMXhandle->setParameter(

            nodeID, (OMX_INDEXTYPE)OMX_IndexParamAudioAlac, &param, sizeof(param));

}



status_t FFMPEGSoftCodec::setAPEFormat(

        const sp<AMessage> &msg, sp<IOMX> OMXhandle, IOMX::node_id nodeID)

{