webrtc/modules/audio_coding/main/acm2/codec_owner.h - Issue 1368843003: 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/main/acm2/codec_owner.h

Issue 1368843003: Don't link with audio codecs that we don't use (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Add comment 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:

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

diff --git a/webrtc/modules/audio_coding/main/acm2/codec_owner.h b/webrtc/modules/audio_coding/main/acm2/codec_owner.h

index 3835c2888f05024012129dc425f9b4882c093118..d2d93cf539eed2db5bd32815b13b6dc38728557f 100644

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

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

@@ -15,13 +15,19 @@

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/common_types.h"

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

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

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

#include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"

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

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

+#else

+// Dummy implementation, for when we don't have iSAC.

namespace webrtc {

+class LockedIsacBandwidthInfo {};

+#endif

-class AudioDecoder;

+namespace webrtc {

namespace acm2 {

class CodecOwner {