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

Unified Diff: media/base/pipeline.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/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index 6bca4778aa4b3dc33823604a2d68bf3ac74f2079..d1c88f8810be710b3eafc8c543ab9fb9b759dae9 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -105,6 +105,9 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
// |duration_change_cb| optional callback that will be executed whenever the
// presentation duration changes.
// |add_text_track_cb| will be executed whenever a text track is added.
+ // |waiting_for_encryption_key_cb| will be executed whenever a stream needs
ddorwin 2015/02/19 05:33:17 dittos
jrummell 2015/02/23 22:06:32 Done.
+ // a new key provided in order to decrypt
+ // the stream.
// It is an error to call this method after the pipeline has already started.
void Start(Demuxer* demuxer,
scoped_ptr<Renderer> renderer,
@@ -115,7 +118,8 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
const BufferingStateCB& buffering_state_cb,
const PaintCB& paint_cb,
const base::Closure& duration_change_cb,
- const AddTextTrackCB& add_text_track_cb);
+ const AddTextTrackCB& add_text_track_cb,
+ const base::Closure& waiting_for_encryption_key_cb);
// Asynchronously stops the pipeline, executing |stop_cb| when the pipeline
// teardown has completed.
@@ -360,6 +364,7 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
PaintCB paint_cb_;
base::Closure duration_change_cb_;
AddTextTrackCB add_text_track_cb_;
+ base::Closure waiting_for_encryption_key_cb_;
// Holds the initialized demuxer. Used for seeking. Owned by client.
Demuxer* demuxer_;

Powered by Google App Engine
This is Rietveld 408576698