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

Side by Side Diff: media/blink/webmediaplayer_impl.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/null_encrypted_media_player_support.cc ('k') | media/blink/webmediaplayer_impl.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_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 unsigned key_length, 148 unsigned key_length,
149 const unsigned char* init_data, 149 const unsigned char* init_data,
150 unsigned init_data_length, 150 unsigned init_data_length,
151 const blink::WebString& session_id); 151 const blink::WebString& session_id);
152 152
153 virtual MediaKeyException cancelKeyRequest( 153 virtual MediaKeyException cancelKeyRequest(
154 const blink::WebString& key_system, 154 const blink::WebString& key_system,
155 const blink::WebString& session_id); 155 const blink::WebString& session_id);
156 156
157 // TODO(jrummell): Remove this method once Blink updated to use the other 157 // TODO(jrummell): Remove this method once Blink updated to use the other
158 // two methods. 158 // method.
159 virtual void setContentDecryptionModule( 159 virtual void setContentDecryptionModule(
160 blink::WebContentDecryptionModule* cdm); 160 blink::WebContentDecryptionModule* cdm);
161 virtual void setContentDecryptionModule( 161 virtual void setContentDecryptionModule(
162 blink::WebContentDecryptionModule* cdm, 162 blink::WebContentDecryptionModule* cdm,
163 blink::WebContentDecryptionModuleResult result); 163 blink::WebContentDecryptionModuleResult result);
164 virtual void setContentDecryptionModuleSync(
165 blink::WebContentDecryptionModule* cdm);
166 164
167 void OnPipelineSeeked(bool time_changed, PipelineStatus status); 165 void OnPipelineSeeked(bool time_changed, PipelineStatus status);
168 void OnPipelineEnded(); 166 void OnPipelineEnded();
169 void OnPipelineError(PipelineStatus error); 167 void OnPipelineError(PipelineStatus error);
170 void OnPipelineMetadata(PipelineMetadata metadata); 168 void OnPipelineMetadata(PipelineMetadata metadata);
171 void OnPipelineBufferingStateChanged(BufferingState buffering_state); 169 void OnPipelineBufferingStateChanged(BufferingState buffering_state);
172 void OnDemuxerOpened(); 170 void OnDemuxerOpened();
173 void OnAddTextTrack(const TextTrackConfig& config, 171 void OnAddTextTrack(const TextTrackConfig& config,
174 const AddTextTrackDoneCB& done_cb); 172 const AddTextTrackDoneCB& done_cb);
175 173
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_; 308 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_;
311 309
312 const AudioHardwareConfig& audio_hardware_config_; 310 const AudioHardwareConfig& audio_hardware_config_;
313 311
314 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 312 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
315 }; 313 };
316 314
317 } // namespace media 315 } // namespace media
318 316
319 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 317 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/null_encrypted_media_player_support.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698