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

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

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes for android + mojo Created 6 years, 2 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
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 24 matching lines...) Expand all
35 typedef base::Callback<void(const base::Closure&)> DeferLoadCB; 35 typedef base::Callback<void(const base::Closure&)> DeferLoadCB;
36 36
37 // |defer_load_cb|, |audio_renderer_sink|, and |compositor_task_runner| may be 37 // |defer_load_cb|, |audio_renderer_sink|, and |compositor_task_runner| may be
38 // null. 38 // null.
39 WebMediaPlayerParams( 39 WebMediaPlayerParams(
40 const DeferLoadCB& defer_load_cb, 40 const DeferLoadCB& defer_load_cb,
41 const scoped_refptr<AudioRendererSink>& audio_renderer_sink, 41 const scoped_refptr<AudioRendererSink>& audio_renderer_sink,
42 const AudioHardwareConfig& audio_hardware_config, 42 const AudioHardwareConfig& audio_hardware_config,
43 const scoped_refptr<MediaLog>& media_log, 43 const scoped_refptr<MediaLog>& media_log,
44 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories, 44 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
45 const scoped_refptr<base::SingleThreadTaskRunner>& 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
46 media_task_runner, 46 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
47 const scoped_refptr<base::SingleThreadTaskRunner>&
48 compositor_task_runner,
49 const EncryptedMediaPlayerSupportCreateCB& 47 const EncryptedMediaPlayerSupportCreateCB&
50 encrypted_media_player_support_cb); 48 encrypted_media_player_support_cb,
49 blink::WebContentDecryptionModule* initial_cdm);
51 50
52 ~WebMediaPlayerParams(); 51 ~WebMediaPlayerParams();
53 52
54 base::Callback<void(const base::Closure&)> defer_load_cb() const { 53 base::Callback<void(const base::Closure&)> defer_load_cb() const {
55 return defer_load_cb_; 54 return defer_load_cb_;
56 } 55 }
57 56
58 const scoped_refptr<AudioRendererSink>& audio_renderer_sink() const { 57 const scoped_refptr<AudioRendererSink>& audio_renderer_sink() const {
59 return audio_renderer_sink_; 58 return audio_renderer_sink_;
60 } 59 }
(...skipping 26 matching lines...) Expand all
87 86
88 private: 87 private:
89 base::Callback<void(const base::Closure&)> defer_load_cb_; 88 base::Callback<void(const base::Closure&)> defer_load_cb_;
90 scoped_refptr<AudioRendererSink> audio_renderer_sink_; 89 scoped_refptr<AudioRendererSink> audio_renderer_sink_;
91 const AudioHardwareConfig& audio_hardware_config_; 90 const AudioHardwareConfig& audio_hardware_config_;
92 scoped_refptr<MediaLog> media_log_; 91 scoped_refptr<MediaLog> media_log_;
93 scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_; 92 scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_;
94 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; 93 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
95 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 94 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
96 EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_; 95 EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_;
96 blink::WebContentDecryptionModule* initial_cdm_;
97 97
98 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); 98 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
99 }; 99 };
100 100
101 } // namespace media 101 } // namespace media
102 102
103 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ 103 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698