generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix for iSAC fixed-point. The bug was the result of changes in iSAC floating-point to add 48 kHz extension.

Browse Source 
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
This commit is contained in:
turaj@webrtc.org 2012-12-10 23:52:43 +00:00
parent 55edaecc93
commit 36965b1803
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,11 +250,6 @@ WebRtc_Word16 ACMISAC::REDPayloadISAC(const WebRtc_Word32 /* isacRate */,
#ifdef WEBRTC_CODEC_ISACFX #ifdef WEBRTC_CODEC_ISACFX
enum IsacSamplingRate {
kIsacWideband = 16,
kIsacSuperWideband = 32
};
static float ACMISACFixTranscodingScale(WebRtc_UWord16 rate) { static float ACMISACFixTranscodingScale(WebRtc_UWord16 rate) {
// find the scale for transcoding, the scale is rounded // find the scale for transcoding, the scale is rounded
// downward // downward
@ -315,12 +310,15 @@ static WebRtc_Word16 ACMISACFixControl(ACM_ISAC_STRUCT* inst,
return WebRtcIsacfix_Control(inst, (WebRtc_Word16) rateBPS, frameSizeMs); return WebRtcIsacfix_Control(inst, (WebRtc_Word16) rateBPS, frameSizeMs);
} }
static IsacSamplingRate ACMISACFixGetEncSampRate(ACM_ISAC_STRUCT* /* inst */) { // The following two function should have the same signature as their counter
return kIsacWideband; // 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 */) { static WebRtc_UWord16 ACMISACFixGetDecSampRate(ACM_ISAC_STRUCT* /* inst */) {
return kIsacWideband; return 16000;
} }
#endif #endif