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

Unified Diff: media/blink/webmediaplayer_impl.h

Issue 759933003: Move OnNeedKey() to WebMediaPlayerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 596df9e766a568b9035e0f83cce4e5e93ceaefc2..bd6e24977e4f521e8505fb9d8e127ae35cb06cae 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -209,6 +209,10 @@ class MEDIA_EXPORT WebMediaPlayerImpl
// compositor can return the frame.
scoped_refptr<VideoFrame> GetCurrentFrameFromCompositor();
+ // Called when the demuxer encounters encrypted streams.
+ void OnNeedKey(const std::string& type,
+ const std::vector<uint8>& init_data);
+
void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
// Called when a CDM has been attached to the |pipeline_|.
@@ -311,6 +315,10 @@ class MEDIA_EXPORT WebMediaPlayerImpl
EncryptedMediaPlayerSupport encrypted_media_support_;
+ // Temporary for EME v0.1. In the future the init data type should be passed
ddorwin 2014/12/02 20:49:49 Future? Isn't this already implemented? Can we dro
xhwang 2014/12/02 21:57:47 Done.
+ // directly from WebKit.
+ std::string init_data_type_;
ddorwin 2014/12/02 20:49:49 Let's name it prefixed_eme_... or something like t
xhwang 2014/12/02 21:57:47 Not needed since init_data_type_ is moved back to
+
const AudioHardwareConfig& audio_hardware_config_;
scoped_ptr<Renderer> renderer_;

Powered by Google App Engine
This is Rietveld 408576698