Prevent a voice channel from sending data before a renderer is set.

webrtc/api/webrtcsession_unittest.cc

 /*
  *  Copyright 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 276 matching lines @@
   State state() const { return state_; }
 
  protected:
   ~WebRtcSessionCreateSDPObserverForTest() {}
 
  private:
   rtc::scoped_ptr<SessionDescriptionInterface> description_;
   State state_;
 };
 
-class FakeAudioRenderer : public cricket::AudioRenderer {
+class FakeAudioSource : public cricket::AudioSource {
  public:
-  FakeAudioRenderer() : sink_(NULL) {}
-  virtual ~FakeAudioRenderer() {
+  FakeAudioSource() : sink_(NULL) {}
+  virtual ~FakeAudioSource() {
     if (sink_)
       sink_->OnClose();
   }
 
   void SetSink(Sink* sink) override { sink_ = sink; }
 
-  cricket::AudioRenderer::Sink* sink() const { return sink_; }
+  const cricket::AudioSource::Sink* sink() const { return sink_; }
+
  private:
-  cricket::AudioRenderer::Sink* sink_;
+  cricket::AudioSource::Sink* sink_;
 };
 
 class WebRtcSessionTest
     : public testing::TestWithParam<RTCCertificateGenerationMethod>,
       public sigslot::has_slots<> {
  protected:
   // TODO Investigate why ChannelManager crashes, if it's created
   // after stun_server.
   WebRtcSessionTest()
       : media_engine_(new cricket::FakeMediaEngine()),
@@ skipping 3010 matching lines @@
   CreateAndSetRemoteOfferAndLocalAnswer();
   cricket::FakeVoiceMediaChannel* channel = media_engine_->GetVoiceChannel(0);
   ASSERT_TRUE(channel != NULL);
   ASSERT_EQ(1u, channel->send_streams().size());
   uint32_t send_ssrc = channel->send_streams()[0].first_ssrc();
   EXPECT_FALSE(channel->IsStreamMuted(send_ssrc));
 
   cricket::AudioOptions options;
   options.echo_cancellation = rtc::Optional<bool>(true);
 
-  rtc::scoped_ptr<FakeAudioRenderer> renderer(new FakeAudioRenderer());
-  session_->SetAudioSend(send_ssrc, false, options, renderer.get());
+  rtc::scoped_ptr<FakeAudioSource> source(new FakeAudioSource());
+  session_->SetAudioSend(send_ssrc, false, options, source.get());
   EXPECT_TRUE(channel->IsStreamMuted(send_ssrc));
   EXPECT_EQ(rtc::Optional<bool>(), channel->options().echo_cancellation);
-  EXPECT_TRUE(renderer->sink() != NULL);
+  EXPECT_TRUE(source->sink() != nullptr);
 
-  // This will trigger SetSink(NULL) to the |renderer|.
-  session_->SetAudioSend(send_ssrc, true, options, NULL);
+  // This will trigger SetSink(nullptr) to the |source|.
+  session_->SetAudioSend(send_ssrc, true, options, nullptr);
   EXPECT_FALSE(channel->IsStreamMuted(send_ssrc));
   EXPECT_EQ(rtc::Optional<bool>(true), channel->options().echo_cancellation);
-  EXPECT_TRUE(renderer->sink() == NULL);
+  EXPECT_TRUE(source->sink() == nullptr);
 }
 
-TEST_F(WebRtcSessionTest, AudioRendererForLocalStream) {
+TEST_F(WebRtcSessionTest, AudioSourceForLocalStream) {
   Init();
   SendAudioVideoStream1();
   CreateAndSetRemoteOfferAndLocalAnswer();
   cricket::FakeVoiceMediaChannel* channel = media_engine_->GetVoiceChannel(0);
   ASSERT_TRUE(channel != NULL);
   ASSERT_EQ(1u, channel->send_streams().size());
   uint32_t send_ssrc = channel->send_streams()[0].first_ssrc();
 
-  rtc::scoped_ptr<FakeAudioRenderer> renderer(new FakeAudioRenderer());
+  rtc::scoped_ptr<FakeAudioSource> source(new FakeAudioSource());
   cricket::AudioOptions options;
-  session_->SetAudioSend(send_ssrc, true, options, renderer.get());
-  EXPECT_TRUE(renderer->sink() != NULL);
+  session_->SetAudioSend(send_ssrc, true, options, source.get());
+  EXPECT_TRUE(source->sink() != nullptr);
 
-  // Delete the |renderer| and it will trigger OnClose() to the sink, and this
-  // will invalidate the |renderer_| pointer in the sink and prevent getting a
-  // SetSink(NULL) callback afterwards.
-  renderer.reset();
+  // Delete the |source| and it will trigger OnClose() to the sink, and this
+  // will invalidate the |source_| pointer in the sink and prevent getting a
+  // SetSink(nullptr) callback afterwards.
+  source.reset();
 
-  // This will trigger SetSink(NULL) if no OnClose() callback.
-  session_->SetAudioSend(send_ssrc, true, options, NULL);
+  // This will trigger SetSink(nullptr) if no OnClose() callback.
+  session_->SetAudioSend(send_ssrc, true, options, nullptr);
 }
 
 TEST_F(WebRtcSessionTest, SetVideoPlayout) {
   Init();
   SendAudioVideoStream1();
   CreateAndSetRemoteOfferAndLocalAnswer();
   cricket::FakeVideoMediaChannel* channel = media_engine_->GetVideoChannel(0);
   ASSERT_TRUE(channel != NULL);
   ASSERT_LT(0u, channel->sinks().size());
   EXPECT_TRUE(channel->sinks().begin()->second == NULL);
@@ skipping 902 matching lines @@
 }
 
 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test
 // currently fails because upon disconnection and reconnection OnIceComplete is
 // called more than once without returning to IceGatheringGathering.
 
 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
                         WebRtcSessionTest,
                         testing::Values(ALREADY_GENERATED,
                                         DTLS_IDENTITY_STORE));