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

Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined)

Browse Source 
BUG=webrtc:4557

Review URL: https://codereview.webrtc.org/1338283002

Cr-Commit-Position: refs/heads/master@{#9960}
This commit is contained in:
kwiberg
2015-09-16 19:29:43 -07:00
committed by Commit bot
parent 7754285f7c
commit 1f9baab753
5 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/engine_configurations.h
View File

@ -31,10 +31,6 @@
#define WEBRTC_CODEC_G722
#endif // !WEBRTC_MOZILLA_BUILD
// AVT is included in all builds, along with G.711, NetEQ and CNG
// (which are mandatory and don't have any defines).
#define WEBRTC_CODEC_AVT
// iLBC and Redundancy coding are excluded from Chromium and Mozilla
// builds to reduce binary size.
#if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_MOZILLA_BUILD)

6
webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
View File

@ -75,9 +75,7 @@ const CodecInst ACMCodecDB::database_[] = {
#ifdef ENABLE_48000_HZ
{100, "CN", 48000, 1440, 1, 0},
#endif
#ifdef WEBRTC_CODEC_AVT
{106, "telephone-event", 8000, 240, 1, 0},
#endif
#ifdef WEBRTC_CODEC_RED
{127, "red", 8000, 0, 1, 0},
#endif
@ -134,9 +132,7 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
#ifdef ENABLE_48000_HZ
{1, {1440}, 1440, 1, false},
#endif
#ifdef WEBRTC_CODEC_AVT
{1, {240}, 240, 1, false},
#endif
#ifdef WEBRTC_CODEC_RED
{1, {0}, 0, 1, false},
#endif
@ -188,9 +184,7 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
#ifdef ENABLE_48000_HZ
, kDecoderCNGswb48kHz
#endif
#ifdef WEBRTC_CODEC_AVT
, kDecoderAVT
#endif
#ifdef WEBRTC_CODEC_RED
, kDecoderRED
#endif

5
webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
View File

@ -71,9 +71,7 @@ class ACMCodecDB {
#ifdef ENABLE_48000_HZ
, kCNFB
#endif
#ifdef WEBRTC_CODEC_AVT
, kAVT
#endif
#ifdef WEBRTC_CODEC_RED
, kRED
#endif
@ -103,9 +101,6 @@ class ACMCodecDB {
// Mono and stereo
enum {kOpus = -1};
#endif
#ifndef WEBRTC_CODEC_AVT
enum {kAVT = -1};
#endif
#ifndef WEBRTC_CODEC_RED
enum {kRED = -1};
#endif

2
webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
View File

@ -1130,13 +1130,11 @@ bool AudioCodingImpl::MapCodecTypeToParameters(int codec_type,
*sample_rate_hz = 8000;
*channels = 1;
break;
#ifdef WEBRTC_CODEC_AVT
case acm2::ACMCodecDB::kAVT:
*codec_name = "telephone-event";
*sample_rate_hz = 8000;
*channels = 1;
break;
#endif
default:
FATAL() << "Codec type " << codec_type << " not supported.";
}

6
webrtc/voice_engine/channel.cc
View File

@ -932,12 +932,8 @@ Channel::Init()
// --- ACM initialization
if ((audio_coding_->InitializeReceiver() == -1)
#ifdef WEBRTC_CODEC_AVT
// out-of-band Dtmf tones are played out by default
|| (audio_coding_->SetDtmfPlayoutStatus(true) == -1)
#endif
)
{
|| (audio_coding_->SetDtmfPlayoutStatus(true) == -1)) {
_engineStatisticsPtr->SetLastError(
VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
"Channel::Init() unable to initialize the ACM - 1");