OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "media/blink/webmediaplayer_params.h" | 5 #include "media/blink/webmediaplayer_params.h" |
6 | 6 |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
| 8 #include "base/task_runner.h" |
8 #include "media/base/audio_renderer_sink.h" | 9 #include "media/base/audio_renderer_sink.h" |
9 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
10 | 11 |
11 namespace media { | 12 namespace media { |
12 | 13 |
13 WebMediaPlayerParams::WebMediaPlayerParams( | 14 WebMediaPlayerParams::WebMediaPlayerParams( |
14 const DeferLoadCB& defer_load_cb, | 15 const DeferLoadCB& defer_load_cb, |
15 const scoped_refptr<AudioRendererSink>& audio_renderer_sink, | 16 const scoped_refptr<AudioRendererSink>& audio_renderer_sink, |
16 const scoped_refptr<MediaLog>& media_log, | 17 const scoped_refptr<MediaLog>& media_log, |
17 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 18 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 19 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
18 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, | 20 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
19 const Context3DCB& context_3d_cb, | 21 const Context3DCB& context_3d_cb, |
20 MediaPermission* media_permission, | 22 MediaPermission* media_permission, |
21 blink::WebContentDecryptionModule* initial_cdm) | 23 blink::WebContentDecryptionModule* initial_cdm) |
22 : defer_load_cb_(defer_load_cb), | 24 : defer_load_cb_(defer_load_cb), |
23 audio_renderer_sink_(audio_renderer_sink), | 25 audio_renderer_sink_(audio_renderer_sink), |
24 media_log_(media_log), | 26 media_log_(media_log), |
25 media_task_runner_(media_task_runner), | 27 media_task_runner_(media_task_runner), |
| 28 worker_task_runner_(worker_task_runner), |
26 compositor_task_runner_(compositor_task_runner), | 29 compositor_task_runner_(compositor_task_runner), |
27 context_3d_cb_(context_3d_cb), | 30 context_3d_cb_(context_3d_cb), |
28 media_permission_(media_permission), | 31 media_permission_(media_permission), |
29 initial_cdm_(initial_cdm) { | 32 initial_cdm_(initial_cdm) {} |
30 } | |
31 | 33 |
32 WebMediaPlayerParams::~WebMediaPlayerParams() {} | 34 WebMediaPlayerParams::~WebMediaPlayerParams() {} |
33 | 35 |
34 } // namespace media | 36 } // namespace media |
OLD | NEW |