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

Side by Side Diff: media/blink/webmediaplayer_params.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Actually fix fuzzers. Created 3 years, 8 months 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 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 "base/task_runner.h"
9 #include "media/base/audio_renderer_sink.h" 9 #include "media/base/audio_renderer_sink.h"
10 #include "media/base/media_log.h"
11 10
12 namespace media { 11 namespace media {
13 12
14 WebMediaPlayerParams::WebMediaPlayerParams( 13 WebMediaPlayerParams::WebMediaPlayerParams(
14 std::unique_ptr<MediaLog> media_log,
15 const DeferLoadCB& defer_load_cb, 15 const DeferLoadCB& defer_load_cb,
16 const scoped_refptr<SwitchableAudioRendererSink>& audio_renderer_sink, 16 const scoped_refptr<SwitchableAudioRendererSink>& audio_renderer_sink,
17 const scoped_refptr<MediaLog>& media_log,
18 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 17 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
19 const scoped_refptr<base::TaskRunner>& worker_task_runner, 18 const scoped_refptr<base::TaskRunner>& worker_task_runner,
20 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 19 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
21 const Context3DCB& context_3d_cb, 20 const Context3DCB& context_3d_cb,
22 const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb, 21 const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb,
23 blink::WebContentDecryptionModule* initial_cdm, 22 blink::WebContentDecryptionModule* initial_cdm,
24 SurfaceManager* surface_manager, 23 SurfaceManager* surface_manager,
25 base::WeakPtr<MediaObserver> media_observer, 24 base::WeakPtr<MediaObserver> media_observer,
26 base::TimeDelta max_keyframe_distance_to_disable_background_video, 25 base::TimeDelta max_keyframe_distance_to_disable_background_video,
27 base::TimeDelta max_keyframe_distance_to_disable_background_video_mse, 26 base::TimeDelta max_keyframe_distance_to_disable_background_video_mse,
28 bool enable_instant_source_buffer_gc, 27 bool enable_instant_source_buffer_gc,
29 bool allow_suspend, 28 bool allow_suspend,
30 bool embedded_media_experience_enabled) 29 bool embedded_media_experience_enabled)
31 : defer_load_cb_(defer_load_cb), 30 : defer_load_cb_(defer_load_cb),
32 audio_renderer_sink_(audio_renderer_sink), 31 audio_renderer_sink_(audio_renderer_sink),
33 media_log_(media_log), 32 media_log_(std::move(media_log)),
34 media_task_runner_(media_task_runner), 33 media_task_runner_(media_task_runner),
35 worker_task_runner_(worker_task_runner), 34 worker_task_runner_(worker_task_runner),
36 compositor_task_runner_(compositor_task_runner), 35 compositor_task_runner_(compositor_task_runner),
37 context_3d_cb_(context_3d_cb), 36 context_3d_cb_(context_3d_cb),
38 adjust_allocated_memory_cb_(adjust_allocated_memory_cb), 37 adjust_allocated_memory_cb_(adjust_allocated_memory_cb),
39 initial_cdm_(initial_cdm), 38 initial_cdm_(initial_cdm),
40 surface_manager_(surface_manager), 39 surface_manager_(surface_manager),
41 media_observer_(media_observer), 40 media_observer_(media_observer),
42 max_keyframe_distance_to_disable_background_video_( 41 max_keyframe_distance_to_disable_background_video_(
43 max_keyframe_distance_to_disable_background_video), 42 max_keyframe_distance_to_disable_background_video),
44 max_keyframe_distance_to_disable_background_video_mse_( 43 max_keyframe_distance_to_disable_background_video_mse_(
45 max_keyframe_distance_to_disable_background_video_mse), 44 max_keyframe_distance_to_disable_background_video_mse),
46 enable_instant_source_buffer_gc_(enable_instant_source_buffer_gc), 45 enable_instant_source_buffer_gc_(enable_instant_source_buffer_gc),
47 allow_suspend_(allow_suspend), 46 allow_suspend_(allow_suspend),
48 embedded_media_experience_enabled_(embedded_media_experience_enabled) {} 47 embedded_media_experience_enabled_(embedded_media_experience_enabled) {}
49 48
50 WebMediaPlayerParams::~WebMediaPlayerParams() {} 49 WebMediaPlayerParams::~WebMediaPlayerParams() {}
51 50
52 } // namespace media 51 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698