Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

webrtc/media/engine/webrtcvoiceengine_unittest.cc

 /*
  *  Copyright (c) 2008 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 2550 matching lines @@
 TEST_F(WebRtcVoiceEngineWithSendSideBweWithOverheadTest, MinAndMaxBitrate) {
   EXPECT_TRUE(SetupSendStream());
   cricket::AudioSendParameters parameters;
   parameters.codecs.push_back(kOpusCodec);
   SetSendParameters(parameters);
   const int initial_num = call_.GetNumCreatedSendStreams();
   EXPECT_EQ(initial_num, call_.GetNumCreatedSendStreams());
 
   // OverheadPerPacket = Ipv4(20B) + UDP(8B) + SRTP(10B) + RTP(12)
   constexpr int kOverheadPerPacket = 20 + 8 + 10 + 12;
+#if WEBRTC_OPUS_SUPPORT_120MS_PTIME
+  constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 / 120;
+#else
   constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 / 60;
+#endif

[kwiberg-webrtc, 2017/02/16 12:07:03]

Or

  constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 /
      (WEBRTC_OPUS_SUPPORT_120MS_PTIME ? 120 : 60);

In fact, given that you use that subexpression once more below, why not

  constexpr int opus_max_ptime_ms = WEBRTC_OPUS_SUPPORT_120MS_PTIME ? 120 : 60;
  constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 /
opus_max_ptime_ms;

[ossu, 2017/02/16 12:19:32]

Alright, that also matches the implementation. Will fix.

   constexpr int kMaxOverheadBps = kOverheadPerPacket * 8 * 1000 / 10;
 
   constexpr int kOpusMinBitrateBps = 6000;
   EXPECT_EQ(kOpusMinBitrateBps + kMinOverheadBps,
             GetSendStreamConfig(kSsrc1).min_bitrate_bps);
   constexpr int kOpusBitrateFbBps = 32000;
   EXPECT_EQ(kOpusBitrateFbBps + kMaxOverheadBps,
             GetSendStreamConfig(kSsrc1).max_bitrate_bps);
 
   parameters.options.audio_network_adaptor = rtc::Optional<bool>(true);
   parameters.options.audio_network_adaptor_config =
       rtc::Optional<std::string>("1234");
   SetSendParameters(parameters);
 
+#if WEBRTC_OPUS_SUPPORT_120MS_PTIME
+  constexpr int kMinOverheadWithAnaBps = kOverheadPerPacket * 8 * 1000 / 120;
+#else
   constexpr int kMinOverheadWithAnaBps = kOverheadPerPacket * 8 * 1000 / 60;
+#endif
   constexpr int kMaxOverheadWithAnaBps = kOverheadPerPacket * 8 * 1000 / 20;
 
   EXPECT_EQ(kOpusMinBitrateBps + kMinOverheadWithAnaBps,
             GetSendStreamConfig(kSsrc1).min_bitrate_bps);
 
   EXPECT_EQ(kOpusBitrateFbBps + kMaxOverheadWithAnaBps,
             GetSendStreamConfig(kSsrc1).max_bitrate_bps);
 }
 
 // Test that we can set the outgoing SSRC properly.
@@ skipping 947 matching lines @@
     delete channel;
   }
 }
 
 // Tests that the library is configured with the codecs we want.
 TEST(WebRtcVoiceEngineTest, HasCorrectCodecs) {
   // TODO(ossu): These tests should move into a future "builtin audio codecs"
   // module.
 
   // Check codecs by name.
+#ifdef WEBRTC_CODEC_OPUS
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "OPUS", 48000, 0, 2), nullptr));
+#endif
+#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "ISAC", 16000, 0, 1), nullptr));
+#endif
+#if (defined(WEBRTC_CODEC_ISAC))
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "ISAC", 32000, 0, 1), nullptr));
+#endif
+#ifdef WEBRTC_CODEC_ILBC
   // Check that name matching is case-insensitive.
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "ILBC", 8000, 0, 1), nullptr));
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "iLBC", 8000, 0, 1), nullptr));
+#endif
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "CN", 32000, 0, 1), nullptr));
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "CN", 16000, 0, 1), nullptr));
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "telephone-event", 8000, 0, 1), nullptr));
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "telephone-event", 16000, 0, 1), nullptr));
   EXPECT_TRUE(cricket::WebRtcVoiceEngine::ToCodecInst(
       cricket::AudioCodec(96, "telephone-event", 32000, 0, 1), nullptr));
@@ skipping 169 matching lines @@
   // Without this cast, the comparison turned unsigned and, thus, failed for -1.
   const int num_specs = static_cast<int>(specs.size());
   EXPECT_GE(find_codec({"cn", 8000, 1}), num_specs);
   EXPECT_GE(find_codec({"cn", 16000, 1}), num_specs);
   EXPECT_EQ(find_codec({"cn", 32000, 1}), -1);
   EXPECT_GE(find_codec({"telephone-event", 8000, 1}), num_specs);
   EXPECT_GE(find_codec({"telephone-event", 16000, 1}), num_specs);
   EXPECT_GE(find_codec({"telephone-event", 32000, 1}), num_specs);
   EXPECT_GE(find_codec({"telephone-event", 48000, 1}), num_specs);
 }