Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (it was always defined)

webrtc/modules/audio_coding/main/test/TestStereo.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 100 matching lines @@
     : acm_a_(AudioCodingModule::Create(0)),
       acm_b_(AudioCodingModule::Create(1)),
       channel_a2b_(NULL),
       test_cntr_(0),
       pack_size_samp_(0),
       pack_size_bytes_(0),
       counter_(0)
 #ifdef WEBRTC_CODEC_G722
       , g722_pltype_(0)
 #endif
-#ifdef WEBRTC_CODEC_PCM16
       , l16_8khz_pltype_(-1)
       , l16_16khz_pltype_(-1)
       , l16_32khz_pltype_(-1)
-#endif
 #ifdef PCMA_AND_PCMU
       , pcma_pltype_(-1)
       , pcmu_pltype_(-1)
 #endif
 #ifdef WEBRTC_CODEC_OPUS
       , opus_pltype_(-1)
 #endif
       {
   // test_mode = 0 for silent test (auto test)
   test_mode_ = test_mode;
@@ skipping 104 matching lines @@
       g722_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   RegisterSendCodec('A', codec_g722, 16000, 64000, 800, codec_channels,
       g722_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   RegisterSendCodec('A', codec_g722, 16000, 64000, 960, codec_channels,
       g722_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   out_file_.Close();
 #endif
-#ifdef WEBRTC_CODEC_PCM16
   if (test_mode_ != 0) {
     printf("===========================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Stereo-to-stereo\n");
   }
   channel_a2b_->set_codec_mode(kStereo);
   test_cntr_++;
   OpenOutFile(test_cntr_);
   char codec_l16[] = "L16";
   RegisterSendCodec('A', codec_l16, 8000, 128000, 80, codec_channels,
@@ skipping 38 matching lines @@
   }
   test_cntr_++;
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_l16, 32000, 512000, 320, codec_channels,
       l16_32khz_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   RegisterSendCodec('A', codec_l16, 32000, 512000, 640, codec_channels,
       l16_32khz_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   out_file_.Close();
-#endif
 #ifdef PCMA_AND_PCMU
   if (test_mode_ != 0) {
     printf("===========================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Stereo-to-stereo\n");
   }
   channel_a2b_->set_codec_mode(kStereo);
   audio_channels = 2;
   codec_channels = 2;
   test_cntr_++;
@@ skipping 108 matching lines @@
     printf("Test type: Mono-to-stereo\n");
   }
   test_cntr_++;
   channel_a2b_->set_codec_mode(kStereo);
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_g722, 16000, 64000, 160, codec_channels,
       g722_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   out_file_.Close();
 #endif
-#ifdef WEBRTC_CODEC_PCM16
   if (test_mode_ != 0) {
     printf("===============================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Mono-to-stereo\n");
   }
   test_cntr_++;
   channel_a2b_->set_codec_mode(kStereo);
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_l16, 8000, 128000, 80, codec_channels,
       l16_8khz_pltype_);
@@ skipping 14 matching lines @@
     printf("===============================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Mono-to-stereo\n");
   }
   test_cntr_++;
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_l16, 32000, 512000, 320, codec_channels,
       l16_32khz_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   out_file_.Close();
-#endif
 #ifdef PCMA_AND_PCMU
   if (test_mode_ != 0) {
     printf("===============================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Mono-to-stereo\n");
   }
   test_cntr_++;
   channel_a2b_->set_codec_mode(kStereo);
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_pcmu, 8000, 64000, 80, codec_channels,
@@ skipping 47 matching lines @@
   // Make sure it is possible to set VAD/CNG, now that we are sending mono
   // again.
   EXPECT_EQ(0, acm_a_->SetVAD(true, true, VADNormal));
   EXPECT_EQ(0, acm_a_->VAD(&dtx, &vad, &vad_mode));
   EXPECT_TRUE(dtx);
   EXPECT_TRUE(vad);
   EXPECT_EQ(0, acm_a_->SetVAD(false, false, VADNormal));
   Run(channel_a2b_, audio_channels, codec_channels);
   out_file_.Close();
 #endif
-#ifdef WEBRTC_CODEC_PCM16
   if (test_mode_ != 0) {
     printf("===============================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Stereo-to-mono\n");
   }
   test_cntr_++;
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_l16, 8000, 128000, 80, codec_channels,
       l16_8khz_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
@@ skipping 13 matching lines @@
     printf("==============================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Stereo-to-mono\n");
   }
   test_cntr_++;
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_l16, 32000, 512000, 320, codec_channels,
       l16_32khz_pltype_);
   Run(channel_a2b_, audio_channels, codec_channels);
   out_file_.Close();
-#endif
 #ifdef PCMA_AND_PCMU
   if (test_mode_ != 0) {
     printf("===============================================================\n");
     printf("Test number: %d\n", test_cntr_ + 1);
     printf("Test type: Stereo-to-mono\n");
   }
   test_cntr_++;
   OpenOutFile(test_cntr_);
   RegisterSendCodec('A', codec_pcmu, 8000, 64000, 80, codec_channels,
                     pcmu_pltype_);
@@ skipping 69 matching lines @@
   out_file_.Close();
 
 #endif
 
   // 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
-#ifdef WEBRTC_CODEC_PCM16
     printf("   PCM16\n");
-#endif
     printf("   G.711\n");
 #ifdef WEBRTC_CODEC_OPUS
     printf("   Opus\n");
 #endif
     printf("\nTo complete the test, listen to the %d number of output "
            "files.\n",
            test_cntr_);
   }
 
   // Delete the file pointers.
@@ skipping 160 matching lines @@
   if (test_mode_ != 0) {
     printf("%s -> ", my_codec_param.plname);
   }
   acm_b_->ReceiveCodec(&my_codec_param);
   if (test_mode_ != 0) {
     printf("%s\n", my_codec_param.plname);
   }
 }
 
 }  // namespace webrtc