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

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

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 #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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 void FrameReady(const scoped_refptr<VideoFrame>& frame); 205 void FrameReady(const scoped_refptr<VideoFrame>& frame);
206 206
207 // Returns the current video frame from |compositor_|. Blocks until the 207 // Returns the current video frame from |compositor_|. Blocks until the
208 // compositor can return the frame. 208 // compositor can return the frame.
209 scoped_refptr<VideoFrame> GetCurrentFrameFromCompositor(); 209 scoped_refptr<VideoFrame> GetCurrentFrameFromCompositor();
210 210
211 // Called when the demuxer encounters encrypted streams. 211 // Called when the demuxer encounters encrypted streams.
212 void OnEncryptedMediaInitData(const std::string& init_data_type, 212 void OnEncryptedMediaInitData(const std::string& init_data_type,
213 const std::vector<uint8>& init_data); 213 const std::vector<uint8>& init_data);
214 214
215 // Called when the decoders need a key in order to decrypt the encrypted
ddorwin 2015/02/19 05:33:17 s/the decoders/a decoder/? ditto on the descripti
jrummell 2015/02/23 22:06:32 Done.
216 // stream.
217 void OnWaitingForEncryptionKey();
ddorwin 2015/02/19 05:33:17 Decryption
jrummell 2015/02/23 22:06:32 Done.
218
215 void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb); 219 void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
216 220
217 // Called when a CDM has been attached to the |pipeline_|. 221 // Called when a CDM has been attached to the |pipeline_|.
218 void OnCdmAttached(blink::WebContentDecryptionModuleResult result, 222 void OnCdmAttached(blink::WebContentDecryptionModuleResult result,
219 bool success); 223 bool success);
220 224
221 // Updates |paused_time_| to the current media time with consideration for the 225 // Updates |paused_time_| to the current media time with consideration for the
222 // |ended_| state by clamping current time to duration upon |ended_|. 226 // |ended_| state by clamping current time to duration upon |ended_|.
223 void UpdatePausedTime(); 227 void UpdatePausedTime();
224 228
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 EncryptedMediaPlayerSupport encrypted_media_support_; 318 EncryptedMediaPlayerSupport encrypted_media_support_;
315 319
316 scoped_ptr<RendererFactory> renderer_factory_; 320 scoped_ptr<RendererFactory> renderer_factory_;
317 321
318 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 322 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
319 }; 323 };
320 324
321 } // namespace media 325 } // namespace media
322 326
323 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ 327 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698