diff options
| author | henrik.lundin@webrtc.org <henrik.lundin@webrtc.org> | 2015-02-23 09:25:40 +0000 |
|---|---|---|
| committer | henrik.lundin@webrtc.org <henrik.lundin@webrtc.org> | 2015-02-23 09:26:51 +0000 |
| commit | fa5874544577cb1b59657e7c79d9eb51383c855d (patch) | |
| tree | e6489c1ec445c17ef699b5a3e407ea9968922c82 /webrtc/modules/audio_coding/main/acm2/acm_codec_database.h | |
| parent | 2a5cfc216792a24dfdf4afbe9936f2f9953b62a3 (diff) | |
| download | webrtc-fa5874544577cb1b59657e7c79d9eb51383c855d.tar.gz | |
Delete all codec-specific subclasses of ACMGenericCodec
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
Diffstat (limited to 'webrtc/modules/audio_coding/main/acm2/acm_codec_database.h')
| -rw-r--r-- | webrtc/modules/audio_coding/main/acm2/acm_codec_database.h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h index 94cad5c11e..ea7eb23ac0 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h @@ -57,45 +57,16 @@ class ACMCodecDB { #ifdef WEBRTC_CODEC_ILBC , kILBC #endif -#ifdef WEBRTC_CODEC_AMR - , kGSMAMR -#endif -#ifdef WEBRTC_CODEC_AMRWB - , kGSMAMRWB -#endif #ifdef WEBRTC_CODEC_G722 // Mono , kG722 // Stereo , kG722_2ch #endif -#ifdef WEBRTC_CODEC_G722_1 - , kG722_1_32 - , kG722_1_24 - , kG722_1_16 -#endif -#ifdef WEBRTC_CODEC_G722_1C - , kG722_1C_48 - , kG722_1C_32 - , kG722_1C_24 -#endif -#ifdef WEBRTC_CODEC_G729 - , kG729 -#endif -#ifdef WEBRTC_CODEC_G729_1 - , kG729_1 -#endif -#ifdef WEBRTC_CODEC_GSMFR - , kGSMFR -#endif #ifdef WEBRTC_CODEC_OPUS // Mono and stereo , kOpus #endif -#ifdef WEBRTC_CODEC_SPEEX - , kSPEEX8 - , kSPEEX16 -#endif , kCNNB , kCNWB , kCNSWB @@ -134,41 +105,12 @@ class ACMCodecDB { #ifndef WEBRTC_CODEC_ILBC enum {kILBC = -1}; #endif -#ifndef WEBRTC_CODEC_AMR - enum {kGSMAMR = -1}; -#endif -#ifndef WEBRTC_CODEC_AMRWB - enum {kGSMAMRWB = -1}; -#endif #ifndef WEBRTC_CODEC_G722 // Mono enum {kG722 = -1}; // Stereo enum {kG722_2ch = -1}; #endif -#ifndef WEBRTC_CODEC_G722_1 - enum {kG722_1_32 = -1}; - enum {kG722_1_24 = -1}; - enum {kG722_1_16 = -1}; -#endif -#ifndef WEBRTC_CODEC_G722_1C - enum {kG722_1C_48 = -1}; - enum {kG722_1C_32 = -1}; - enum {kG722_1C_24 = -1}; -#endif -#ifndef WEBRTC_CODEC_G729 - enum {kG729 = -1}; -#endif -#ifndef WEBRTC_CODEC_G729_1 - enum {kG729_1 = -1}; -#endif -#ifndef WEBRTC_CODEC_GSMFR - enum {kGSMFR = -1}; -#endif -#ifndef WEBRTC_CODEC_SPEEX - enum {kSPEEX8 = -1}; - enum {kSPEEX16 = -1}; -#endif #ifndef WEBRTC_CODEC_OPUS // Mono and stereo enum {kOpus = -1}; |