Reland: Use GpuMemoryBufferVideoFramePool for WebMediaPlayerMS and MediaStreamVideoRendererSink

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/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"
 #include "content/renderer/media/mock_media_stream_registry.h"
 #include "media/base/video_frame.h"
+#include "media/renderers/gpu_video_accelerator_factories.h"
+#include "media/renderers/mock_gpu_memory_buffer_video_frame_pool.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebHeap.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::InSequence;
 using ::testing::Lt;
 using ::testing::Mock;
@@ skipping 16 matching lines @@
     // Extract the Blink Video Track for the MSVRSink.
     blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
     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)));
+                   base::Unretained(this)),
+        message_loop_.task_runner(), message_loop_.task_runner().get(),
+        nullptr /* gpu_factories */);
 
     EXPECT_TRUE(IsInStoppedState());
   }
 
   ~MediaStreamVideoRendererSinkTest() {
     media_stream_video_renderer_sink_ = nullptr;
     registry_.reset();
     blink::WebHeap::collectAllGarbageForTesting();
   }
 
@@ skipping 15 matching lines @@
 
   void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame) {
     media_stream_video_renderer_sink_->OnVideoFrame(frame,
                                                     base::TimeTicks::Now());
   }
 
   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.
-  const base::MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   const ChildProcess child_process_;
   MockMediaStreamRegistry registry_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoRendererSinkTest);
 };
 
 // Checks that the initialization-destruction sequence works fine.
 TEST_F(MediaStreamVideoRendererSinkTest, StartStop) {
   EXPECT_TRUE(IsInStoppedState());
@@ skipping 18 matching lines @@
   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() {
+    scoped_ptr<media::GpuMemoryBufferVideoFramePool> gpu_memory_buffer_pool(
+        new media::MockGpuMemoryBufferVideoFramePool(&frame_ready_cbs_));
+    media_stream_video_renderer_sink_->SetGpuMemoryBufferVideoForTesting(
+        gpu_memory_buffer_pool.Pass());
+  }
+
+ protected:
+  std::vector<base::Closure> frame_ready_cbs_;
+};
+
+TEST_F(MediaStreamVideoRendererSinkAsyncAddFrameReadyTest,
+       CreateHardwareFrames) {
+  media_stream_video_renderer_sink_->Start();
+
+  InSequence s;
+  const scoped_refptr<media::VideoFrame> video_frame =
+      media::VideoFrame::CreateBlackFrame(gfx::Size(160, 80));
+  OnVideoFrame(video_frame);
+  message_loop_.RunUntilIdle();
+  ASSERT_EQ(1u, frame_ready_cbs_.size());
+
+  EXPECT_CALL(*this, RepaintCallback(video_frame)).Times(1);
+  frame_ready_cbs_[0].Run();
+  message_loop_.RunUntilIdle();
+
+  media_stream_video_renderer_sink_->Stop();
+}
+
 }  // namespace content