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

talk/media/base/videoengine_unittest.h

 /*
  * libjingle
  * Copyright 2014 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 445 matching lines @@
 
   virtual void SetUp() {
     cricket::Device device("test", "device");
     engine_.Init();
     channel_.reset(engine_.CreateChannel(cricket::VideoOptions(), NULL));
     EXPECT_TRUE(channel_.get() != NULL);
     ConnectVideoChannelError();
     network_interface_.SetDestination(channel_.get());
     channel_->SetInterface(&network_interface_);
     media_error_ = cricket::VideoMediaChannel::ERROR_NONE;
-    channel_->SetRecvCodecs(engine_.codecs());
+    cricket::VideoRecvParameters parameters;
+    parameters.codecs = engine_.codecs();
+    channel_->SetRecvParameters(parameters);
     EXPECT_TRUE(channel_->AddSendStream(DefaultSendStreamParams()));
     video_capturer_.reset(CreateFakeVideoCapturer());
     cricket::VideoFormat format(640, 480,
                                 cricket::VideoFormat::FpsToInterval(30),
                                 cricket::FOURCC_I420);
     EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(format));
     EXPECT_TRUE(channel_->SetCapturer(kSsrc, video_capturer_.get()));
   }
 
   virtual cricket::FakeVideoCapturer* CreateFakeVideoCapturer() {
@@ skipping 40 matching lines @@
         &VideoMediaChannelTest<E, C>::OnVideoChannelError);
   }
   bool SetDefaultCodec() {
     return SetOneCodec(DefaultCodec());
   }
 
   bool SetOneCodec(int pt, const char* name, int w, int h, int fr) {
     return SetOneCodec(cricket::VideoCodec(pt, name, w, h, fr, 0));
   }
   bool SetOneCodec(const cricket::VideoCodec& codec) {
-    std::vector<cricket::VideoCodec> codecs;
-    codecs.push_back(codec);
-
     cricket::VideoFormat capture_format(codec.width, codec.height,
         cricket::VideoFormat::FpsToInterval(codec.framerate),
         cricket::FOURCC_I420);
 
     if (video_capturer_) {
       EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(capture_format));
     }
     if (video_capturer_2_) {
       EXPECT_EQ(cricket::CS_RUNNING, video_capturer_2_->Start(capture_format));
     }
 
     bool sending = channel_->sending();
     bool success = SetSend(false);
-    if (success)
-      success = channel_->SetSendCodecs(codecs);
-    if (success)
+    if (success) {
+      cricket::VideoSendParameters parameters;
+      parameters.codecs.push_back(codec);
+      success = channel_->SetSendParameters(parameters);
+    }
+    if (success) {
       success = SetSend(sending);
+    }
     return success;
   }
   bool SetSend(bool send) {
     return channel_->SetSend(send);
   }
   bool SetSendStreamFormat(uint32 ssrc, const cricket::VideoCodec& codec) {
     return channel_->SetSendStreamFormat(ssrc, cricket::VideoFormat(
         codec.width, codec.height,
         cricket::VideoFormat::FpsToInterval(codec.framerate),
         cricket::FOURCC_ANY));
@@ skipping 290 matching lines @@
     EXPECT_EQ(DefaultCodec().width, info.receivers[0].frame_width);
     EXPECT_EQ(DefaultCodec().height, info.receivers[0].frame_height);
     EXPECT_GT(info.receivers[0].framerate_rcvd, 0);
     EXPECT_GT(info.receivers[0].framerate_decoded, 0);
     EXPECT_GT(info.receivers[0].framerate_output, 0);
   }
   // Test that stats work properly for a conf call with multiple recv streams.
   void GetStatsMultipleRecvStreams() {
     cricket::FakeVideoRenderer renderer1, renderer2;
     EXPECT_TRUE(SetOneCodec(DefaultCodec()));
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
+    cricket::VideoSendParameters parameters;
+    parameters.options.conference_mode.Set(true);
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
     EXPECT_TRUE(SetSend(true));
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(1)));
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(2)));
     EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
     EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
     EXPECT_TRUE(channel_->SetRender(true));
     EXPECT_EQ(0, renderer1.num_rendered_frames());
     EXPECT_EQ(0, renderer2.num_rendered_frames());
@@ skipping 25 matching lines @@
       EXPECT_EQ(NumRtpPackets(), info.receivers[i].packets_rcvd);
       EXPECT_EQ(DefaultCodec().width, info.receivers[i].frame_width);
       EXPECT_EQ(DefaultCodec().height, info.receivers[i].frame_height);
     }
   }
   // Test that stats work properly for a conf call with multiple send streams.
   void GetStatsMultipleSendStreams() {
     // Normal setup; note that we set the SSRC explicitly to ensure that
     // it will come first in the senders map.
     EXPECT_TRUE(SetOneCodec(DefaultCodec()));
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
+    cricket::VideoSendParameters parameters;
+    parameters.options.conference_mode.Set(true);
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(kSsrc)));
     EXPECT_TRUE(channel_->SetRenderer(kSsrc, &renderer_));
     channel_->UpdateAspectRatio(640, 400);
     EXPECT_TRUE(SetSend(true));
     EXPECT_TRUE(channel_->SetRender(true));
     EXPECT_TRUE(SendFrame());
     EXPECT_TRUE_WAIT(NumRtpPackets() > 0, kTimeout);
     EXPECT_FRAME_WAIT(1, DefaultCodec().width, DefaultCodec().height, kTimeout);
 
@@ skipping 44 matching lines @@
     EXPECT_EQ(1U, info.senders[1].ssrcs().size());
     EXPECT_EQ(5678U, info.senders[1].ssrcs()[0]);
     EXPECT_EQ(kTestWidth, info.senders[1].send_frame_width);
     EXPECT_EQ(kTestHeight, info.senders[1].send_frame_height);
     // The capturer must be unregistered here as it runs out of it's scope next.
     EXPECT_TRUE(channel_->SetCapturer(5678, NULL));
   }
 
   // Test that we can set the bandwidth.
   void SetSendBandwidth() {
-    EXPECT_TRUE(channel_->SetMaxSendBandwidth(-1));  // <= 0 means unlimited.
-    EXPECT_TRUE(channel_->SetMaxSendBandwidth(128 * 1024));
+    cricket::VideoSendParameters parameters;
+    parameters.max_bandwidth_bps = -1;  // <= 0 means unlimited.
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
+    parameters.max_bandwidth_bps = 128 * 1024;
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
   }
   // Test that we can set the SSRC for the default send source.
   void SetSendSsrc() {
     EXPECT_TRUE(SetDefaultCodec());
     EXPECT_TRUE(SetSendStreamFormat(kSsrc, DefaultCodec()));
     EXPECT_TRUE(SetSend(true));
     EXPECT_TRUE(SendFrame());
     EXPECT_TRUE_WAIT(NumRtpPackets() > 0, kTimeout);
     uint32 ssrc = 0;
     rtc::scoped_ptr<const rtc::Buffer> p(GetRtpPacket(0));
@@ skipping 85 matching lines @@
     // Wait 30ms to guarantee the engine does not drop the frame.
     EXPECT_TRUE(WaitAndSendFrame(30));
     EXPECT_TRUE_WAIT(NumRtpPackets() > rtp_packets, kTimeout);
 
     last_packet = NumRtpPackets() - 1;
     p.reset(GetRtpPacket(static_cast<int>(last_packet)));
     ParseRtpPacket(p.get(), NULL, NULL, NULL, NULL, &ssrc, NULL);
     EXPECT_EQ(789u, ssrc);
   }
 
-  // Tests adding streams already exists returns false.
-  void AddRecvStreamsAlreadyExist() {
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
-
-    EXPECT_FALSE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(0)));
-
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(1)));
-    EXPECT_FALSE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(1)));
-
-    EXPECT_TRUE(channel_->RemoveRecvStream(1));
-    EXPECT_FALSE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(0)));
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(1)));
-  }
-
   // Tests setting up and configuring multiple incoming streams.
   void AddRemoveRecvStreams() {
     cricket::FakeVideoRenderer renderer1, renderer2;
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
+    cricket::VideoSendParameters parameters;
+    parameters.options.conference_mode.Set(true);
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
+
     // Ensure we can't set the renderer on a non-existent stream.
     EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
     EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
     cricket::VideoRenderer* renderer;
     EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
     EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
 
     // Ensure we can add streams.
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(1)));
@@ skipping 109 matching lines @@
     EXPECT_GT_FRAME_ON_RENDERER_WAIT(
         renderer1, 2, DefaultCodec().width, DefaultCodec().height, kTimeout);
     // Detach |renderer1| before exit as there might be frames come late.
     EXPECT_TRUE(channel_->SetRenderer(kSsrc, NULL));
   }
 
   // Tests the behavior of incoming streams in a conference scenario.
   void SimulateConference() {
     cricket::FakeVideoRenderer renderer1, renderer2;
     EXPECT_TRUE(SetDefaultCodec());
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
+    cricket::VideoSendParameters parameters;
+    parameters.options.conference_mode.Set(true);
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
     EXPECT_TRUE(SetSend(true));
     EXPECT_TRUE(channel_->SetRender(true));
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(1)));
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(2)));
     EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
     EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
     EXPECT_EQ(0, renderer1.num_rendered_frames());
     EXPECT_EQ(0, renderer2.num_rendered_frames());
@@ skipping 497 matching lines @@
 
     EXPECT_TRUE(channel_->SetCapturer(new_ssrc, video_capturer_.get()));
 
     SendAndReceive(codec);
     EXPECT_TRUE(channel_->RemoveSendStream(new_ssrc));
     EXPECT_EQ(0u, channel_->GetDefaultSendChannelSsrc());
   }
 
   // Tests that we can send and receive frames with early receive.
   void TwoStreamsSendAndUnsignalledRecv(const cricket::VideoCodec& codec) {
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    vmo.unsignalled_recv_stream_limit.Set(1);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
+    cricket::VideoSendParameters parameters;
+    parameters.options.conference_mode.Set(true);
+    parameters.options.unsignalled_recv_stream_limit.Set(1);
+    EXPECT_TRUE(channel_->SetSendParameters(parameters));
     SetUpSecondStreamWithNoRecv();
     // Test sending and receiving on first stream.
     EXPECT_TRUE(channel_->SetRender(true));
     Send(codec);
     EXPECT_EQ_WAIT(2, NumRtpPackets(), kTimeout);
     EXPECT_EQ_WAIT(1, renderer_.num_rendered_frames(), kTimeout);
     // The first send is not expected to yield frames, because the ssrc
     // is not signalled yet. With unsignalled recv enabled, we will drop frames
     // instead of packets.
     EXPECT_EQ(0, renderer2_.num_rendered_frames());
     // Give a chance for the decoder to process before adding the receiver.
     rtc::Thread::Current()->ProcessMessages(100);
     // Test sending and receiving on second stream.
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(kSsrc + 2)));
     EXPECT_TRUE(channel_->SetRenderer(kSsrc + 2, &renderer2_));
     SendFrame();
     EXPECT_EQ_WAIT(2, renderer_.num_rendered_frames(), kTimeout);
     EXPECT_EQ(4, NumRtpPackets());
     // The second send is expected to yield frame as the ssrc is signalled now.
     // Decode should succeed here, though we received the key frame earlier.
     // Without early recv, we would have dropped it and decoding would have
     // failed.
     EXPECT_EQ_WAIT(1, renderer2_.num_rendered_frames(), kTimeout);
   }
 
-  // Tests that we cannot receive key frames with unsignalled recv disabled.

[pthatcher1, 2015/09/14 19:42:02]

We are you removing the tests for unsignalled_recv_stream_limit?

We shouldn't do that unless we remove unsignalled_recv_stream_limit, which I'd
be OK with since it doesn't do anything any more.  But that should be in a
separate CL, I think.

[the sun, 2015/09/14 19:58:00]

These are helper functions which turned out to be unused.

-  void TwoStreamsSendAndFailUnsignalledRecv(const cricket::VideoCodec& codec) {
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(true);
-    vmo.unsignalled_recv_stream_limit.Set(0);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
-    SetUpSecondStreamWithNoRecv();
-    // Test sending and receiving on first stream.
-    EXPECT_TRUE(channel_->SetRender(true));
-    Send(codec);
-    EXPECT_EQ_WAIT(2, NumRtpPackets(), kTimeout);
-    rtc::Thread::Current()->ProcessMessages(100);
-    EXPECT_EQ_WAIT(1, renderer_.num_rendered_frames(), kTimeout);
-    EXPECT_EQ_WAIT(0, renderer2_.num_rendered_frames(), kTimeout);
-    // Give a chance for the decoder to process before adding the receiver.
-    rtc::Thread::Current()->ProcessMessages(10);
-    // Test sending and receiving on second stream.
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(kSsrc + 2)));
-    EXPECT_TRUE(channel_->SetRenderer(kSsrc + 2, &renderer2_));
-    SendFrame();
-    EXPECT_TRUE_WAIT(renderer_.num_rendered_frames() >= 1, kTimeout);
-    EXPECT_EQ_WAIT(4, NumRtpPackets(), kTimeout);
-    // We dont expect any frames here, because the key frame would have been
-    // lost in the earlier packet. This is the case we want to solve with early
-    // receive.
-    EXPECT_EQ(0, renderer2_.num_rendered_frames());
-  }
-
-  // Tests that we drop key frames when conference mode is disabled and we
-  // receive rtp packets on unsignalled streams.
-  void TwoStreamsSendAndFailUnsignalledRecvInOneToOne(
-      const cricket::VideoCodec& codec) {
-    cricket::VideoOptions vmo;
-    vmo.conference_mode.Set(false);
-    vmo.unsignalled_recv_stream_limit.Set(1);
-    EXPECT_TRUE(channel_->SetOptions(vmo));
-    SetUpSecondStreamWithNoRecv();
-    // Test sending and receiving on first stream.
-    EXPECT_TRUE(channel_->SetRender(true));
-    Send(codec);
-    EXPECT_EQ_WAIT(2, NumRtpPackets(), kTimeout);
-    // In one-to-one mode, we deliver frames to the default channel if there
-    // is no registered recv channel for the ssrc.
-    EXPECT_TRUE_WAIT(renderer_.num_rendered_frames() >= 1, kTimeout);
-    // Give a chance for the decoder to process before adding the receiver.
-    rtc::Thread::Current()->ProcessMessages(100);
-    // Test sending and receiving on second stream.
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(kSsrc + 2)));
-    EXPECT_TRUE(channel_->SetRenderer(kSsrc + 2, &renderer2_));
-    SendFrame();
-    EXPECT_TRUE_WAIT(renderer_.num_rendered_frames() >= 1, kTimeout);
-    EXPECT_EQ_WAIT(4, NumRtpPackets(), kTimeout);
-    // We dont expect any frames here, because the key frame would have been
-    // delivered to default channel.
-    EXPECT_EQ(0, renderer2_.num_rendered_frames());
-  }
-
   // Tests that we drop key frames when conference mode is enabled and we
   // receive rtp packets on unsignalled streams. Removal of a unsignalled recv
   // stream is successful.
   void TwoStreamsAddAndRemoveUnsignalledRecv(
       const cricket::VideoCodec& codec) {
     cricket::VideoOptions vmo;
     vmo.conference_mode.Set(true);
     vmo.unsignalled_recv_stream_limit.Set(1);
     EXPECT_TRUE(channel_->SetOptions(vmo));
     SetUpSecondStreamWithNoRecv();
@@ skipping 19 matching lines @@
   rtc::scoped_ptr<C> channel_;
   cricket::FakeNetworkInterface network_interface_;
   cricket::FakeVideoRenderer renderer_;
   cricket::VideoMediaChannel::Error media_error_;
 
   // Used by test cases where 2 streams are run on the same channel.
   cricket::FakeVideoRenderer renderer2_;
 };
 
 #endif  // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_  NOLINT