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" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |
148 InSequence s; | 148 InSequence s; |
149 const scoped_refptr<media::VideoFrame> video_frame = | 149 const scoped_refptr<media::VideoFrame> video_frame = |
150 media::VideoFrame::CreateBlackFrame(gfx::Size(160, 80)); | 150 media::VideoFrame::CreateBlackFrame(gfx::Size(160, 80)); |
151 OnVideoFrame(video_frame); | 151 OnVideoFrame(video_frame); |
152 message_loop_.RunUntilIdle(); | 152 base::RunLoop().RunUntilIdle(); |
153 ASSERT_EQ(1u, frame_ready_cbs_.size()); | 153 ASSERT_EQ(1u, frame_ready_cbs_.size()); |
154 | 154 |
155 EXPECT_CALL(*this, RepaintCallback(video_frame)).Times(1); | 155 EXPECT_CALL(*this, RepaintCallback(video_frame)).Times(1); |
156 frame_ready_cbs_[0].Run(); | 156 frame_ready_cbs_[0].Run(); |
157 message_loop_.RunUntilIdle(); | 157 base::RunLoop().RunUntilIdle(); |
158 | 158 |
159 media_stream_video_renderer_sink_->Stop(); | 159 media_stream_video_renderer_sink_->Stop(); |
160 } | 160 } |
161 | 161 |
162 class MediaStreamVideoRendererSinkTransparencyTest | 162 class MediaStreamVideoRendererSinkTransparencyTest |
163 : public MediaStreamVideoRendererSinkTest { | 163 : public MediaStreamVideoRendererSinkTest { |
164 public: | 164 public: |
165 MediaStreamVideoRendererSinkTransparencyTest() { | 165 MediaStreamVideoRendererSinkTransparencyTest() { |
166 media_stream_video_renderer_sink_ = new MediaStreamVideoRendererSink( | 166 media_stream_video_renderer_sink_ = new MediaStreamVideoRendererSink( |
167 video_tracks_[0], | 167 video_tracks_[0], |
(...skipping 15 matching lines...) Expand all Loading... |
183 SendTransparentFrame) { | 183 SendTransparentFrame) { |
184 media_stream_video_renderer_sink_->Start(); | 184 media_stream_video_renderer_sink_->Start(); |
185 | 185 |
186 InSequence s; | 186 InSequence s; |
187 const gfx::Size kSize(10, 10); | 187 const gfx::Size kSize(10, 10); |
188 const base::TimeDelta kTimestamp = base::TimeDelta(); | 188 const base::TimeDelta kTimestamp = base::TimeDelta(); |
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 base::RunLoop().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 |