Control combined_audio_video_bwe with config bool.

talk/media/webrtc/webrtcvoiceengine_unittest.cc

 /*
  * libjingle
  * Copyright 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 3363 matching lines @@
   EXPECT_EQ(kSyncLabel,
             call.GetAudioReceiveStream(kAudioSsrc)->GetConfig().sync_group)
       << "SyncGroup should be set based on sync_label";
   EXPECT_EQ(kSyncLabel,
             call.GetAudioReceiveStream(kAudioSsrc + 1)->GetConfig().sync_group)
       << "SyncGroup should be set based on sync_label";
 
   media_channel->SetCall(nullptr);
 }
 
-TEST_F(WebRtcVoiceEngineTestFake, ChangeCombinedBweOption_Call) {
+TEST_F(WebRtcVoiceEngineTestFake, CanChangeCombinedBweOption) {
   // Test that changing the combined_audio_video_bwe option results in the
   // expected state changes on an associated Call.
   cricket::FakeCall call(webrtc::Call::Config(nullptr));
   const uint32 kAudioSsrc1 = 223;
   const uint32 kAudioSsrc2 = 224;
 
   EXPECT_TRUE(SetupEngine());
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
   const auto& rtp_extensions = engine_.rtp_header_extensions();
   media_channel->SetRecvRtpHeaderExtensions(rtp_extensions);
   media_channel->SetCall(&call);
   EXPECT_TRUE(media_channel->AddRecvStream(
       cricket::StreamParams::CreateLegacy(kAudioSsrc1)));
   EXPECT_TRUE(media_channel->AddRecvStream(
       cricket::StreamParams::CreateLegacy(kAudioSsrc2)));
 
-  // Combined BWE should not be set up yet (no RTP extensions).
+  // Combined BWE should not be set up yet.
   EXPECT_EQ(2, call.GetAudioReceiveStreams().size());
-  EXPECT_TRUE(call.GetAudioReceiveStream(kAudioSsrc1)
-                  ->GetConfig()
-                  .rtp.extensions.empty());
-  EXPECT_TRUE(call.GetAudioReceiveStream(kAudioSsrc2)
-                  ->GetConfig()
-                  .rtp.extensions.empty());
+  EXPECT_FALSE(call.GetAudioReceiveStream(kAudioSsrc1)
+                   ->GetConfig()
+                   .combined_audio_video_bwe);
+  EXPECT_FALSE(call.GetAudioReceiveStream(kAudioSsrc2)
+                   ->GetConfig()
+                   .combined_audio_video_bwe);
 
   // Enable combined BWE option - now it should be set up.
   cricket::AudioOptions options;
   options.combined_audio_video_bwe.Set(true);
   EXPECT_TRUE(media_channel->SetOptions(options));
   EXPECT_EQ(2, call.GetAudioReceiveStreams().size());
-  EXPECT_FALSE(call.GetAudioReceiveStream(kAudioSsrc1)
-                   ->GetConfig()
-                   .rtp.extensions.empty());
-  EXPECT_FALSE(call.GetAudioReceiveStream(kAudioSsrc2)
-                   ->GetConfig()
-                   .rtp.extensions.empty());
+  EXPECT_TRUE(call.GetAudioReceiveStream(kAudioSsrc1)
+                  ->GetConfig()
+                  .combined_audio_video_bwe);
+  EXPECT_TRUE(call.GetAudioReceiveStream(kAudioSsrc2)
+                  ->GetConfig()
+                  .combined_audio_video_bwe);
 
   // Disable combined BWE option - should be disabled again.
   options.combined_audio_video_bwe.Set(false);
   EXPECT_TRUE(media_channel->SetOptions(options));
   EXPECT_EQ(2, call.GetAudioReceiveStreams().size());
-  EXPECT_TRUE(call.GetAudioReceiveStream(kAudioSsrc1)
-                  ->GetConfig()
-                  .rtp.extensions.empty());
-  EXPECT_TRUE(call.GetAudioReceiveStream(kAudioSsrc2)
-                  ->GetConfig()
-                  .rtp.extensions.empty());
+  EXPECT_FALSE(call.GetAudioReceiveStream(kAudioSsrc1)
+                   ->GetConfig()
+                   .combined_audio_video_bwe);
+  EXPECT_FALSE(call.GetAudioReceiveStream(kAudioSsrc2)
+                   ->GetConfig()
+                   .combined_audio_video_bwe);
 
   media_channel->SetCall(nullptr);
 }
 
-TEST_F(WebRtcVoiceEngineTestFake, ConfigureCombinedBwe_Call) {
+TEST_F(WebRtcVoiceEngineTestFake, SetCall) {

[stefan-webrtc, 2015/07/24 09:57:46]

Rename

   // Test that calling SetCall() on the voice media channel results in the
   // expected state changes in Call.
   cricket::FakeCall call(webrtc::Call::Config(nullptr));
   cricket::FakeCall call2(webrtc::Call::Config(nullptr));
   const uint32 kAudioSsrc1 = 223;
   const uint32 kAudioSsrc2 = 224;
 
   EXPECT_TRUE(SetupEngine());
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
-  cricket::AudioOptions options;
-  options.combined_audio_video_bwe.Set(true);
-  EXPECT_TRUE(media_channel->SetOptions(options));
   EXPECT_TRUE(media_channel->AddRecvStream(
       cricket::StreamParams::CreateLegacy(kAudioSsrc1)));
   EXPECT_TRUE(media_channel->AddRecvStream(
       cricket::StreamParams::CreateLegacy(kAudioSsrc2)));
 
   // Combined BWE should not be set up yet.
   EXPECT_EQ(0, call.GetAudioReceiveStreams().size());
 
   // Register - should be enabled.
   media_channel->SetCall(&call);
   EXPECT_EQ(2, call.GetAudioReceiveStreams().size());
   EXPECT_NE(nullptr, call.GetAudioReceiveStream(kAudioSsrc1));
   EXPECT_NE(nullptr, call.GetAudioReceiveStream(kAudioSsrc2));
 
   // Re-register - should now be enabled on new call.
   media_channel->SetCall(&call2);
   EXPECT_EQ(0, call.GetAudioReceiveStreams().size());
   EXPECT_EQ(2, call2.GetAudioReceiveStreams().size());
   EXPECT_NE(nullptr, call2.GetAudioReceiveStream(kAudioSsrc1));
   EXPECT_NE(nullptr, call2.GetAudioReceiveStream(kAudioSsrc2));
 
   // Unregister - should be disabled again.
   media_channel->SetCall(nullptr);
   EXPECT_EQ(0, call.GetAudioReceiveStreams().size());
 }
 
-TEST_F(WebRtcVoiceEngineTestFake, ConfigureCombinedBweForNewRecvStreams_Call) {
+TEST_F(WebRtcVoiceEngineTestFake, ConfigureCombinedBweForNewRecvStreams) {
   // Test that adding receive streams after enabling combined bandwidth
   // estimation will correctly configure each channel.
   cricket::FakeCall call(webrtc::Call::Config(nullptr));
 
   EXPECT_TRUE(SetupEngine());
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
   media_channel->SetCall(&call);
   cricket::AudioOptions options;
   options.combined_audio_video_bwe.Set(true);
   EXPECT_TRUE(media_channel->SetOptions(options));
 
   static const uint32 kSsrcs[] = {1, 2, 3, 4};
   for (unsigned int i = 0; i < ARRAY_SIZE(kSsrcs); ++i) {
     EXPECT_TRUE(media_channel->AddRecvStream(
         cricket::StreamParams::CreateLegacy(kSsrcs[i])));
     EXPECT_NE(nullptr, call.GetAudioReceiveStream(kSsrcs[i]));
+    EXPECT_TRUE(call.GetAudioReceiveStream(kSsrcs[i])
+                    ->GetConfig()
+                    .combined_audio_video_bwe);
   }
   EXPECT_EQ(ARRAY_SIZE(kSsrcs), call.GetAudioReceiveStreams().size());
 
   media_channel->SetCall(nullptr);
   EXPECT_EQ(0, call.GetAudioReceiveStreams().size());
 }
 
-TEST_F(WebRtcVoiceEngineTestFake, ConfigureCombinedBweExtensions_Call) {
+TEST_F(WebRtcVoiceEngineTestFake, ConfiguresAudioReceiveStreamRtpExtensions) {
   // Test that setting the header extensions results in the expected state
   // changes on an associated Call.
   cricket::FakeCall call(webrtc::Call::Config(nullptr));
   std::vector<uint32> ssrcs;
   ssrcs.push_back(223);
   ssrcs.push_back(224);
 
   EXPECT_TRUE(SetupEngine());
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
   media_channel->SetCall(&call);
-  cricket::AudioOptions options;
-  options.combined_audio_video_bwe.Set(true);
-  EXPECT_TRUE(media_channel->SetOptions(options));
   for (uint32 ssrc : ssrcs) {
     EXPECT_TRUE(media_channel->AddRecvStream(
         cricket::StreamParams::CreateLegacy(ssrc)));
   }
 
   // Combined BWE should be set up, but with no configured extensions.
   EXPECT_EQ(2, call.GetAudioReceiveStreams().size());
   for (uint32 ssrc : ssrcs) {
     const auto* s = call.GetAudioReceiveStream(ssrc);
     EXPECT_NE(nullptr, s);
@@ skipping 132 matching lines @@
   // deleting logic, i.e., deleting |send_ch| will reset the associate send
   // channel of |recv_ch|.This is not a common case, since， normally, only the
   // default channel can be associated. However, the default is not deletable.
   // So we force the |recv_ch| to associate with a non-default channel.
   EXPECT_EQ(0, voe_.AssociateSendChannel(recv_ch, send_ch));
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), send_ch);
 
   EXPECT_TRUE(channel_->RemoveSendStream(2));
   EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), -1);
 }