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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "content/public/renderer/media_stream_renderer_factory.h" | 9 #include "content/public/renderer/media_stream_renderer_factory.h" |
10 #include "content/renderer/media/webmediaplayer_ms.h" | 10 #include "content/renderer/media/webmediaplayer_ms.h" |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 MockRenderFactory( | 301 MockRenderFactory( |
302 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, | 302 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
303 ReusableMessageLoopEvent* message_loop_controller) | 303 ReusableMessageLoopEvent* message_loop_controller) |
304 : task_runner_(task_runner), | 304 : task_runner_(task_runner), |
305 message_loop_controller_(message_loop_controller) {} | 305 message_loop_controller_(message_loop_controller) {} |
306 | 306 |
307 scoped_refptr<MediaStreamVideoRenderer> GetVideoRenderer( | 307 scoped_refptr<MediaStreamVideoRenderer> GetVideoRenderer( |
308 const blink::WebMediaStream& web_stream, | 308 const blink::WebMediaStream& web_stream, |
309 const base::Closure& error_cb, | 309 const base::Closure& error_cb, |
310 const MediaStreamVideoRenderer::RepaintCB& repaint_cb, | 310 const MediaStreamVideoRenderer::RepaintCB& repaint_cb, |
| 311 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
311 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 312 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
312 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 313 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
313 media::GpuVideoAcceleratorFactories* gpu_factories) override; | 314 media::GpuVideoAcceleratorFactories* gpu_factories) override; |
314 | 315 |
315 MockMediaStreamVideoRenderer* provider() { | 316 MockMediaStreamVideoRenderer* provider() { |
316 return static_cast<MockMediaStreamVideoRenderer*>(provider_.get()); | 317 return static_cast<MockMediaStreamVideoRenderer*>(provider_.get()); |
317 } | 318 } |
318 | 319 |
319 scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer( | 320 scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer( |
320 const blink::WebMediaStream& web_stream, | 321 const blink::WebMediaStream& web_stream, |
321 int render_frame_id, | 322 int render_frame_id, |
322 const std::string& device_id, | 323 const std::string& device_id, |
323 const url::Origin& security_origin) override { | 324 const url::Origin& security_origin) override { |
324 return nullptr; | 325 return nullptr; |
325 } | 326 } |
326 | 327 |
327 private: | 328 private: |
328 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 329 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
329 scoped_refptr<MediaStreamVideoRenderer> provider_; | 330 scoped_refptr<MediaStreamVideoRenderer> provider_; |
330 ReusableMessageLoopEvent* const message_loop_controller_; | 331 ReusableMessageLoopEvent* const message_loop_controller_; |
331 }; | 332 }; |
332 | 333 |
333 scoped_refptr<MediaStreamVideoRenderer> MockRenderFactory::GetVideoRenderer( | 334 scoped_refptr<MediaStreamVideoRenderer> MockRenderFactory::GetVideoRenderer( |
334 const blink::WebMediaStream& web_stream, | 335 const blink::WebMediaStream& web_stream, |
335 const base::Closure& error_cb, | 336 const base::Closure& error_cb, |
336 const MediaStreamVideoRenderer::RepaintCB& repaint_cb, | 337 const MediaStreamVideoRenderer::RepaintCB& repaint_cb, |
| 338 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
337 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 339 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
338 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 340 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
339 media::GpuVideoAcceleratorFactories* gpu_factories) { | 341 media::GpuVideoAcceleratorFactories* gpu_factories) { |
340 provider_ = new MockMediaStreamVideoRenderer(task_runner_, | 342 provider_ = new MockMediaStreamVideoRenderer(task_runner_, |
341 message_loop_controller_, error_cb, repaint_cb); | 343 message_loop_controller_, error_cb, repaint_cb); |
342 | 344 |
343 return provider_; | 345 return provider_; |
344 } | 346 } |
345 | 347 |
346 // This is the main class coordinating the tests. | 348 // This is the main class coordinating the tests. |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
918 // OnShown() should restart after a forced suspension. | 920 // OnShown() should restart after a forced suspension. |
919 player_->OnShown(); | 921 player_->OnShown(); |
920 EXPECT_FALSE(player_->paused()); | 922 EXPECT_FALSE(player_->paused()); |
921 EXPECT_CALL(*this, DoSetWebLayer(false)); | 923 EXPECT_CALL(*this, DoSetWebLayer(false)); |
922 | 924 |
923 base::RunLoop().RunUntilIdle(); | 925 base::RunLoop().RunUntilIdle(); |
924 } | 926 } |
925 #endif | 927 #endif |
926 | 928 |
927 } // namespace content | 929 } // namespace content |
OLD | NEW |