webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc - Issue 1336923002: Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (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/audio_coding_module_impl.cc

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

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.cc ('k') | webrtc/modules/audio_coding/main/acm2/codec_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index cb07cd6eb74378dcf37354e375bdbee687b1feb4..be0fbf1d3e2817305688974b5e03711704d29317 100644

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

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

@@ -1015,7 +1015,6 @@ bool AudioCodingImpl::MapCodecTypeToParameters(int codec_type,

int* sample_rate_hz,

int* channels) {

switch (codec_type) {

-#ifdef WEBRTC_CODEC_PCM16

case acm2::ACMCodecDB::kPCM16B:

*codec_name = "L16";

*sample_rate_hz = 8000;

@@ -1046,7 +1045,6 @@ bool AudioCodingImpl::MapCodecTypeToParameters(int codec_type,

*sample_rate_hz = 32000;

*channels = 2;

break;

-#endif

#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))

case acm2::ACMCodecDB::kISAC:

*codec_name = "ISAC";