Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Side by Side Diff: content/renderer/media/webmediaplayer_ms_unittest.cc

Issue 2529263004: Move passing of WebRTC rendering frames to IO thread (Closed)
Patch Set: ncarter@ comment. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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>& io_task_runner,
312 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 312 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
313 const scoped_refptr<base::TaskRunner>& worker_task_runner, 313 const scoped_refptr<base::TaskRunner>& worker_task_runner,
314 media::GpuVideoAcceleratorFactories* gpu_factories) override; 314 media::GpuVideoAcceleratorFactories* gpu_factories) override;
315 315
316 MockMediaStreamVideoRenderer* provider() { 316 MockMediaStreamVideoRenderer* provider() {
317 return static_cast<MockMediaStreamVideoRenderer*>(provider_.get()); 317 return static_cast<MockMediaStreamVideoRenderer*>(provider_.get());
318 } 318 }
319 319
320 scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer( 320 scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
321 const blink::WebMediaStream& web_stream, 321 const blink::WebMediaStream& web_stream,
322 int render_frame_id, 322 int render_frame_id,
323 const std::string& device_id, 323 const std::string& device_id,
324 const url::Origin& security_origin) override { 324 const url::Origin& security_origin) override {
325 return nullptr; 325 return nullptr;
326 } 326 }
327 327
328 private: 328 private:
329 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 329 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
330 scoped_refptr<MediaStreamVideoRenderer> provider_; 330 scoped_refptr<MediaStreamVideoRenderer> provider_;
331 ReusableMessageLoopEvent* const message_loop_controller_; 331 ReusableMessageLoopEvent* const message_loop_controller_;
332 }; 332 };
333 333
334 scoped_refptr<MediaStreamVideoRenderer> MockRenderFactory::GetVideoRenderer( 334 scoped_refptr<MediaStreamVideoRenderer> MockRenderFactory::GetVideoRenderer(
335 const blink::WebMediaStream& web_stream, 335 const blink::WebMediaStream& web_stream,
336 const base::Closure& error_cb, 336 const base::Closure& error_cb,
337 const MediaStreamVideoRenderer::RepaintCB& repaint_cb, 337 const MediaStreamVideoRenderer::RepaintCB& repaint_cb,
338 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 338 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
339 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 339 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
340 const scoped_refptr<base::TaskRunner>& worker_task_runner, 340 const scoped_refptr<base::TaskRunner>& worker_task_runner,
341 media::GpuVideoAcceleratorFactories* gpu_factories) { 341 media::GpuVideoAcceleratorFactories* gpu_factories) {
342 provider_ = new MockMediaStreamVideoRenderer(task_runner_, 342 provider_ = new MockMediaStreamVideoRenderer(task_runner_,
343 message_loop_controller_, error_cb, repaint_cb); 343 message_loop_controller_, error_cb, repaint_cb);
344 344
345 return provider_; 345 return provider_;
346 } 346 }
347 347
348 // This is the main class coordinating the tests. 348 // This is the main class coordinating the tests.
(...skipping 27 matching lines...) Expand all
376 &message_loop_controller_)), 376 &message_loop_controller_)),
377 player_(new WebMediaPlayerMS( 377 player_(new WebMediaPlayerMS(
378 nullptr, 378 nullptr,
379 this, 379 this,
380 delegate_.AsWeakPtr(), 380 delegate_.AsWeakPtr(),
381 new media::MediaLog(), 381 new media::MediaLog(),
382 std::unique_ptr<MediaStreamRendererFactory>(render_factory_), 382 std::unique_ptr<MediaStreamRendererFactory>(render_factory_),
383 message_loop_.task_runner(), 383 message_loop_.task_runner(),
384 message_loop_.task_runner(), 384 message_loop_.task_runner(),
385 message_loop_.task_runner(), 385 message_loop_.task_runner(),
386 message_loop_.task_runner(),
386 nullptr, 387 nullptr,
387 blink::WebString(), 388 blink::WebString(),
388 blink::WebSecurityOrigin())), 389 blink::WebSecurityOrigin())),
389 rendering_(false), 390 rendering_(false),
390 background_rendering_(false) {} 391 background_rendering_(false) {}
391 ~WebMediaPlayerMSTest() override { 392 ~WebMediaPlayerMSTest() override {
392 player_.reset(); 393 player_.reset();
393 base::RunLoop().RunUntilIdle(); 394 base::RunLoop().RunUntilIdle();
394 } 395 }
395 396
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 // OnShown() should restart after a forced suspension. 936 // OnShown() should restart after a forced suspension.
936 player_->OnShown(); 937 player_->OnShown();
937 EXPECT_FALSE(player_->paused()); 938 EXPECT_FALSE(player_->paused());
938 EXPECT_CALL(*this, DoSetWebLayer(false)); 939 EXPECT_CALL(*this, DoSetWebLayer(false));
939 940
940 base::RunLoop().RunUntilIdle(); 941 base::RunLoop().RunUntilIdle();
941 } 942 }
942 #endif 943 #endif
943 944
944 } // namespace content 945 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_compositor.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698