webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc - Issue 1438663003: modules/audio_coding: Remove some codec include dirs

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/rent_a_codec.cc

Issue 1438663003: modules/audio_coding: Remove some codec include dirs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebase again Created 5 years, 1 month 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/audio_coding_module_unittest_oldapi.cc ('k') | webrtc/modules/audio_coding/main/test/opus_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 40da2efa4031126d78c18c59e07161191d0191b9..c2a40243eaba8f4f1522bb0e1d2cd8f966db36db 100644

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

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

@@ -11,13 +11,13 @@

#include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h"

#include "webrtc/base/logging.h"

-#include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"

-#include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"

+#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"

+#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"

#ifdef WEBRTC_CODEC_G722

-#include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"

+#include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"

#endif

#ifdef WEBRTC_CODEC_ILBC

-#include "webrtc/modules/audio_coding/codecs/ilbc/include/audio_encoder_ilbc.h"

+#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"

#endif

#ifdef WEBRTC_CODEC_ISACFX

#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"

@@ -28,9 +28,9 @@

#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"

#endif

#ifdef WEBRTC_CODEC_OPUS

-#include "webrtc/modules/audio_coding/codecs/opus/include/audio_encoder_opus.h"

+#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h"

#endif

-#include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h"

+#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"

#ifdef WEBRTC_CODEC_RED

#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"

#endif