zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete all codec-specific subclasses of ACMGenericCodec

Browse Source 
They have all been replaced by AudioEncoder subclasses, accessed throgh
ACMGenericCodecWrapper objects. After this change, the only subclass of
ACMGenericCodec is ACMGenericCodecWrapper. (The two will be consolidated
in a future cl.)

This CL also deletes acm_opus_unittest.cc. This test file was already
replaced audio_encoder_opus_unittest.cc	in r8244.

BUG=4228
COAUTHOR=kwiberg@webrtc.org
R=tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40729004

Cr-Commit-Position: refs/heads/master@{#8457}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8457 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2015-02-23 09:25:40 +00:00
parent 2a5cfc2167
commit fa58745445
48 changed files with 3 additions and 6519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

319
webrtc/modules/audio_coding/main/test/TestAllCodecs.cc
View File

@ -152,126 +152,6 @@ void TestAllCodecs::Perform() {
// All codecs are tested for all allowed sampling frequencies, rates and
// packet sizes.
#ifdef WEBRTC_CODEC_AMR
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_amr[] = "AMR";
RegisterSendCodec('A', codec_amr, 8000, 4750, 160, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 4750, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 4750, 480, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 5150, 160, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 5150, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 5150, 480, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 5900, 160, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 5900, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 5900, 480, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 6700, 160, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 6700, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 6700, 480, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 7400, 160, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 7400, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 7400, 480, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 7950, 160, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 7950, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 7950, 480, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 10200, 160, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 10200, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 10200, 480, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 12200, 160, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 12200, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amr, 8000, 12200, 480, 3);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_AMRWB
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
char codec_amrwb[] = "AMR-WB";
OpenOutFile(test_count_);
RegisterSendCodec('A', codec_amrwb, 16000, 7000, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 7000, 640, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 7000, 960, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 9000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 9000, 640, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 9000, 960, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 12000, 320, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 12000, 640, 6);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 12000, 960, 8);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 14000, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 14000, 640, 4);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 14000, 960, 5);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 16000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 16000, 640, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 16000, 960, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 18000, 320, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 18000, 640, 4);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 18000, 960, 5);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 20000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 20000, 640, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 20000, 960, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 23000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 23000, 640, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 23000, 960, 3);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 24000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 24000, 640, 2);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_amrwb, 16000, 24000, 960, 2);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_G722
if (test_mode_ != 0) {
printf("===============================================================\n");
@ -293,153 +173,6 @@ void TestAllCodecs::Perform() {
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_G722_1
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_g722_1[] = "G7221";
RegisterSendCodec('A', codec_g722_1, 16000, 32000, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g722_1, 16000, 24000, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g722_1, 16000, 16000, 320, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_G722_1C
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_g722_1c[] = "G7221";
RegisterSendCodec('A', codec_g722_1c, 32000, 48000, 640, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g722_1c, 32000, 32000, 640, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g722_1c, 32000, 24000, 640, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_G729
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_g729[] = "G729";
RegisterSendCodec('A', codec_g729, 8000, 8000, 80, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729, 8000, 8000, 160, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729, 8000, 8000, 240, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729, 8000, 8000, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729, 8000, 8000, 400, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729, 8000, 8000, 480, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_G729_1
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_g729_1[] = "G7291";
RegisterSendCodec('A', codec_g729_1, 16000, 8000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 8000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 8000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 12000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 12000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 12000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 14000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 14000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 14000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 16000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 16000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 16000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 18000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 18000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 18000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 20000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 20000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 20000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 22000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 22000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 22000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 24000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 24000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 24000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 26000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 26000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 26000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 28000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 28000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 28000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 30000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 30000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 30000, 960, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 32000, 320, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 32000, 640, 1);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_g729_1, 16000, 32000, 960, 1);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_GSMFR
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_gsmfr[] = "GSM";
RegisterSendCodec('A', codec_gsmfr, 8000, 13200, 160, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_gsmfr, 8000, 13200, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_gsmfr, 8000, 13200, 480, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_ILBC
if (test_mode_ != 0) {
printf("===============================================================\n");
@ -566,34 +299,6 @@ void TestAllCodecs::Perform() {
RegisterSendCodec('A', codec_pcmu, 8000, 64000, 480, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
#ifdef WEBRTC_CODEC_SPEEX
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
char codec_speex[] = "SPEEX";
RegisterSendCodec('A', codec_speex, 8000, 2400, 160, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_speex, 8000, 8000, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_speex, 8000, 18200, 480, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
if (test_mode_ != 0) {
printf("===============================================================\n");
}
test_count_++;
OpenOutFile(test_count_);
RegisterSendCodec('A', codec_speex, 16000, 4000, 320, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_speex, 16000, 12800, 640, 0);
Run(channel_a_to_b_);
RegisterSendCodec('A', codec_speex, 16000, 34200, 960, 0);
Run(channel_a_to_b_);
outfile_b_.Close();
#endif
#ifdef WEBRTC_CODEC_OPUS
if (test_mode_ != 0) {
printf("===============================================================\n");
@ -622,30 +327,9 @@ void TestAllCodecs::Perform() {
/* Print out all codecs that were not tested in the run */
printf("The following codecs was not included in the test:\n");
#ifndef WEBRTC_CODEC_AMR
printf(" GSMAMR\n");
#endif
#ifndef WEBRTC_CODEC_AMRWB
printf(" GSMAMR-wb\n");
#endif
#ifndef WEBRTC_CODEC_G722
printf(" G.722\n");
#endif
#ifndef WEBRTC_CODEC_G722_1
printf(" G.722.1\n");
#endif
#ifndef WEBRTC_CODEC_G722_1C
printf(" G.722.1C\n");
#endif
#ifndef WEBRTC_CODEC_G729
printf(" G.729\n");
#endif
#ifndef WEBRTC_CODEC_G729_1
printf(" G.729.1\n");
#endif
#ifndef WEBRTC_CODEC_GSMFR
printf(" GSMFR\n");
#endif
#ifndef WEBRTC_CODEC_ILBC
printf(" iLBC\n");
#endif
@ -658,9 +342,6 @@ void TestAllCodecs::Perform() {
#ifndef WEBRTC_CODEC_PCM16
printf(" PCM16\n");
#endif
#ifndef WEBRTC_CODEC_SPEEX
printf(" Speex\n");
#endif
printf("\nTo complete the test, listen to the %d number of output files.\n",
test_count_);

1
webrtc/modules/audio_coding/main/test/opus_test.cc
View File

@ -20,7 +20,6 @@
#include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_opus.h"
#include "webrtc/modules/audio_coding/main/test/TestStereo.h"
#include "webrtc/modules/audio_coding/main/test/utility.h"
#include "webrtc/system_wrappers/interface/trace.h"

1
webrtc/modules/audio_coding/main/test/opus_test.h
View File

@ -13,7 +13,6 @@
#include <math.h>
#include "webrtc/modules/audio_coding/main/acm2/acm_opus.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
#include "webrtc/modules/audio_coding/main/test/ACMTest.h"
#include "webrtc/modules/audio_coding/main/test/Channel.h"