diff options
| author | Chong Zhang <chz@google.com> | 2014-10-13 22:08:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-13 22:08:24 +0000 |
| commit | 3384cfaa4b933e4406a41bc4362a74511e0a0e79 (patch) | |
| tree | 3799a7ffbc947508e5d197971b11d5f4cc3bca39 /media/libstagefright/codecs | |
| parent | 7d2b381f6a611e60f715e8356269c71ecc7f5884 (diff) | |
| parent | 1195142cec56fdfd509294da724ce3e13c628be5 (diff) | |
| download | frameworks_av-3384cfaa4b933e4406a41bc4362a74511e0a0e79.zip frameworks_av-3384cfaa4b933e4406a41bc4362a74511e0a0e79.tar.gz frameworks_av-3384cfaa4b933e4406a41bc4362a74511e0a0e79.tar.bz2 | |
am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
* commit '1195142cec56fdfd509294da724ce3e13c628be5':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/g711/dec/SoftG711.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/g711/dec/SoftG711.cpp b/media/libstagefright/codecs/g711/dec/SoftG711.cpp index 240c0c1..3a69095 100644 --- a/media/libstagefright/codecs/g711/dec/SoftG711.cpp +++ b/media/libstagefright/codecs/g711/dec/SoftG711.cpp @@ -117,7 +117,14 @@ OMX_ERRORTYPE SoftG711::internalGetParameter( pcmParams->eEndian = OMX_EndianBig; pcmParams->bInterleaved = OMX_TRUE; pcmParams->nBitPerSample = 16; - pcmParams->ePCMMode = OMX_AUDIO_PCMModeLinear; + if (pcmParams->nPortIndex == 0) { + // input port + pcmParams->ePCMMode = mIsMLaw ? OMX_AUDIO_PCMModeMULaw + : OMX_AUDIO_PCMModeALaw; + } else { + // output port + pcmParams->ePCMMode = OMX_AUDIO_PCMModeLinear; + } pcmParams->eChannelMapping[0] = OMX_AUDIO_ChannelLF; pcmParams->eChannelMapping[1] = OMX_AUDIO_ChannelRF; |