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

Commit d3523f89 authored by Gilles-Arnaud Bleu-Laine's avatar Gilles-Arnaud Bleu-Laine Committed by Andreas Huber
Browse files

Gracefuly return on detecting wrong AAC format from corrupted files 



Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.

The current CHECK() interrupts the configurecodec() preventing a graceful
exit.

Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: default avatarGilles-Arnaud Bleu-Laine <gilles@ti.com>
parent fea8f621

include/media/stagefright/OMXCodec.h

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ private: 
    void setComponentRole();



    void setAMRFormat(bool isWAMR, int32_t bitRate);

    void setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate);

    status_t setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate);

    void setG711Format(int32_t numChannels);



    status_t setVideoPortFormatType(

media/libstagefright/OMXCodec.cpp

+22 −6
Original line number Diff line number Diff line
@@ -625,7 +625,11 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) { 
        CHECK(meta->findInt32(kKeyChannelCount, &numChannels));

        CHECK(meta->findInt32(kKeySampleRate, &sampleRate));



        setAACFormat(numChannels, sampleRate, bitRate);

        status_t err = setAACFormat(numChannels, sampleRate, bitRate);

        if (err != OK) {

            CODEC_LOGE("setAACFormat() failed (err = %d)", err);

            return err;

        }

    } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_G711_ALAW, mMIME)

            || !strcasecmp(MEDIA_MIMETYPE_AUDIO_G711_MLAW, mMIME)) {

        // These are PCM-like formats with a fixed sample rate but
@@ -3358,8 +3362,10 @@ void OMXCodec::setAMRFormat(bool isWAMR, int32_t bitRate) { 
    }

}



void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate) {

    CHECK(numChannels == 1 || numChannels == 2);

status_t OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate) {

    if (numChannels > 2)

        LOGW("Number of channels: (%d) \n", numChannels);



    if (mIsEncoder) {

        //////////////// input port ////////////////////

        setRawAudioFormat(kPortIndexInput, sampleRate, numChannels);
@@ -3410,9 +3416,13 @@ void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bit 
        profile.nAACERtools = OMX_AUDIO_AACERNone;

        profile.eAACProfile = OMX_AUDIO_AACObjectLC;

        profile.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4FF;

        CHECK_EQ(mOMX->setParameter(mNode, OMX_IndexParamAudioAac,

                &profile, sizeof(profile)), (status_t)OK);

        err = mOMX->setParameter(mNode, OMX_IndexParamAudioAac,

                &profile, sizeof(profile));



        if (err != OK) {

            CODEC_LOGE("setParameter('OMX_IndexParamAudioAac') failed (err = %d)", err);

            return err;

        }

    } else {

        OMX_AUDIO_PARAM_AACPROFILETYPE profile;

        InitOMXParams(&profile);
@@ -3428,10 +3438,16 @@ void OMXCodec::setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bit 


        err = mOMX->setParameter(

                mNode, OMX_IndexParamAudioAac, &profile, sizeof(profile));

        CHECK_EQ(err, (status_t)OK);



        if (err != OK) {

            CODEC_LOGE("setParameter('OMX_IndexParamAudioAac') failed (err = %d)", err);

            return err;

        }

    }



    return OK;

}



void OMXCodec::setG711Format(int32_t numChannels) {

    CHECK(!mIsEncoder);

    setRawAudioFormat(kPortIndexInput, 8000, numChannels);