From 325b34542d9bdc5a38d01d1c69e61a63eaa36ab1 Mon Sep 17 00:00:00 2001 From: Tina le Grand Date: Tue, 8 Dec 2015 10:13:00 +0100 Subject: [PATCH] There was an old scaling for CNG 48 kHz in the code, from the time where Audio Coding Module didn't have full 48 kHz support. This CL removes the scaling. The bug hasn't caused us any problems, since we don't run CNG together with Opus (our only real 48 kHz codec), but would cause problems if used with PCB16b @ 48 kHz. BUG=webrtc:5303 R=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1496243002 . Cr-Commit-Position: refs/heads/master@{#10929} --- .../modules/audio_coding/neteq/timestamp_scaler.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc index 9f161e498e..c1abdc30f5 100644 --- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc @@ -52,19 +52,11 @@ uint32_t TimestampScaler::ToInternal(uint32_t external_timestamp, denominator_ = 1; break; } - case NetEqDecoder::kDecoderCNGswb48kHz: { - // Use timestamp scaling with factor 2/3 (32 kHz sample rate, but RTP - // timestamps run on 48 kHz). - // TODO(tlegrand): Remove scaling for kDecoderCNGswb48kHz once ACM has - // full 48 kHz support. - numerator_ = 2; - denominator_ = 3; - break; - } case NetEqDecoder::kDecoderAVT: case NetEqDecoder::kDecoderCNGnb: case NetEqDecoder::kDecoderCNGwb: - case NetEqDecoder::kDecoderCNGswb32kHz: { + case NetEqDecoder::kDecoderCNGswb32kHz: + case NetEqDecoder::kDecoderCNGswb48kHz: { // Do not change the timestamp scaling settings for DTMF or CNG. break; }