From 90af7f841c47e8f1ca33133eb8de04e30a5dcd1c Mon Sep 17 00:00:00 2001 From: "tina.legrand@webrtc.org" Date: Thu, 7 Jun 2012 08:57:27 +0000 Subject: [PATCH] Changing Celt to run on 20 msec frames BUG=none TEST=- Review URL: https://webrtc-codereview.appspot.com/641004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2377 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/main/source/acm_codec_database.cc | 8 ++++---- src/modules/audio_coding/main/test/TestStereo.cc | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/audio_coding/main/source/acm_codec_database.cc b/src/modules/audio_coding/main/source/acm_codec_database.cc index 185af3393..d92741094 100644 --- a/src/modules/audio_coding/main/source/acm_codec_database.cc +++ b/src/modules/audio_coding/main/source/acm_codec_database.cc @@ -157,9 +157,9 @@ const CodecInst ACMCodecDB::database_[] = { #endif #ifdef WEBRTC_CODEC_CELT // Mono - {kDynamicPayloadtypes[count_database++], "CELT", 32000, 320, 1, 64000}, + {kDynamicPayloadtypes[count_database++], "CELT", 32000, 640, 1, 64000}, // Stereo - {kDynamicPayloadtypes[count_database++], "CELT", 32000, 320, 2, 64000}, + {kDynamicPayloadtypes[count_database++], "CELT", 32000, 640, 2, 64000}, #endif #ifdef WEBRTC_CODEC_G722 // Mono @@ -243,9 +243,9 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = { #endif #ifdef WEBRTC_CODEC_CELT // Mono - {1, {320}, 0, 2}, + {1, {640}, 0, 2}, // Stereo - {1, {320}, 0, 2}, + {1, {640}, 0, 2}, #endif #ifdef WEBRTC_CODEC_G722 // Mono diff --git a/src/modules/audio_coding/main/test/TestStereo.cc b/src/modules/audio_coding/main/test/TestStereo.cc index c0c2b7b43..6cdd82cc9 100644 --- a/src/modules/audio_coding/main/test/TestStereo.cc +++ b/src/modules/audio_coding/main/test/TestStereo.cc @@ -460,17 +460,17 @@ void TestStereo::Perform() { test_cntr_++; OpenOutFile(test_cntr_); char codec_celt[] = "CELT"; - RegisterSendCodec('A', codec_celt, 32000, 48000, 320, codec_channels, + RegisterSendCodec('A', codec_celt, 32000, 48000, 640, codec_channels, celt_pltype_); Run(channel_a2b_, audio_channels, codec_channels); - RegisterSendCodec('A', codec_celt, 32000, 64000, 320, codec_channels, + RegisterSendCodec('A', codec_celt, 32000, 64000, 640, codec_channels, celt_pltype_); Run(channel_a2b_, audio_channels, codec_channels); - RegisterSendCodec('A', codec_celt, 32000, 128000, 320, codec_channels, + RegisterSendCodec('A', codec_celt, 32000, 128000, 640, codec_channels, celt_pltype_); Run(channel_a2b_, audio_channels, codec_channels); acm_a_->SetVAD(true, true, VADNormal); - RegisterSendCodec('A', codec_celt, 32000, 48000, 320, codec_channels, + RegisterSendCodec('A', codec_celt, 32000, 48000, 640, codec_channels, celt_pltype_); Run(channel_a2b_, audio_channels, codec_channels); acm_a_->SetVAD(false, false, VADNormal); @@ -558,7 +558,7 @@ void TestStereo::Perform() { test_cntr_++; channel_a2b_->set_codec_mode(kStereo); OpenOutFile(test_cntr_); - RegisterSendCodec('A', codec_celt, 32000, 64000, 320, codec_channels, + RegisterSendCodec('A', codec_celt, 32000, 64000, 640, codec_channels, celt_pltype_); Run(channel_a2b_, audio_channels, codec_channels); out_file_.Close(); @@ -644,7 +644,7 @@ void TestStereo::Perform() { } test_cntr_++; OpenOutFile(test_cntr_); - RegisterSendCodec('A', codec_celt, 32000, 64000, 320, codec_channels, + RegisterSendCodec('A', codec_celt, 32000, 64000, 640, codec_channels, celt_pltype_); Run(channel_a2b_, audio_channels, codec_channels); out_file_.Close();