webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc - 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/acm_receiver_unittest_oldapi.cc

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc ('k') | webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 964e7f348f7478006badd83e9be00bba54035ee7..c30eaf043238a6b1d3eca8ce5658de2d92ebf81a 100644

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

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

@@ -292,7 +292,14 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(PostdecodingVad)) {

EXPECT_EQ(AudioFrame::kVadUnknown, frame.vad_activity_);

}

-TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(LastAudioCodec)) {

+#ifdef WEBRTC_CODEC_ISAC

+#define IF_ISAC_FLOAT(x) x

+#else

+#define IF_ISAC_FLOAT(x) DISABLED_##x

+#endif

+TEST_F(AcmReceiverTestOldApi,

+ DISABLED_ON_ANDROID(IF_ISAC_FLOAT(LastAudioCodec))) {

const int kCodecId[] = {

ACMCodecDB::kISAC, ACMCodecDB::kPCMA, ACMCodecDB::kISACSWB,

ACMCodecDB::kPCM16Bswb32kHz,