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

Commit 42392e49 authored by Andreas Huber's avatar Andreas Huber
Browse files

Apparently the mp3 decoder glitches if it was configured with the wrong 

sample rate. Make sure we tell it about the one the extractor provides.

Change-Id: Ice5b9cf55485ca1a8f099a14be0202be9540e781
related-to-bug: 8621639
parent 9e0727ca

media/libstagefright/ACodec.cpp

+13 −0
Original line number Diff line number Diff line
@@ -960,6 +960,19 @@ status_t ACodec::configureCodec( 
                err = setupVideoDecoder(mime, width, height);

            }

        }

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

        int32_t numChannels, sampleRate;

        if (!msg->findInt32("channel-count", &numChannels)

                || !msg->findInt32("sample-rate", &sampleRate)) {

            // Since we did not always check for these, leave them optional

            // and have the decoder figure it all out.

            err = OK;

        } else {

            err = setupRawAudioFormat(

                    encoder ? kPortIndexInput : kPortIndexOutput,

                    sampleRate,

                    numChannels);

        }

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

        int32_t numChannels, sampleRate;

        if (!msg->findInt32("channel-count", &numChannels)

media/libstagefright/OMXCodec.cpp

+11 −0
Original line number Diff line number Diff line
@@ -522,6 +522,17 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) { 
            CODEC_LOGE("setAACFormat() failed (err = %d)", err);

            return err;

        }

    } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_MPEG, mMIME)) {

        int32_t numChannels, sampleRate;

        if (meta->findInt32(kKeyChannelCount, &numChannels)

                && meta->findInt32(kKeySampleRate, &sampleRate)) {

            // Since we did not always check for these, leave them optional

            // and have the decoder figure it all out.

            setRawAudioFormat(

                    mIsEncoder ? kPortIndexInput : kPortIndexOutput,

                    sampleRate,

                    numChannels);

        }

    } 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

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

+15 −0
Original line number Diff line number Diff line
@@ -166,6 +166,21 @@ OMX_ERRORTYPE SoftMP3::internalSetParameter( 
            return OMX_ErrorNone;

        }



        case OMX_IndexParamAudioPcm:

        {

            const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =

                (const OMX_AUDIO_PARAM_PCMMODETYPE *)params;



            if (pcmParams->nPortIndex != 1) {

                return OMX_ErrorUndefined;

            }



            mNumChannels = pcmParams->nChannels;

            mSamplingRate = pcmParams->nSamplingRate;



            return OMX_ErrorNone;

        }



        default:

            return SimpleSoftOMXComponent::internalSetParameter(index, params);

    }