webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc - Issue 1338283002: Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc

Issue 1338283002: Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifdef

Patch Set: rebase Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_codec_database.h ('k') | webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc

diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc

index 4abd369656b91e69f07fb08a22ccb4d75bb8b846..78316669f6299dde818e4e7f5e04e1ea981f7145 100644

--- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc

+++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc

@@ -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