Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc

Issue 1349393003: 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: ARM fix 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
Index: webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
index 78ebf9f708ff6e0458657e08cd78441225faf5c2..2d4f65d2298d6c4314cbff9994bd6c19afc50eee 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -702,14 +702,19 @@ TEST(AudioDecoder, CodecSampleRateHz) {
}
TEST(AudioDecoder, CodecSupported) {
+#ifdef WEBRTC_ARCH_ARM
+ static const bool has_isac_swb = false;
hlundin-webrtc 2015/09/22 09:09:18 Nit: kHasIsacSwb?
kwiberg-webrtc 2015/09/22 09:37:04 "Use a k followed by mixed case, e.g., kDaysInAWee
hlundin-webrtc 2015/09/22 10:05:55 Acknowledged.
+#else
+ static const bool has_isac_swb = true;
+#endif
EXPECT_TRUE(CodecSupported(kDecoderPCMu));
EXPECT_TRUE(CodecSupported(kDecoderPCMa));
EXPECT_TRUE(CodecSupported(kDecoderPCMu_2ch));
EXPECT_TRUE(CodecSupported(kDecoderPCMa_2ch));
EXPECT_TRUE(CodecSupported(kDecoderILBC));
EXPECT_TRUE(CodecSupported(kDecoderISAC));
- EXPECT_TRUE(CodecSupported(kDecoderISACswb));
- EXPECT_TRUE(CodecSupported(kDecoderISACfb));
+ EXPECT_EQ(has_isac_swb, CodecSupported(kDecoderISACswb));
+ EXPECT_EQ(has_isac_swb, CodecSupported(kDecoderISACfb));
EXPECT_TRUE(CodecSupported(kDecoderPCM16B));
EXPECT_TRUE(CodecSupported(kDecoderPCM16Bwb));
EXPECT_TRUE(CodecSupported(kDecoderPCM16Bswb32kHz));

Powered by Google App Engine
This is Rietveld 408576698