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

Unified Diff: media/base/video_decoder.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 side-by-side diff with in-line comments
Download patch
Index: media/base/video_decoder.h
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
index c49e0dcdbd28b7e4a56b6def8c0eb0edd0cb529e..a3ed222e87a4b25e3101b5cca1cc9daf9f8e0d78 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -53,7 +53,9 @@ class MEDIA_EXPORT VideoDecoder {
// Initializes a VideoDecoder with the given |config|, executing the
// |status_cb| upon completion. |output_cb| is called for each output frame
- // decoded by Decode().
+ // decoded by Decode(). |waiting_for_encryption_key_cb| is called for
ddorwin 2015/02/19 05:33:17 dittos
jrummell 2015/02/23 22:06:32 Done.
+ // encrypted streams whenever a new key is required in order to decrypt
+ // the stream.
//
// If |low_delay| is true then the decoder is not allowed to queue frames,
// except for out-of-order frames, i.e. if the next frame can be returned it
@@ -66,10 +68,12 @@ class MEDIA_EXPORT VideoDecoder {
// Upon reinitialization, all internal buffered frames will be dropped.
// 2) This method should not be called during pending decode or reset.
// 3) No VideoDecoder calls should be made before |status_cb| is executed.
- virtual void Initialize(const VideoDecoderConfig& config,
- bool low_delay,
- const PipelineStatusCB& status_cb,
- const OutputCB& output_cb) = 0;
+ virtual void Initialize(
+ const VideoDecoderConfig& config,
+ bool low_delay,
+ const PipelineStatusCB& status_cb,
+ const OutputCB& output_cb,
+ const base::Closure& waiting_for_encryption_key_cb) = 0;
// Requests a |buffer| to be decoded. The status of the decoder and decoded
// frame are returned via the provided callback. Some decoders may allow

Powered by Google App Engine
This is Rietveld 408576698