From 36965b1803c9ee4c0cca6f79bd95dd0dc16a14a5 Mon Sep 17 00:00:00 2001 From: "turaj@webrtc.org" Date: Mon, 10 Dec 2012 23:52:43 +0000 Subject: [PATCH] Bug fix for iSAC fixed-point. The bug was the result of changes in iSAC floating-point to add 48 kHz extension. TBR=tlegrand@google.com TEST=voe_cmd_test, ACM unittest. Review URL: https://webrtc-codereview.appspot.com/974011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3256 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_coding/main/source/acm_isac.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/audio_coding/main/source/acm_isac.cc b/webrtc/modules/audio_coding/main/source/acm_isac.cc index fbc00a38c..052251eee 100644 --- a/webrtc/modules/audio_coding/main/source/acm_isac.cc +++ b/webrtc/modules/audio_coding/main/source/acm_isac.cc @@ -250,11 +250,6 @@ WebRtc_Word16 ACMISAC::REDPayloadISAC(const WebRtc_Word32 /* isacRate */, #ifdef WEBRTC_CODEC_ISACFX -enum IsacSamplingRate { - kIsacWideband = 16, - kIsacSuperWideband = 32 -}; - static float ACMISACFixTranscodingScale(WebRtc_UWord16 rate) { // find the scale for transcoding, the scale is rounded // downward @@ -315,12 +310,15 @@ static WebRtc_Word16 ACMISACFixControl(ACM_ISAC_STRUCT* inst, return WebRtcIsacfix_Control(inst, (WebRtc_Word16) rateBPS, frameSizeMs); } -static IsacSamplingRate ACMISACFixGetEncSampRate(ACM_ISAC_STRUCT* /* inst */) { - return kIsacWideband; +// The following two function should have the same signature as their counter +// part in iSAC floating-point, i.e. WebRtcIsac_EncSampRate & +// WebRtcIsac_DecSampRate. +static WebRtc_UWord16 ACMISACFixGetEncSampRate(ACM_ISAC_STRUCT* /* inst */) { + return 16000; } -static IsacSamplingRate ACMISACFixGetDecSampRate(ACM_ISAC_STRUCT* /* inst */) { - return kIsacWideband; +static WebRtc_UWord16 ACMISACFixGetDecSampRate(ACM_ISAC_STRUCT* /* inst */) { + return 16000; } #endif