Move Renderer permanent callbacks into RendererClient interface.

media/renderers/renderer_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace media {
 
 const int64_t kStartPlayingTimeInMs = 100;
 
-ACTION_P2(SetBufferingState, cb, buffering_state) {
-  cb->Run(buffering_state);
+ACTION_P2(SetBufferingState, renderer_client, buffering_state) {
+  (*renderer_client)->OnBufferingStateChange(buffering_state);
 }
 
-ACTION_P2(AudioError, cb, error) {
-  cb->Run(error);
+ACTION_P2(SetError, renderer_client, error) {
+  (*renderer_client)->OnError(error);
 }
 
 class RendererImplTest : public ::testing::Test {
  public:
   // Used for setting expectations on pipeline callbacks. Using a StrictMock
   // also lets us test for missing callbacks.
-  class CallbackHelper {
+  class CallbackHelper : public RendererClient {
    public:
     CallbackHelper() {}
     virtual ~CallbackHelper() {}
 
+    // RendererClient implementation.
+    MOCK_METHOD1(OnError, void(PipelineStatus status));
+    MOCK_METHOD0(OnEnded, void());
+    MOCK_METHOD1(OnStatisticsUpdate, void(const PipelineStatistics&));
+    MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
+    MOCK_METHOD0(OnWaitingForDecryptionKey, void());
+
+    // Completion callbacks.
     MOCK_METHOD1(OnInitialize, void(PipelineStatus));
     MOCK_METHOD0(OnFlushed, void());
-    MOCK_METHOD0(OnEnded, void());
-    MOCK_METHOD1(OnError, void(PipelineStatus));
-    MOCK_METHOD1(OnUpdateStatistics, void(const PipelineStatistics&));
-    MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
-    MOCK_METHOD0(OnWaitingForDecryptionKey, void());
     MOCK_METHOD1(OnCdmAttached, void(bool));
 
    private:
     DISALLOW_COPY_AND_ASSIGN(CallbackHelper);
   };
 
   RendererImplTest()
       : demuxer_(new StrictMock<MockDemuxer>()),
         video_renderer_(new StrictMock<MockVideoRenderer>()),
         audio_renderer_(new StrictMock<MockAudioRenderer>()),
         renderer_impl_(
             new RendererImpl(message_loop_.task_runner(),
                              std::unique_ptr<AudioRenderer>(audio_renderer_),
                              std::unique_ptr<VideoRenderer>(video_renderer_))),
         cdm_context_(new StrictMock<MockCdmContext>()),
+        video_renderer_client_(nullptr),
+        audio_renderer_client_(nullptr),
         initialization_status_(PIPELINE_OK) {
     // SetDemuxerExpectations() adds overriding expectations for expected
     // non-NULL streams.
     DemuxerStream* null_pointer = NULL;
     EXPECT_CALL(*demuxer_, GetStream(_))
         .WillRepeatedly(Return(null_pointer));
   }
 
   virtual ~RendererImplTest() { Destroy(); }
 
  protected:
   typedef std::vector<MockDemuxerStream*> MockDemuxerStreamVector;
 
   void Destroy() {
     renderer_impl_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   std::unique_ptr<StrictMock<MockDemuxerStream>> CreateStream(
       DemuxerStream::Type type) {
     std::unique_ptr<StrictMock<MockDemuxerStream>> stream(
         new StrictMock<MockDemuxerStream>(type));
     return stream;
   }
 
   // Sets up expectations to allow the audio renderer to initialize.
   void SetAudioRendererInitializeExpectations(PipelineStatus status) {
-    EXPECT_CALL(*audio_renderer_,
-                Initialize(audio_stream_.get(), _, _, _, _, _, _, _))
-        .WillOnce(DoAll(SaveArg<4>(&audio_buffering_state_cb_),
-                        SaveArg<5>(&audio_ended_cb_),
-                        SaveArg<6>(&audio_error_cb_), RunCallback<1>(status)));
+    EXPECT_CALL(*audio_renderer_, Initialize(audio_stream_.get(), _, _, _))
+        .WillOnce(
+            DoAll(SaveArg<2>(&audio_renderer_client_), RunCallback<3>(status)));
   }
 
   // Sets up expectations to allow the video renderer to initialize.
   void SetVideoRendererInitializeExpectations(PipelineStatus status) {
-    EXPECT_CALL(*video_renderer_,
-                Initialize(video_stream_.get(), _, _, _, _, _, _, _, _))
-        .WillOnce(DoAll(SaveArg<4>(&video_buffering_state_cb_),
-                        SaveArg<5>(&video_ended_cb_), RunCallback<1>(status)));
+    EXPECT_CALL(*video_renderer_, Initialize(video_stream_.get(), _, _, _, _))
+        .WillOnce(
+            DoAll(SaveArg<2>(&video_renderer_client_), RunCallback<4>(status)));
   }
 
   void InitializeAndExpect(PipelineStatus start_status) {
     EXPECT_CALL(callbacks_, OnInitialize(start_status))
         .WillOnce(SaveArg<0>(&initialization_status_));
     EXPECT_CALL(callbacks_, OnWaitingForDecryptionKey()).Times(0);
 
     if (start_status == PIPELINE_OK && audio_stream_) {
       EXPECT_CALL(*audio_renderer_, GetTimeSource())
           .WillOnce(Return(&time_source_));
     } else {
       renderer_impl_->set_time_source_for_testing(&time_source_);
     }
 
-    renderer_impl_->Initialize(
-        demuxer_.get(),
-        base::Bind(&CallbackHelper::OnInitialize,
-                   base::Unretained(&callbacks_)),
-        base::Bind(&CallbackHelper::OnUpdateStatistics,
-                   base::Unretained(&callbacks_)),
-        base::Bind(&CallbackHelper::OnBufferingStateChange,
-                   base::Unretained(&callbacks_)),
-        base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
-        base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
-        base::Bind(&CallbackHelper::OnWaitingForDecryptionKey,
-                   base::Unretained(&callbacks_)));
+    renderer_impl_->Initialize(demuxer_.get(), &callbacks_,
+                               base::Bind(&CallbackHelper::OnInitialize,
+                                          base::Unretained(&callbacks_)));
     base::RunLoop().RunUntilIdle();
   }
 
   void CreateAudioStream() {
     audio_stream_ = CreateStream(DemuxerStream::AUDIO);
     streams_.push_back(audio_stream_.get());
     EXPECT_CALL(*demuxer_, GetStream(DemuxerStream::AUDIO))
         .WillRepeatedly(Return(audio_stream_.get()));
   }
 
@@ skipping 37 matching lines @@
     DCHECK(audio_stream_ || video_stream_);
     EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_ENOUGH));
 
     base::TimeDelta start_time(
         base::TimeDelta::FromMilliseconds(kStartPlayingTimeInMs));
     EXPECT_CALL(time_source_, SetMediaTime(start_time));
     EXPECT_CALL(time_source_, StartTicking());
 
     if (audio_stream_) {
       EXPECT_CALL(*audio_renderer_, StartPlaying())
-          .WillOnce(SetBufferingState(&audio_buffering_state_cb_,
+          .WillOnce(SetBufferingState(&audio_renderer_client_,
                                       BUFFERING_HAVE_ENOUGH));
     }
 
     if (video_stream_) {
       EXPECT_CALL(*video_renderer_, StartPlayingFrom(start_time))
-          .WillOnce(SetBufferingState(&video_buffering_state_cb_,
+          .WillOnce(SetBufferingState(&video_renderer_client_,
                                       BUFFERING_HAVE_ENOUGH));
     }
 
     renderer_impl_->StartPlayingFrom(start_time);
     base::RunLoop().RunUntilIdle();
   }
 
   void Flush(bool underflowed) {
     if (!underflowed)
       EXPECT_CALL(time_source_, StopTicking());
 
     if (audio_stream_) {
       EXPECT_CALL(*audio_renderer_, Flush(_))
-          .WillOnce(DoAll(SetBufferingState(&audio_buffering_state_cb_,
+          .WillOnce(DoAll(SetBufferingState(&audio_renderer_client_,
                                             BUFFERING_HAVE_NOTHING),
                           RunClosure<0>()));
     }
 
     if (video_stream_) {
       EXPECT_CALL(*video_renderer_, Flush(_))
-          .WillOnce(DoAll(SetBufferingState(&video_buffering_state_cb_,
+          .WillOnce(DoAll(SetBufferingState(&video_renderer_client_,
                                             BUFFERING_HAVE_NOTHING),
                           RunClosure<0>()));
     }
 
     EXPECT_CALL(callbacks_, OnFlushed());
 
     renderer_impl_->Flush(
         base::Bind(&CallbackHelper::OnFlushed, base::Unretained(&callbacks_)));
     base::RunLoop().RunUntilIdle();
   }
@@ skipping 42 matching lines @@
   std::unique_ptr<StrictMock<MockDemuxer>> demuxer_;
   StrictMock<MockVideoRenderer>* video_renderer_;
   StrictMock<MockAudioRenderer>* audio_renderer_;
   std::unique_ptr<RendererImpl> renderer_impl_;
   std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
 
   StrictMock<MockTimeSource> time_source_;
   std::unique_ptr<StrictMock<MockDemuxerStream>> audio_stream_;
   std::unique_ptr<StrictMock<MockDemuxerStream>> video_stream_;
   MockDemuxerStreamVector streams_;
-  BufferingStateCB audio_buffering_state_cb_;
-  BufferingStateCB video_buffering_state_cb_;
-  base::Closure audio_ended_cb_;
-  base::Closure video_ended_cb_;
-  PipelineStatusCB audio_error_cb_;
+  RendererClient* video_renderer_client_;
+  RendererClient* audio_renderer_client_;
   VideoDecoderConfig video_decoder_config_;
   PipelineStatus initialization_status_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RendererImplTest);
 };
 
 TEST_F(RendererImplTest, Destroy_BeforeInitialize) {
   Destroy();
 }
 
 TEST_F(RendererImplTest, Destroy_PendingInitialize) {
   CreateAudioAndVideoStream();
 
   SetAudioRendererInitializeExpectations(PIPELINE_OK);
   // Not returning the video initialization callback.
-  EXPECT_CALL(*video_renderer_,
-              Initialize(video_stream_.get(), _, _, _, _, _, _, _, _));
+  EXPECT_CALL(*video_renderer_, Initialize(video_stream_.get(), _, _, _, _));
 
   InitializeAndExpect(PIPELINE_ERROR_ABORT);
   EXPECT_EQ(PIPELINE_OK, initialization_status_);
 
   Destroy();
 }
 
 TEST_F(RendererImplTest, Destroy_PendingInitializeWithoutCdm) {
   CreateAudioStream();
   CreateEncryptedVideoStream();
@@ skipping 13 matching lines @@
   CreateEncryptedVideoStream();
 
   // Audio is clear and video is encrypted. Initialization will not start
   // because no CDM is set.
   InitializeAndExpect(PIPELINE_ERROR_ABORT);
   EXPECT_EQ(PIPELINE_OK, initialization_status_);
 
   SetAudioRendererInitializeExpectations(PIPELINE_OK);
   // Not returning the video initialization callback. So initialization will
   // be pending.
-  EXPECT_CALL(*video_renderer_,
-              Initialize(video_stream_.get(), _, _, _, _, _, _, _, _));
+  EXPECT_CALL(*video_renderer_, Initialize(video_stream_.get(), _, _, _, _));
 
   // SetCdm() will trigger the initialization to start. But it will not complete
   // because the |video_renderer_| is not returning the initialization callback.
   SetCdmAndExpect(false);
   EXPECT_EQ(PIPELINE_OK, initialization_status_);
 
   Destroy();
 }
 
 TEST_F(RendererImplTest, InitializeWithAudio) {
@@ skipping 132 matching lines @@
   Play();
   Flush(false);
 }
 
 TEST_F(RendererImplTest, FlushAfterUnderflow) {
   InitializeWithAudioAndVideo();
   Play();
 
   // Simulate underflow.
   EXPECT_CALL(time_source_, StopTicking());
-  audio_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  audio_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
 
   // Flush while underflowed. We shouldn't call StopTicking() again.
   Flush(true);
 }
 
 TEST_F(RendererImplTest, SetPlaybackRate) {
   InitializeWithAudioAndVideo();
   SetPlaybackRate(1.0);
   SetPlaybackRate(2.0);
 }
 
 TEST_F(RendererImplTest, SetVolume) {
   InitializeWithAudioAndVideo();
   EXPECT_CALL(*audio_renderer_, SetVolume(2.0f));
   renderer_impl_->SetVolume(2.0f);
 }
 
 TEST_F(RendererImplTest, AudioStreamEnded) {
   InitializeWithAudio();
   Play();
 
   EXPECT_CALL(time_source_, StopTicking());
   EXPECT_CALL(callbacks_, OnEnded());
 
-  audio_ended_cb_.Run();
+  audio_renderer_client_->OnEnded();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, VideoStreamEnded) {
   InitializeWithVideo();
   Play();
 
   EXPECT_CALL(time_source_, StopTicking());
   EXPECT_CALL(callbacks_, OnEnded());
 
-  video_ended_cb_.Run();
+  video_renderer_client_->OnEnded();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, AudioVideoStreamsEnded) {
   InitializeWithAudioAndVideo();
   Play();
 
   // OnEnded() is called only when all streams have finished.
-  audio_ended_cb_.Run();
+  audio_renderer_client_->OnEnded();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(time_source_, StopTicking());
   EXPECT_CALL(callbacks_, OnEnded());
 
-  video_ended_cb_.Run();
+  video_renderer_client_->OnEnded();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, ErrorAfterInitialize) {
   InitializeWithAudio();
   EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_DECODE));
-  audio_error_cb_.Run(PIPELINE_ERROR_DECODE);
+  audio_renderer_client_->OnError(PIPELINE_ERROR_DECODE);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, ErrorDuringPlaying) {
   InitializeWithAudio();
   Play();
 
   EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_DECODE));
-  audio_error_cb_.Run(PIPELINE_ERROR_DECODE);
+  audio_renderer_client_->OnError(PIPELINE_ERROR_DECODE);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, ErrorDuringFlush) {
   InitializeWithAudio();
   Play();
 
   InSequence s;
   EXPECT_CALL(time_source_, StopTicking());
-  EXPECT_CALL(*audio_renderer_, Flush(_)).WillOnce(DoAll(
-      AudioError(&audio_error_cb_, PIPELINE_ERROR_DECODE),
-      RunClosure<0>()));
+  EXPECT_CALL(*audio_renderer_, Flush(_))
+      .WillOnce(DoAll(SetError(&audio_renderer_client_, PIPELINE_ERROR_DECODE),
+                      RunClosure<0>()));
   EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_DECODE));
   EXPECT_CALL(callbacks_, OnFlushed());
   renderer_impl_->Flush(
       base::Bind(&CallbackHelper::OnFlushed, base::Unretained(&callbacks_)));
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, ErrorAfterFlush) {
   InitializeWithAudio();
   Play();
   Flush(false);
 
   EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_DECODE));
-  audio_error_cb_.Run(PIPELINE_ERROR_DECODE);
+  audio_renderer_client_->OnError(PIPELINE_ERROR_DECODE);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, ErrorDuringInitialize) {
   CreateAudioAndVideoStream();
   SetAudioRendererInitializeExpectations(PIPELINE_OK);
 
   // Force an audio error to occur during video renderer initialization.
-  EXPECT_CALL(*video_renderer_,
-              Initialize(video_stream_.get(), _, _, _, _, _, _, _, _))
-      .WillOnce(DoAll(AudioError(&audio_error_cb_, PIPELINE_ERROR_DECODE),
-                      SaveArg<4>(&video_buffering_state_cb_),
-                      SaveArg<5>(&video_ended_cb_),
-                      RunCallback<1>(PIPELINE_OK)));
+  EXPECT_CALL(*video_renderer_, Initialize(video_stream_.get(), _, _, _, _))
+      .WillOnce(DoAll(SetError(&audio_renderer_client_, PIPELINE_ERROR_DECODE),
+                      SaveArg<2>(&video_renderer_client_),
+                      RunCallback<4>(PIPELINE_OK)));
 
   InitializeAndExpect(PIPELINE_ERROR_DECODE);
 }
 
 TEST_F(RendererImplTest, AudioUnderflow) {
   InitializeWithAudio();
   Play();
 
   // Underflow should occur immediately with a single audio track.
   EXPECT_CALL(time_source_, StopTicking());
-  audio_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  audio_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
 }
 
 TEST_F(RendererImplTest, AudioUnderflowWithVideo) {
   InitializeWithAudioAndVideo();
   Play();
 
   // Underflow should be immediate when both audio and video are present and
   // audio underflows.
   EXPECT_CALL(time_source_, StopTicking());
-  audio_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  audio_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
 }
 
 TEST_F(RendererImplTest, VideoUnderflow) {
   InitializeWithVideo();
   Play();
 
   // Underflow should occur immediately with a single video track.
   EXPECT_CALL(time_source_, StopTicking());
-  video_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
 }
 
 TEST_F(RendererImplTest, VideoUnderflowWithAudio) {
   InitializeWithAudioAndVideo();
   Play();
 
   // Set a zero threshold such that the underflow will be executed on the next
   // run of the message loop.
   renderer_impl_->set_video_underflow_threshold_for_testing(base::TimeDelta());
 
   // Underflow should be delayed when both audio and video are present and video
   // underflows.
-  video_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
   Mock::VerifyAndClearExpectations(&time_source_);
 
   EXPECT_CALL(time_source_, StopTicking());
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, VideoUnderflowWithAudioVideoRecovers) {
   InitializeWithAudioAndVideo();
   Play();
 
   // Set a zero threshold such that the underflow will be executed on the next
   // run of the message loop.
   renderer_impl_->set_video_underflow_threshold_for_testing(base::TimeDelta());
 
   // Underflow should be delayed when both audio and video are present and video
   // underflows.
-  video_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
   Mock::VerifyAndClearExpectations(&time_source_);
 
   // If video recovers, the underflow should never occur.
-  video_buffering_state_cb_.Run(BUFFERING_HAVE_ENOUGH);
+  video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_ENOUGH);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, VideoAndAudioUnderflow) {
   InitializeWithAudioAndVideo();
   Play();
 
   // Set a zero threshold such that the underflow will be executed on the next
   // run of the message loop.
   renderer_impl_->set_video_underflow_threshold_for_testing(base::TimeDelta());
 
   // Underflow should be delayed when both audio and video are present and video
   // underflows.
-  video_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
   Mock::VerifyAndClearExpectations(&time_source_);
 
   EXPECT_CALL(time_source_, StopTicking());
-  audio_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  audio_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
 
   // Nothing else should primed on the message loop.
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(RendererImplTest, VideoUnderflowWithAudioFlush) {
   InitializeWithAudioAndVideo();
   Play();
 
   // Set a massive threshold such that it shouldn't fire within this test.
   renderer_impl_->set_video_underflow_threshold_for_testing(
       base::TimeDelta::FromSeconds(100));
 
   // Simulate the cases where audio underflows and then video underflows.
   EXPECT_CALL(time_source_, StopTicking());
-  audio_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
-  video_buffering_state_cb_.Run(BUFFERING_HAVE_NOTHING);
+  audio_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
+  video_renderer_client_->OnBufferingStateChange(BUFFERING_HAVE_NOTHING);
   Mock::VerifyAndClearExpectations(&time_source_);
 
   // Flush the audio and video renderers, both think they're in an underflow
   // state, but if the video renderer underflow was deferred, RendererImpl would
   // think it still has enough data.
   EXPECT_CALL(*audio_renderer_, Flush(_)).WillOnce(RunClosure<0>());
   EXPECT_CALL(*video_renderer_, Flush(_)).WillOnce(RunClosure<0>());
   EXPECT_CALL(callbacks_, OnFlushed());
   renderer_impl_->Flush(
       base::Bind(&CallbackHelper::OnFlushed, base::Unretained(&callbacks_)));
   base::RunLoop().RunUntilIdle();
 
   // Start playback after the flush, but never return BUFFERING_HAVE_ENOUGH from
   // the video renderer (which simulates spool up time for the video renderer).
   const base::TimeDelta kStartTime;
   EXPECT_CALL(time_source_, SetMediaTime(kStartTime));
   EXPECT_CALL(*audio_renderer_, StartPlaying())
       .WillOnce(
-          SetBufferingState(&audio_buffering_state_cb_, BUFFERING_HAVE_ENOUGH));
+          SetBufferingState(&audio_renderer_client_, BUFFERING_HAVE_ENOUGH));
   EXPECT_CALL(*video_renderer_, StartPlayingFrom(kStartTime));
   renderer_impl_->StartPlayingFrom(kStartTime);
 
   // Nothing else should primed on the message loop.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace media