| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/child/child_process.h" | 9 #include "content/child/child_process.h" |
| 10 #include "content/renderer/media/media_stream_video_renderer_sink.h" | 10 #include "content/renderer/media/media_stream_video_renderer_sink.h" |
| 11 #include "content/renderer/media/mock_media_stream_registry.h" | 11 #include "content/renderer/media/mock_media_stream_registry.h" |
| 12 #include "media/base/video_frame.h" | 12 #include "media/base/video_frame.h" |
| 13 #include "media/renderers/gpu_video_accelerator_factories.h" | 13 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 14 #include "media/renderers/mock_gpu_memory_buffer_video_frame_pool.h" | 14 #include "media/renderers/mock_gpu_memory_buffer_video_frame_copier.h" |
| 15 #include "testing/gmock/include/gmock/gmock.h" | 15 #include "testing/gmock/include/gmock/gmock.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "third_party/WebKit/public/platform/WebString.h" | 17 #include "third_party/WebKit/public/platform/WebString.h" |
| 18 #include "third_party/WebKit/public/web/WebHeap.h" | 18 #include "third_party/WebKit/public/web/WebHeap.h" |
| 19 | 19 |
| 20 using ::testing::_; | 20 using ::testing::_; |
| 21 using ::testing::AtLeast; | 21 using ::testing::AtLeast; |
| 22 using ::testing::InSequence; | 22 using ::testing::InSequence; |
| 23 using ::testing::Lt; | 23 using ::testing::Lt; |
| 24 using ::testing::Mock; | 24 using ::testing::Mock; |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 OnVideoFrame(video_frame); | 127 OnVideoFrame(video_frame); |
| 128 | 128 |
| 129 media_stream_video_renderer_sink_->Stop(); | 129 media_stream_video_renderer_sink_->Stop(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 class MediaStreamVideoRendererSinkAsyncAddFrameReadyTest | 132 class MediaStreamVideoRendererSinkAsyncAddFrameReadyTest |
| 133 : public MediaStreamVideoRendererSinkTest { | 133 : public MediaStreamVideoRendererSinkTest { |
| 134 public: | 134 public: |
| 135 MediaStreamVideoRendererSinkAsyncAddFrameReadyTest() { | 135 MediaStreamVideoRendererSinkAsyncAddFrameReadyTest() { |
| 136 media_stream_video_renderer_sink_->SetGpuMemoryBufferVideoForTesting( | 136 media_stream_video_renderer_sink_->SetGpuMemoryBufferVideoForTesting( |
| 137 new media::MockGpuMemoryBufferVideoFramePool(&frame_ready_cbs_)); | 137 new media::MockGpuMemoryBufferVideoFrameCopier(&frame_ready_cbs_)); |
| 138 } | 138 } |
| 139 | 139 |
| 140 protected: | 140 protected: |
| 141 std::vector<base::Closure> frame_ready_cbs_; | 141 std::vector<base::Closure> frame_ready_cbs_; |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 TEST_F(MediaStreamVideoRendererSinkAsyncAddFrameReadyTest, | 144 TEST_F(MediaStreamVideoRendererSinkAsyncAddFrameReadyTest, |
| 145 CreateHardwareFrames) { | 145 CreateHardwareFrames) { |
| 146 media_stream_video_renderer_sink_->Start(); | 146 media_stream_video_renderer_sink_->Start(); |
| 147 | 147 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 const scoped_refptr<media::VideoFrame> video_frame = | 189 const scoped_refptr<media::VideoFrame> video_frame = |
| 190 media::VideoFrame::CreateFrame(media::PIXEL_FORMAT_YV12A, kSize, | 190 media::VideoFrame::CreateFrame(media::PIXEL_FORMAT_YV12A, kSize, |
| 191 gfx::Rect(kSize), kSize, kTimestamp); | 191 gfx::Rect(kSize), kSize, kTimestamp); |
| 192 OnVideoFrame(video_frame); | 192 OnVideoFrame(video_frame); |
| 193 message_loop_.RunUntilIdle(); | 193 message_loop_.RunUntilIdle(); |
| 194 | 194 |
| 195 media_stream_video_renderer_sink_->Stop(); | 195 media_stream_video_renderer_sink_->Stop(); |
| 196 } | 196 } |
| 197 | 197 |
| 198 } // namespace content | 198 } // namespace content |
| OLD | NEW |