Move passing of WebRTC rendering frames from main thread to compositor thread

content/renderer/media/media_stream_video_renderer_sink_unittest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/media_stream_video_renderer_sink.h"
@@ skipping 30 matching lines @@
     // Extract the Blink Video Track for the MSVRSink.
     registry_.test_stream().videoTracks(video_tracks_);
     EXPECT_EQ(1u, video_tracks_.size());
 
     media_stream_video_renderer_sink_ = new MediaStreamVideoRendererSink(
         video_tracks_[0],
         base::Bind(&MediaStreamVideoRendererSinkTest::ErrorCallback,
                    base::Unretained(this)),
         base::Bind(&MediaStreamVideoRendererSinkTest::RepaintCallback,
                    base::Unretained(this)),
-        message_loop_.task_runner(), message_loop_.task_runner().get(),
-        nullptr /* gpu_factories */);
+        message_loop_.task_runner(), message_loop_.task_runner(),
+        message_loop_.task_runner(), nullptr /* gpu_factories */);
 
     EXPECT_TRUE(IsInStoppedState());
   }
 
   ~MediaStreamVideoRendererSinkTest() {
     media_stream_video_renderer_sink_ = nullptr;
     registry_.reset();
     blink::WebHeap::collectAllGarbageForTesting();
 
     // Let the message loop run to finish destroying the pool.
     base::RunLoop().RunUntilIdle();
   }
 
   MOCK_METHOD1(RepaintCallback, void(const scoped_refptr<media::VideoFrame>&));
   MOCK_METHOD0(ErrorCallback, void(void));
 
   bool IsInStartedState() const {
-    return media_stream_video_renderer_sink_->state_ ==
+    return media_stream_video_renderer_sink_->GetStateForTesting() ==
            MediaStreamVideoRendererSink::STARTED;
   }
   bool IsInStoppedState() const {
-    return media_stream_video_renderer_sink_->state_ ==
+    return media_stream_video_renderer_sink_->GetStateForTesting() ==
            MediaStreamVideoRendererSink::STOPPED;
   }
   bool IsInPausedState() const {
-    return media_stream_video_renderer_sink_->state_ ==
+    return media_stream_video_renderer_sink_->GetStateForTesting() ==
            MediaStreamVideoRendererSink::PAUSED;
   }
 
   void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame) {
-    media_stream_video_renderer_sink_->OnVideoFrame(frame,
-                                                    base::TimeTicks::Now());
+    media_stream_video_renderer_sink_->OnVideoFrameForTesting(
+        frame, base::TimeTicks::Now());
+  }
+
+  void SetGpuMemoryBufferVideoForTesting(
+      media::GpuMemoryBufferVideoFramePool* gpu_memory_buffer_pool) {
+    media_stream_video_renderer_sink_->SetGpuMemoryBufferVideoForTesting(
+        gpu_memory_buffer_pool);
   }
 
   scoped_refptr<MediaStreamVideoRendererSink> media_stream_video_renderer_sink_;
 
   // A ChildProcess and a MessageLoopForUI are both needed to fool the Tracks
   // and Sources in |registry_| into believing they are on the right threads.
   base::MessageLoopForUI message_loop_;
   const ChildProcess child_process_;
 
+  base::RunLoop run_loop_;
+
   blink::WebVector<blink::WebMediaStreamTrack> video_tracks_;
   MockMediaStreamRegistry registry_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoRendererSinkTest);
 };
 
 // Checks that the initialization-destruction sequence works fine.
 TEST_F(MediaStreamVideoRendererSinkTest, StartStop) {
   EXPECT_TRUE(IsInStoppedState());
 
   media_stream_video_renderer_sink_->Start();
+  run_loop_.RunUntilIdle();
   EXPECT_TRUE(IsInStartedState());
 
   media_stream_video_renderer_sink_->Pause();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(IsInPausedState());
 
   media_stream_video_renderer_sink_->Resume();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(IsInStartedState());
 
   media_stream_video_renderer_sink_->Stop();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(IsInStoppedState());
 }
 
 // Sends 2 frames and expect them as WebM contained encoded data in writeData().
 TEST_F(MediaStreamVideoRendererSinkTest, EncodeVideoFrames) {
   media_stream_video_renderer_sink_->Start();
 
   InSequence s;
   const scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateBlackFrame(gfx::Size(160, 80));
 
   EXPECT_CALL(*this, RepaintCallback(video_frame)).Times(1);
   OnVideoFrame(video_frame);
 
   media_stream_video_renderer_sink_->Stop();
 }
 
 class MediaStreamVideoRendererSinkAsyncAddFrameReadyTest
     : public MediaStreamVideoRendererSinkTest {
  public:
   MediaStreamVideoRendererSinkAsyncAddFrameReadyTest() {
-    media_stream_video_renderer_sink_->SetGpuMemoryBufferVideoForTesting(
+    SetGpuMemoryBufferVideoForTesting(
         new media::MockGpuMemoryBufferVideoFramePool(&frame_ready_cbs_));
+    base::RunLoop().RunUntilIdle();
   }
 
  protected:
   std::vector<base::Closure> frame_ready_cbs_;
 };
 
 TEST_F(MediaStreamVideoRendererSinkAsyncAddFrameReadyTest,
        CreateHardwareFrames) {
   media_stream_video_renderer_sink_->Start();
 
@@ skipping 15 matching lines @@
     : public MediaStreamVideoRendererSinkTest {
  public:
   MediaStreamVideoRendererSinkTransparencyTest() {
     media_stream_video_renderer_sink_ = new MediaStreamVideoRendererSink(
         video_tracks_[0],
         base::Bind(&MediaStreamVideoRendererSinkTest::ErrorCallback,
                    base::Unretained(this)),
         base::Bind(&MediaStreamVideoRendererSinkTransparencyTest::
                        VerifyTransparentFrame,
                    base::Unretained(this)),
-        message_loop_.task_runner(), message_loop_.task_runner().get(),
-        nullptr /* gpu_factories */);
+        message_loop_.task_runner(), message_loop_.task_runner(),
+        message_loop_.task_runner(), nullptr /* gpu_factories */);
   }
 
   void VerifyTransparentFrame(const scoped_refptr<media::VideoFrame>& frame) {
     EXPECT_EQ(media::PIXEL_FORMAT_YV12A, frame->format());
   }
 };
 
 TEST_F(MediaStreamVideoRendererSinkTransparencyTest,
        SendTransparentFrame) {
   media_stream_video_renderer_sink_->Start();
 
   InSequence s;
   const gfx::Size kSize(10, 10);
   const base::TimeDelta kTimestamp = base::TimeDelta();
   const scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::PIXEL_FORMAT_YV12A, kSize,
                                      gfx::Rect(kSize), kSize, kTimestamp);
   OnVideoFrame(video_frame);
   base::RunLoop().RunUntilIdle();
 
   media_stream_video_renderer_sink_->Stop();
 }
 
 }  // namespace content