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

Index: webrtc/modules/audio_coding/neteq/test/RTPencode.cc

diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc

index cbb7436152a52bfab922ca20a85464ec8df24419..5410925e8100071057f3be86caf87f5a86f17fc6 100644

--- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc

+++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc

@@ -126,10 +126,10 @@ void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride);

#include "webrtc_vad.h"

#if ((defined CODEC_PCM16B) || (defined NETEQ_ARBITRARY_CODEC))

-#include "pcm16b.h"

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

#endif

#ifdef CODEC_G711

-#include "g711_interface.h"

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

#endif

#ifdef CODEC_G729

#include "G729Interface.h"

@@ -146,19 +146,19 @@ void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride);

#include "AMRWBCreation.h"

#endif

#ifdef CODEC_ILBC

-#include "ilbc.h"

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

#endif

#if (defined CODEC_ISAC || defined CODEC_ISAC_SWB)

-#include "isac.h"

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

#endif

#ifdef NETEQ_ISACFIX_CODEC

-#include "isacfix.h"

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

#ifdef CODEC_ISAC

#error Cannot have both ISAC and ISACfix defined. Please de-select one.

#endif

#ifdef CODEC_G722

-#include "g722_interface.h"

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

#endif

#ifdef CODEC_G722_1_24

#include "G722_1Interface.h"

@@ -188,7 +188,7 @@ void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride);

#endif

#if (defined(CODEC_CNGCODEC8) || defined(CODEC_CNGCODEC16) || \

defined(CODEC_CNGCODEC32) || defined(CODEC_CNGCODEC48))

-#include "webrtc_cng.h"

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

#endif

#if ((defined CODEC_SPEEX_8) || (defined CODEC_SPEEX_16))

#include "SpeexInterface.h"

« no previous file with comments | « webrtc/modules/audio_coding/neteq/normal.cc ('k') | webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc » ('j') | no next file with comments »