diff options
author | Andreas Huber <andih@google.com> | 2013-04-17 16:38:17 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 16:38:17 -0700 |
commit | 8160921de80aeff12436ee1c2bfdae77fc4914b9 (patch) | |
tree | 91ba5f8c1c3000505d9e7eb415942cdebd7b3141 /media/libstagefright/codecs | |
parent | c7e45e2439959c584931aa22c6c3b9d1f08320d8 (diff) | |
parent | c9e18491b4dd6d82d52ec7baa2101732ab617db6 (diff) | |
download | frameworks_av-8160921de80aeff12436ee1c2bfdae77fc4914b9.zip frameworks_av-8160921de80aeff12436ee1c2bfdae77fc4914b9.tar.gz frameworks_av-8160921de80aeff12436ee1c2bfdae77fc4914b9.tar.bz2 |
am c9e18491: am 767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev
* commit 'c9e18491b4dd6d82d52ec7baa2101732ab617db6':
Apparently the mp3 decoder glitches if it was configured with the wrong
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r-- | media/libstagefright/codecs/mp3dec/SoftMP3.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp index 849be87..9f25536 100644 --- a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp +++ b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp @@ -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); } |