diff options
| author | Marco Nelissen <marcone@google.com> | 2015-03-20 09:15:11 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-03-20 09:15:11 -0700 |
| commit | 17c39e708ed657b8fa66f8acce5128e51696915c (patch) | |
| tree | ec0f96c66e44c39e83800bb7a02792ab57781e99 /media/libstagefright/codecs/g711/dec/SoftG711.cpp | |
| parent | 340cebdaa2875ba2ab9725b81218ebc59d84164b (diff) | |
| download | frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.zip frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.gz frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.bz2 | |
ulaw and alaw aren't limited to 8kHz
Bug: https://code.google.com/p/android/issues/detail?id=158490
Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
Diffstat (limited to 'media/libstagefright/codecs/g711/dec/SoftG711.cpp')
| -rw-r--r-- | media/libstagefright/codecs/g711/dec/SoftG711.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/g711/dec/SoftG711.cpp b/media/libstagefright/codecs/g711/dec/SoftG711.cpp index 3a69095..015515e 100644 --- a/media/libstagefright/codecs/g711/dec/SoftG711.cpp +++ b/media/libstagefright/codecs/g711/dec/SoftG711.cpp @@ -41,8 +41,9 @@ SoftG711::SoftG711( OMX_COMPONENTTYPE **component) : SimpleSoftOMXComponent(name, callbacks, appData, component), mIsMLaw(true), + mSignalledError(false), mNumChannels(1), - mSignalledError(false) { + mSamplingRate(8000) { if (!strcmp(name, "OMX.google.g711.alaw.decoder")) { mIsMLaw = false; } else { @@ -129,7 +130,7 @@ OMX_ERRORTYPE SoftG711::internalGetParameter( pcmParams->eChannelMapping[1] = OMX_AUDIO_ChannelRF; pcmParams->nChannels = mNumChannels; - pcmParams->nSamplingRate = 8000; + pcmParams->nSamplingRate = mSamplingRate; return OMX_ErrorNone; } @@ -159,6 +160,8 @@ OMX_ERRORTYPE SoftG711::internalSetParameter( mNumChannels = pcmParams->nChannels; } + mSamplingRate = pcmParams->nSamplingRate; + return OMX_ErrorNone; } |