diff options
| author | Chong Zhang <chz@google.com> | 2014-10-14 17:22:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 17:22:22 +0000 |
| commit | dc9ac1cb57625f72b92c414d8d90d9079afd9667 (patch) | |
| tree | 35569a3dbb5718326fd4a3b2368cedfebc4f54ac /media/libstagefright/codecs | |
| parent | a15b34244cb9d4e65ed4fede11c9fb83b7fb46c5 (diff) | |
| parent | 3384cfaa4b933e4406a41bc4362a74511e0a0e79 (diff) | |
| download | frameworks_av-dc9ac1cb57625f72b92c414d8d90d9079afd9667.zip frameworks_av-dc9ac1cb57625f72b92c414d8d90d9079afd9667.tar.gz frameworks_av-dc9ac1cb57625f72b92c414d8d90d9079afd9667.tar.bz2 | |
am 3384cfaa: am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
* commit '3384cfaa4b933e4406a41bc4362a74511e0a0e79':
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; |