Don't select audio codecs depending on GN vars `build_with_{chromium|mozilla}`
BUG=webrtc:8343
Change-Id: I5943006a4da17f72eb88eae9d7ea57574d54f680
Reviewed-on: https://webrtc-review.googlesource.com/9401
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20540}diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc
index eca81f8..ba86719 100644
--- a/modules/audio_coding/test/TestStereo.cc
+++ b/modules/audio_coding/test/TestStereo.cc
@@ -114,13 +114,11 @@
test_cntr_(0),
pack_size_samp_(0),
pack_size_bytes_(0),
- counter_(0)
-#ifdef WEBRTC_CODEC_G722
- , g722_pltype_(0)
-#endif
- , l16_8khz_pltype_(-1)
- , l16_16khz_pltype_(-1)
- , l16_32khz_pltype_(-1)
+ counter_(0),
+ g722_pltype_(0),
+ l16_8khz_pltype_(-1),
+ l16_16khz_pltype_(-1),
+ l16_32khz_pltype_(-1)
#ifdef PCMA_AND_PCMU
, pcma_pltype_(-1)
, pcmu_pltype_(-1)
@@ -128,7 +126,7 @@
#ifdef WEBRTC_CODEC_OPUS
, opus_pltype_(-1)
#endif
- {
+{
// test_mode = 0 for silent test (auto test)
test_mode_ = test_mode;
}
@@ -217,7 +215,6 @@
// All codecs are tested for all allowed sampling frequencies, rates and
// packet sizes.
-#ifdef WEBRTC_CODEC_G722
if (test_mode_ != 0) {
printf("===========================================================\n");
printf("Test number: %d\n", test_cntr_ + 1);
@@ -246,7 +243,7 @@
g722_pltype_);
Run(channel_a2b_, audio_channels, codec_channels);
out_file_.Close();
-#endif
+
if (test_mode_ != 0) {
printf("===========================================================\n");
printf("Test number: %d\n", test_cntr_ + 1);
@@ -419,7 +416,6 @@
audio_channels = 1;
codec_channels = 2;
-#ifdef WEBRTC_CODEC_G722
if (test_mode_ != 0) {
printf("===============================================================\n");
printf("Test number: %d\n", test_cntr_ + 1);
@@ -432,7 +428,7 @@
g722_pltype_);
Run(channel_a2b_, audio_channels, codec_channels);
out_file_.Close();
-#endif
+
if (test_mode_ != 0) {
printf("===============================================================\n");
printf("Test number: %d\n", test_cntr_ + 1);
@@ -512,7 +508,6 @@
codec_channels = 1;
channel_a2b_->set_codec_mode(kMono);
-#ifdef WEBRTC_CODEC_G722
// Run stereo audio and mono codec.
if (test_mode_ != 0) {
printf("===============================================================\n");
@@ -533,7 +528,7 @@
EXPECT_EQ(0, acm_a_->SetVAD(false, false, VADNormal));
Run(channel_a2b_, audio_channels, codec_channels);
out_file_.Close();
-#endif
+
if (test_mode_ != 0) {
printf("===============================================================\n");
printf("Test number: %d\n", test_cntr_ + 1);
@@ -659,9 +654,7 @@
// Print out which codecs were tested, and which were not, in the run.
if (test_mode_ != 0) {
printf("\nThe following codecs was INCLUDED in the test:\n");
-#ifdef WEBRTC_CODEC_G722
printf(" G.722\n");
-#endif
printf(" PCM16\n");
printf(" G.711\n");
#ifdef WEBRTC_CODEC_OPUS