webrtc/modules/audio_coding/main/acm2/acm_receive_test.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_receive_test.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: fixes 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/BUILD.gn ('k') | webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc » ('j') | webrtc/modules/audio_coding/main/test/TestRedFec.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b5a86d0bde3e2f6c68dbe915699dbc2463d6f967..e01b263127098e8201c9d6fbe3c62f8582b0d3f3 100644

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

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

@@ -38,9 +38,13 @@ AcmReceiveTest::AcmReceiveTest(PacketSource* packet_source,

}

void AcmReceiveTest::RegisterDefaultCodecs() {

+#ifdef WEBRTC_CODEC_OPUS

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kOpus, 120));

+#endif

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

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISAC, 103));

-#ifndef WEBRTC_ANDROID

+#endif

+#ifdef WEBRTC_CODEC_ISAC

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACSWB, 104));

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACFB, 105));

#endif

@@ -56,13 +60,19 @@ void AcmReceiveTest::RegisterDefaultCodecs() {

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCMA, 8));

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCMU_2ch, 110));

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCMA_2ch, 118));

+#ifdef WEBRTC_CODEC_ILBC

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kILBC, 102));

+#endif

+#ifdef WEBRTC_CODEC_G722

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kG722, 9));

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kG722_2ch, 119));

+#endif

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kCNNB, 13));

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kCNWB, 98));

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kCNSWB, 99));

+#ifdef WEBRTC_CODEC_RED

ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kRED, 127));

+#endif

}

void AcmReceiveTest::RegisterNetEqTestCodecs() {

hlundin-webrtc 2015/09/30 12:53:26 Won't this method need the same treatment as above

kwiberg-webrtc 2015/09/30 13:25:41 It would, if it was called from a test that wasn't