diff options
| author | Andreas Huber <andih@google.com> | 2012-04-24 12:48:18 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-04-24 14:45:25 -0700 |
| commit | c1d8115e8a0bdaeb2b723d395b9a85a02c90c933 (patch) | |
| tree | 09339f44279672f1bfa79cbb9c667830f17ae9a4 /media/libstagefright/ACodec.cpp | |
| parent | 1dc28b794587be22c90a97070d928f94586db638 (diff) | |
Make sure OMXCodec and ACodec both accept more than 2 channels of audio
and fill in the OMX channel mask properly.
Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index e6e0413b..5ac34c9e 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1182,13 +1182,8 @@ status_t ACodec::setupRawAudioFormat( pcmParams.nSamplingRate = sampleRate; pcmParams.ePCMMode = OMX_AUDIO_PCMModeLinear; - if (numChannels == 1) { - pcmParams.eChannelMapping[0] = OMX_AUDIO_ChannelCF; - } else { - CHECK_EQ(numChannels, 2); - - pcmParams.eChannelMapping[0] = OMX_AUDIO_ChannelLF; - pcmParams.eChannelMapping[1] = OMX_AUDIO_ChannelRF; + if (getOMXChannelMapping(numChannels, pcmParams.eChannelMapping) != OK) { + return OMX_ErrorNone; } return mOMX->setParameter( |