diff options
author | Lajos Molnar <lajos@google.com> | 2014-02-24 16:37:24 -0800 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2014-03-10 11:40:03 -0700 |
commit | e0381245dff04aa823a59aa8b85869eddab0f39f (patch) | |
tree | 956a2615b37d049528ad0b2ae503b14fc852962c /media/libstagefright/codecs | |
parent | 259f1624cf7b93ba831af10a616267487601c27f (diff) | |
download | frameworks_av-e0381245dff04aa823a59aa8b85869eddab0f39f.zip frameworks_av-e0381245dff04aa823a59aa8b85869eddab0f39f.tar.gz frameworks_av-e0381245dff04aa823a59aa8b85869eddab0f39f.tar.bz2 |
MediaCodec: add getInputFormat() method
Additional input-port format item:
int32: "adaptive-playback"
video decoders only
whether codec is configured for adaptive playback. In this case, if
codec has max-width/height limits, those limits are also exposed
(int32: "max-width", "max-height")
Also, getInput/OutputFormat() is now callable in CONFIGURED and
STARTING states, although output format may be missing CSD fields
until INFO_OUTPUT_FORMAT_CHANGED message.
Includes missing OMX support for MP3 software decoder.
Bug: 11785204
Change-Id: I90c7e34ba81c7b81c43641599f3f496e838958c6
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r-- | media/libstagefright/codecs/mp3dec/SoftMP3.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp index a09ab7c..5396022 100644 --- a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp +++ b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp @@ -146,6 +146,23 @@ OMX_ERRORTYPE SoftMP3::internalGetParameter( return OMX_ErrorNone; } + case OMX_IndexParamAudioMp3: + { + OMX_AUDIO_PARAM_MP3TYPE *mp3Params = + (OMX_AUDIO_PARAM_MP3TYPE *)params; + + if (mp3Params->nPortIndex > 1) { + return OMX_ErrorUndefined; + } + + mp3Params->nChannels = mNumChannels; + mp3Params->nBitRate = 0 /* unknown */; + mp3Params->nSampleRate = mSamplingRate; + // other fields are encoder-only + + return OMX_ErrorNone; + } + default: return SimpleSoftOMXComponent::internalGetParameter(index, params); } |