zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bug when iSAC-48kHz was added.

Browse Source 
I discovered this by running extended VoE test on "Codecs."

TBR=tina.legrand@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/973010

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3229 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org
2012-12-03 21:16:23 +00:00
parent f18de86db1
commit 277ec8e3f5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/audio_coding/main/source/acm_isac.cc
View File

@ -652,7 +652,8 @@ WebRtc_Word16 ACMISAC::SetBitRateSafe(WebRtc_Word32 bitRate) {
status = ACM_ISAC_CONTROL( status = ACM_ISAC_CONTROL(
_codecInstPtr->inst, _isacCurrentBN, _codecInstPtr->inst, _isacCurrentBN,
(encoderSampFreq == 32000) ? 30 : (_frameLenSmpl / 16)); (encoderSampFreq == 32000 || encoderSampFreq == 48000) ? 30 :
(_frameLenSmpl / 16));
if (status < 0) { if (status < 0) {
status = -1; status = -1;
} }
@ -864,7 +865,8 @@ bool ACMISAC::DecoderParamsSafe(WebRtcACMCodecParams* decParams,
void ACMISAC::SaveDecoderParamSafe(const WebRtcACMCodecParams* codecParams) { void ACMISAC::SaveDecoderParamSafe(const WebRtcACMCodecParams* codecParams) {
// set decoder sampling frequency. // set decoder sampling frequency.
if (codecParams->codecInstant.plfreq == 32000) { if (codecParams->codecInstant.plfreq == 32000 ||
codecParams->codecInstant.plfreq == 48000) {
memcpy(&_decoderParams32kHz, codecParams, sizeof(WebRtcACMCodecParams)); memcpy(&_decoderParams32kHz, codecParams, sizeof(WebRtcACMCodecParams));
} else { } else {
memcpy(&_decoderParams, codecParams, sizeof(WebRtcACMCodecParams)); memcpy(&_decoderParams, codecParams, sizeof(WebRtcACMCodecParams));