From 277ec8e3f54da2ae65c350de6eb58f512b521024 Mon Sep 17 00:00:00 2001 From: "turaj@webrtc.org" Date: Mon, 3 Dec 2012 21:16:23 +0000 Subject: [PATCH] Fix a bug when iSAC-48kHz was added. 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 --- webrtc/modules/audio_coding/main/source/acm_isac.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/main/source/acm_isac.cc b/webrtc/modules/audio_coding/main/source/acm_isac.cc index 5f734a06e1..fbc00a38c0 100644 --- a/webrtc/modules/audio_coding/main/source/acm_isac.cc +++ b/webrtc/modules/audio_coding/main/source/acm_isac.cc @@ -652,7 +652,8 @@ WebRtc_Word16 ACMISAC::SetBitRateSafe(WebRtc_Word32 bitRate) { status = ACM_ISAC_CONTROL( _codecInstPtr->inst, _isacCurrentBN, - (encoderSampFreq == 32000) ? 30 : (_frameLenSmpl / 16)); + (encoderSampFreq == 32000 || encoderSampFreq == 48000) ? 30 : + (_frameLenSmpl / 16)); if (status < 0) { status = -1; } @@ -864,7 +865,8 @@ bool ACMISAC::DecoderParamsSafe(WebRtcACMCodecParams* decParams, void ACMISAC::SaveDecoderParamSafe(const WebRtcACMCodecParams* codecParams) { // set decoder sampling frequency. - if (codecParams->codecInstant.plfreq == 32000) { + if (codecParams->codecInstant.plfreq == 32000 || + codecParams->codecInstant.plfreq == 48000) { memcpy(&_decoderParams32kHz, codecParams, sizeof(WebRtcACMCodecParams)); } else { memcpy(&_decoderParams, codecParams, sizeof(WebRtcACMCodecParams));