Full impl of NnChannel::SetSendParameters and NnChannel::SetRecvParameters

talk/session/media/channel_unittest.cc

 /*
  * libjingle
  * Copyright 2009 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 163 matching lines @@
     channel2_.reset(CreateChannel(thread, &media_engine_, ch2, &session2_,
                                   (flags2 & RTCP) != 0));
     channel1_->SignalMediaMonitor.connect(
         this, &ChannelTest<T>::OnMediaMonitor);
     channel2_->SignalMediaMonitor.connect(
         this, &ChannelTest<T>::OnMediaMonitor);
     channel1_->SignalMediaError.connect(
         this, &ChannelTest<T>::OnMediaChannelError);
     channel2_->SignalMediaError.connect(
         this, &ChannelTest<T>::OnMediaChannelError);
-    channel1_->SignalAutoMuted.connect(
-        this, &ChannelTest<T>::OnMediaMuted);
+    // TODO(solenberg): !!!!
+    // channel1_->SignalAutoMuted.connect(
+    //     this, &ChannelTest<T>::OnMediaMuted);

[pthatcher1, 2015/09/04 23:21:16]

This is only used by TypingMonitor, which isn't used by anything.  So we could
remove TypingMonitor, and then remove this.

[the sun, 2015/09/08 11:31:12]

Pooff: https://codereview.chromium.org/1327033002/

I actually checked before whether it was used, but must have misread the code.

     if ((flags1 & DTLS) && (flags2 & DTLS)) {
       flags1 = (flags1 & ~SECURE);
       flags2 = (flags2 & ~SECURE);
     }
     CreateContent(flags1, kPcmuCodec, kH264Codec,
                   &local_media_content1_);
     CreateContent(flags2, kPcmuCodec, kH264Codec,
                   &local_media_content2_);
     CopyContent(local_media_content1_, &remote_media_content1_);
     CopyContent(local_media_content2_, &remote_media_content2_);
@@ skipping 706 matching lines @@
                                             CA_ANSWER, NULL));
     EXPECT_TRUE(media_channel1_->playout());
     EXPECT_TRUE(media_channel1_->sending());
   }
 
   void TestMuteStream() {
     CreateChannels(0, 0);
     // Test that we can Mute the default channel even though the sending SSRC is
     // unknown.
     EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
-    EXPECT_TRUE(channel1_->MuteStream(0, true));
+    EXPECT_TRUE(channel1_->MuteStream(0, true, nullptr));
     EXPECT_TRUE(media_channel1_->IsStreamMuted(0));
-    EXPECT_TRUE(channel1_->MuteStream(0, false));
+    EXPECT_TRUE(channel1_->MuteStream(0, false, nullptr));
     EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
 
     // Test that we can not mute an unknown SSRC.
-    EXPECT_FALSE(channel1_->MuteStream(kSsrc1, true));
+    EXPECT_FALSE(channel1_->MuteStream(kSsrc1, true, nullptr));
 
     SendInitiate();
     // After the local session description has been set, we can mute a stream
     // with its SSRC.
-    EXPECT_TRUE(channel1_->MuteStream(kSsrc1, true));
+    EXPECT_TRUE(channel1_->MuteStream(kSsrc1, true, nullptr));
     EXPECT_TRUE(media_channel1_->IsStreamMuted(kSsrc1));
-    EXPECT_TRUE(channel1_->MuteStream(kSsrc1, false));
+    EXPECT_TRUE(channel1_->MuteStream(kSsrc1, false, nullptr));
     EXPECT_FALSE(media_channel1_->IsStreamMuted(kSsrc1));
   }
 
   // Test that changing the MediaContentDirection in the local and remote
   // session description start playout and sending at the right time.
   void TestMediaContentDirection() {
     CreateChannels(0, 0);
     typename T::Content content1;
     CreateContent(0, kPcmuCodec, kH264Codec, &content1);
     typename T::Content content2;
@@ skipping 906 matching lines @@
 }
 
 class VoiceChannelTest
     : public ChannelTest<VoiceTraits> {
  public:
   typedef ChannelTest<VoiceTraits>
   Base;
   VoiceChannelTest() : Base(kPcmuFrame, sizeof(kPcmuFrame),
                             kRtcpReport, sizeof(kRtcpReport)) {
   }
-
-  void TestSetChannelOptions() {
-    CreateChannels(0, 0);
-
-    cricket::AudioOptions options1;
-    options1.echo_cancellation.Set(false);
-    cricket::AudioOptions options2;
-    options2.echo_cancellation.Set(true);
-
-    channel1_->SetChannelOptions(options1);
-    channel2_->SetChannelOptions(options1);
-    cricket::AudioOptions actual_options;
-    ASSERT_TRUE(media_channel1_->GetOptions(&actual_options));
-    EXPECT_EQ(options1, actual_options);
-    ASSERT_TRUE(media_channel2_->GetOptions(&actual_options));
-    EXPECT_EQ(options1, actual_options);
-
-    channel1_->SetChannelOptions(options2);
-    channel2_->SetChannelOptions(options2);
-    ASSERT_TRUE(media_channel1_->GetOptions(&actual_options));
-    EXPECT_EQ(options2, actual_options);
-    ASSERT_TRUE(media_channel2_->GetOptions(&actual_options));
-    EXPECT_EQ(options2, actual_options);
-  }
 };
 
 // override to add NULL parameter
 template<>
 cricket::VideoChannel* ChannelTest<VideoTraits>::CreateChannel(
     rtc::Thread* thread, cricket::MediaEngineInterface* engine,
     cricket::FakeVideoMediaChannel* ch, cricket::BaseSession* session,
     bool rtcp) {
   cricket::VideoChannel* channel = new cricket::VideoChannel(
       thread, ch, session, cricket::CN_VIDEO, rtcp);
@@ skipping 46 matching lines @@
 }
 
 class VideoChannelTest
     : public ChannelTest<VideoTraits> {
  public:
   typedef ChannelTest<VideoTraits>
   Base;
   VideoChannelTest() : Base(kH264Packet, sizeof(kH264Packet),
                             kRtcpReport, sizeof(kRtcpReport)) {
   }
-
-  void TestSetChannelOptions() {
-    CreateChannels(0, 0);
-
-    cricket::VideoOptions o1, o2;
-    o1.video_noise_reduction.Set(true);
-
-    channel1_->SetChannelOptions(o1);
-    channel2_->SetChannelOptions(o1);
-    EXPECT_TRUE(media_channel1_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
-    EXPECT_TRUE(media_channel2_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
-
-    o1.video_start_bitrate.Set(123);
-    channel1_->SetChannelOptions(o1);
-    channel2_->SetChannelOptions(o1);
-    EXPECT_TRUE(media_channel1_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
-    EXPECT_TRUE(media_channel2_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
-  }
 };
 
 
 // VoiceChannelTest
 
 TEST_F(VoiceChannelTest, TestInit) {
   Base::TestInit();
   EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
   EXPECT_TRUE(media_channel1_->dtmf_info_queue().empty());
 }
@@ skipping 152 matching lines @@
 TEST_F(VoiceChannelTest, TestMediaMonitor) {
   Base::TestMediaMonitor();
 }
 
 // Test that MuteStream properly forwards to the media channel and does
 // not signal.
 TEST_F(VoiceChannelTest, TestVoiceSpecificMuteStream) {
   CreateChannels(0, 0);
   EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
   EXPECT_FALSE(mute_callback_recved_);
-  EXPECT_TRUE(channel1_->MuteStream(0, true));
+  EXPECT_TRUE(channel1_->MuteStream(0, true, nullptr));
   EXPECT_TRUE(media_channel1_->IsStreamMuted(0));
   EXPECT_FALSE(mute_callback_recved_);
-  EXPECT_TRUE(channel1_->MuteStream(0, false));
+  EXPECT_TRUE(channel1_->MuteStream(0, false, nullptr));
   EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
   EXPECT_FALSE(mute_callback_recved_);
 }
 
 // Test that keyboard automute works correctly and signals upwards.
 TEST_F(VoiceChannelTest, DISABLED_TestKeyboardMute) {
   CreateChannels(0, 0);
   EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
   EXPECT_EQ(cricket::VoiceMediaChannel::ERROR_NONE, error_);
 
@@ skipping 206 matching lines @@
 TEST_F(VoiceChannelTest, SendBundleToBundleWithRtcpMux) {
   Base::SendBundleToBundle(
       kAudioPts, ARRAY_SIZE(kAudioPts), true, false);
 }
 
 TEST_F(VoiceChannelTest, SendBundleToBundleWithRtcpMuxSecure) {
   Base::SendBundleToBundle(
       kAudioPts, ARRAY_SIZE(kAudioPts), true, true);
 }
 
-TEST_F(VoiceChannelTest, TestSetChannelOptions) {
-  TestSetChannelOptions();
-}
-
 // VideoChannelTest
 TEST_F(VideoChannelTest, TestInit) {
   Base::TestInit();
 }
 
 TEST_F(VideoChannelTest, TestSetContents) {
   Base::TestSetContents();
 }
 
 TEST_F(VideoChannelTest, TestSetContentsNullOffer) {
@@ skipping 286 matching lines @@
   EXPECT_EQ(cricket::VideoFormat::FpsToInterval(30), send_format.interval);
 
   // stream1: 0x0x0; stream2: 0x0x0
   request.static_video_views.clear();
   EXPECT_TRUE(channel1_->ApplyViewRequest(request));
   EXPECT_TRUE(media_channel1_->GetSendStreamFormat(kSsrc1, &send_format));
   EXPECT_EQ(0, send_format.width);
   EXPECT_EQ(0, send_format.height);
 }
 
-TEST_F(VideoChannelTest, TestSetChannelOptions) {
-  TestSetChannelOptions();
-}
-
 
 // DataChannelTest
 
 class DataChannelTest
     : public ChannelTest<DataTraits> {
  public:
   typedef ChannelTest<DataTraits>
   Base;
   DataChannelTest() : Base(kDataPacket, sizeof(kDataPacket),
                            kRtcpReport, sizeof(kRtcpReport)) {
@@ skipping 186 matching lines @@
   };
   rtc::Buffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?