webrtc/modules/audio_coding/main/acm2/acm_codec_database.h - 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/acm_codec_database.h

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

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

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 b1ae5aa0f56b9dc0087f14e8f797af914ada1a83..925c25fc421d05843ec385c71b1f15af9cf380e8 100644

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

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

@@ -38,7 +38,6 @@ class ACMCodecDB {

, kISACFB

# endif

#endif

-#ifdef WEBRTC_CODEC_PCM16

// Mono

, kPCM16B

, kPCM16Bwb

@@ -47,7 +46,6 @@ class ACMCodecDB {

, kPCM16B_2ch

, kPCM16Bwb_2ch

, kPCM16Bswb32kHz_2ch

-#endif

// Mono

, kPCMU

, kPCMA

@@ -90,16 +88,6 @@ class ACMCodecDB {

enum {kISAC = -1};

# endif

#endif

-#ifndef WEBRTC_CODEC_PCM16

- // Mono

- enum {kPCM16B = -1};

- enum {kPCM16Bwb = -1};

- enum {kPCM16Bswb32kHz = -1};

- // Stereo

- enum {kPCM16B_2ch = -1};

- enum {kPCM16Bwb_2ch = -1};

- enum {kPCM16Bswb32kHz_2ch = -1};

-#endif

// 48 kHz not supported, always set to -1.

enum {kPCM16Bswb48kHz = -1};

#ifndef WEBRTC_CODEC_ILBC

« no previous file with comments | « webrtc/engine_configurations.h ('k') | webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc » ('j') | no next file with comments »