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

Changing Celt to run on 20 msec frames

Browse Source 
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
This commit is contained in:
tina.legrand@webrtc.org 2012-06-07 08:57:27 +00:00
parent d2956d8cda
commit 90af7f841c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/audio_coding/main/source/acm_codec_database.cc
View File

@ -157,9 +157,9 @@ const CodecInst ACMCodecDB::database_[] = {
#endif #endif
#ifdef WEBRTC_CODEC_CELT #ifdef WEBRTC_CODEC_CELT
// Mono // Mono
{kDynamicPayloadtypes[count_database++], "CELT", 32000, 320, 1, 64000}, {kDynamicPayloadtypes[count_database++], "CELT", 32000, 640, 1, 64000},
// Stereo // Stereo
{kDynamicPayloadtypes[count_database++], "CELT", 32000, 320, 2, 64000}, {kDynamicPayloadtypes[count_database++], "CELT", 32000, 640, 2, 64000},
#endif #endif
#ifdef WEBRTC_CODEC_G722 #ifdef WEBRTC_CODEC_G722
// Mono // Mono
@ -243,9 +243,9 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
#endif #endif
#ifdef WEBRTC_CODEC_CELT #ifdef WEBRTC_CODEC_CELT
// Mono // Mono
{1, {320}, 0, 2}, {1, {640}, 0, 2},
// Stereo // Stereo
{1, {320}, 0, 2}, {1, {640}, 0, 2},
#endif #endif
#ifdef WEBRTC_CODEC_G722 #ifdef WEBRTC_CODEC_G722
// Mono // Mono

12
src/modules/audio_coding/main/test/TestStereo.cc
View File

@ -460,17 +460,17 @@ void TestStereo::Perform() {
test_cntr_++; test_cntr_++;
OpenOutFile(test_cntr_); OpenOutFile(test_cntr_);
char codec_celt[] = "CELT"; char codec_celt[] = "CELT";
RegisterSendCodec('A', codec_celt, 32000, 48000, 320, codec_channels, RegisterSendCodec('A', codec_celt, 32000, 48000, 640, codec_channels,
celt_pltype_); celt_pltype_);
Run(channel_a2b_, audio_channels, codec_channels); 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_); celt_pltype_);
Run(channel_a2b_, audio_channels, codec_channels); 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_); celt_pltype_);
Run(channel_a2b_, audio_channels, codec_channels); Run(channel_a2b_, audio_channels, codec_channels);
acm_a_->SetVAD(true, true, VADNormal); 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_); celt_pltype_);
Run(channel_a2b_, audio_channels, codec_channels); Run(channel_a2b_, audio_channels, codec_channels);
acm_a_->SetVAD(false, false, VADNormal); acm_a_->SetVAD(false, false, VADNormal);
@ -558,7 +558,7 @@ void TestStereo::Perform() {
test_cntr_++; test_cntr_++;
channel_a2b_->set_codec_mode(kStereo); channel_a2b_->set_codec_mode(kStereo);
OpenOutFile(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_); celt_pltype_);
Run(channel_a2b_, audio_channels, codec_channels); Run(channel_a2b_, audio_channels, codec_channels);
out_file_.Close(); out_file_.Close();
@ -644,7 +644,7 @@ void TestStereo::Perform() {
} }
test_cntr_++; test_cntr_++;
OpenOutFile(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_); celt_pltype_);
Run(channel_a2b_, audio_channels, codec_channels); Run(channel_a2b_, audio_channels, codec_channels);
out_file_.Close(); out_file_.Close();