webrtc/modules/audio_coding/neteq/audio_decoder_impl.h - Issue 1368933002: Revert of Don't link with audio codecs that we don't use

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/audio_decoder_impl.h

Issue 1368933002: Revert of Don't link with audio codecs that we don't use (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-clean

Patch Set: 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/audio_coding_module.gypi ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

index 48ef50259f199726761a93d89b53e877cb877a98..f7d50d1f663fe59fc6dd87cce55b334fc5e61064 100644

--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

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

#include <assert.h>

+#ifndef AUDIO_DECODER_UNITTEST

+// If this is compiled as a part of the audio_deoder_unittest, the codec

+// selection is made in the gypi file instead of in engine_configurations.h.

#include "webrtc/engine_configurations.h"

+#endif

#include "webrtc/base/constructormagic.h"

#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"

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