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

Unified Diff: content/browser/media/android/browser_media_player_manager.h

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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: content/browser/media/android/browser_media_player_manager.h
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 8df9945d2eec6e1bbbf2faa22603accf007f8586..f4f26c343ea495b9df8451797ef005940df76234 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -220,13 +220,17 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
// An array of managed media DRM bridges.
ScopedVector<media::MediaDrmBridge> drm_bridges_;
- // a set of media keys IDs that are pending approval or approved to access
+ // A set of media keys IDs that are pending approval or approved to access
// device DRM credentials.
// These 2 sets does not cover all the EME videos. If a video only streams
// clear data, it will not be included in either set.
std::set<int> cdm_ids_pending_approval_;
std::set<int> cdm_ids_approved_;
+ // A map of cdm_id -> player_id. When the player associated by |player_id| is
+ // available, player->SetDrmBridge(cdm_id) should be called.
+ std::map<int, int> pending_set_media_keys_map_;
xhwang 2014/03/10 23:36:32 This is used when we call SetMediaKeys() before we
ddorwin 2014/03/11 04:06:33 How do we have a player_id before video.load()? Is
xhwang 2014/03/12 01:07:52 Removed. You are right: https://code.google.com/p/
ddorwin 2014/03/18 22:51:08 Is there a place that we can DCHECK this?
+
// The fullscreen video view object or NULL if video is not played in
// fullscreen.
scoped_ptr<ContentVideoView> video_view_;

Powered by Google App Engine
This is Rietveld 408576698