BrowserMediaPlayerManager manages MediaKeys objects.

content/browser/media/android/browser_media_player_manager.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/browser/android/content_video_view.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/common/media/media_player_messages_enums_android.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_player_manager.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 namespace media {
 class DemuxerAndroid;
-class MediaDrmBridge;
+class MediaKeys;
 }
 
 namespace content {
 class BrowserDemuxerAndroid;
 class ContentViewCoreImpl;
 class ExternalVideoSurfaceContainer;
 class WebContents;
 
-// This class manages all the MediaPlayerAndroid objects. It receives
-// control operations from the the render process, and forwards
-// them to corresponding MediaPlayerAndroid object. Callbacks from
-// MediaPlayerAndroid objects are converted to IPCs and then sent to the
-// render process.
+// This class manages all the MediaPlayerAndroid and CDM objects.
+// It receives control operations from the the render process, and forwards
+// them to corresponding MediaPlayerAndroid or CDM object. Callbacks from
+// MediaPlayerAndroid and CDM objects are converted to IPCs and then sent to
+// the render process.
 class CONTENT_EXPORT BrowserMediaPlayerManager
     : public WebContentsObserver,
       public media::MediaPlayerManager {
  public:
   // Permits embedders to provide an extended version of the class.
   typedef BrowserMediaPlayerManager* (*Factory)(RenderViewHost*);
   static void RegisterFactory(Factory factory);
 
   // Returns a new instance using the registered factory if available.
   static BrowserMediaPlayerManager* Create(RenderViewHost* rvh);
@@ skipping 30 matching lines @@
   virtual void OnBufferingUpdate(int player_id, int percentage) OVERRIDE;
   virtual void OnSeekComplete(
       int player_id,
       const base::TimeDelta& current_time) OVERRIDE;
   virtual void OnError(int player_id, int error) OVERRIDE;
   virtual void OnVideoSizeChanged(
       int player_id, int width, int height) OVERRIDE;
   virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
-  virtual media::MediaDrmBridge* GetDrmBridge(int cdm_id) OVERRIDE;
+  virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE;
   virtual void DestroyAllMediaPlayers() OVERRIDE;
   virtual void RequestFullScreen(int player_id) OVERRIDE;
   virtual void OnSessionCreated(int cdm_id,
                                 uint32 session_id,
                                 const std::string& web_session_id) OVERRIDE;
   virtual void OnSessionMessage(int cdm_id,
                                 uint32 session_id,
                                 const std::vector<uint8>& message,
-                                const GURL& destination_url) OVERRIDE;
+                                const std::string& destination_url) OVERRIDE;

[ddorwin, 2014/05/13 00:59:38]

Why the change?
Should we pass GURLs around as much as possible?

[xhwang, 2014/05/14 16:42:06]

std::string is used in media_keys.h. Filed a bug and added TODO in media_keys.h.

   virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE;
   virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE;
   virtual void OnSessionError(int cdm_id,
                               uint32 session_id,
                               media::MediaKeys::KeyError error_code,
                               uint32 system_code) OVERRIDE;
 
 #if defined(VIDEO_HOLE)
   void AttachExternalVideoSurface(int player_id, jobject surface);
   void DetachExternalVideoSurface(int player_id);
@@ skipping 44 matching lines @@
   // Removes the player with the specified id.
   void RemovePlayer(int player_id);
 
   // Replaces a player with the specified id with a given MediaPlayerAndroid
   // object. This will also return the original MediaPlayerAndroid object that
   // was replaced.
   scoped_ptr<media::MediaPlayerAndroid> SwapPlayer(
       int player_id,
       media::MediaPlayerAndroid* player);
 
-  // Adds a new MediaDrmBridge for the given |key_system|, |cdm_id|, and
-  // |frame_url|.
-  void AddDrmBridge(int cdm_id,
-                    const std::string& key_system,
-                    const GURL& frame_url);
+  // Adds a new CDM for the given |key_system|, |cdm_id|, and |security_origin|.

[ddorwin, 2014/05/13 00:59:38]

Would it be more accurate to say this?
// Adds a new CDM [identified by] |cdm_id| for the given |key_system| and
|security_origin|.

[xhwang, 2014/05/14 16:42:06]

Done.

+  void AddCdm(int cdm_id,
+              const std::string& key_system,
+              const GURL& security_origin);
 
-  // Removes the DRM bridge with the specified id.
-  void RemoveDrmBridge(int cdm_id);
+  // Removes the CDM with the specified id.
+  void RemoveCdm(int cdm_id);
 
  private:
   // If |permitted| is false, it does nothing but send
   // |CdmMsg_SessionError| IPC message.
   // The primary use case is infobar permission callback, i.e., when infobar
   // can decide user's intention either from interacting with the actual info
   // bar or from the saved preference.
   void CreateSessionIfPermitted(int cdm_id,
                                 uint32 session_id,
                                 const std::string& content_type,
@@ skipping 24 matching lines @@
 
 #if defined(VIDEO_HOLE)
   void OnNotifyExternalSurface(
       int player_id, bool is_request, const gfx::RectF& rect);
   void OnRequestExternalSurface(int player_id, const gfx::RectF& rect);
 #endif  // defined(VIDEO_HOLE)
 
   // An array of managed players.
   ScopedVector<media::MediaPlayerAndroid> players_;
 
-  // An array of managed media DRM bridges.
-  ScopedVector<media::MediaDrmBridge> drm_bridges_;
+  // A map from CDM IDs to managed CDMs.
+  typedef std::map<int, media::MediaKeys*> CdmMap;
+  CdmMap cdm_map_;
 
-  // Map from DrmBridge cdm_id to MediaPlayerAndroid player_id to indicate that
-  // the DrmBridge is set on the MediaPlayerAndroid object.
-  typedef std::map<int, int> DrmBridgePlayerMap;
-  DrmBridgePlayerMap drm_bridge_player_map_;
+  // Map from CDM ID to MediaPlayerAndroid player ID to indicate that
+  // the CDM is set on the MediaPlayerAndroid object.
+  typedef std::map<int, int> CdmToPlayerMap;
+  CdmToPlayerMap cdm_to_player_map_;
+
+  // Map from CDM ID to CDM's security origin.

[ddorwin, 2014/05/13 00:59:38]

Why doesn't the CDM object maintain this? Should we keep a pointer to a subclass
of MediaKeys instead?

[xhwang, 2014/05/14 16:42:06]

Because most CDM objects are not interested in this. Even MediaDrmBridge has no
idea what this is used for, unless we move
RequestProtectedMediaIdentifierPermission() call into MediaDrmBridge.

Bottom line, I think we should store the security origin in the same class where
we call context->RequestProtectedMediaIdentifierPermission().

+  std::map<int, GURL> security_origin_map_;

[ddorwin, 2014/05/13 00:59:38]

cdm_...

[xhwang, 2014/05/14 16:42:06]

Done.

 
   // The fullscreen video view object or NULL if video is not played in
   // fullscreen.
   scoped_ptr<ContentVideoView> video_view_;
 
 #if defined(VIDEO_HOLE)
   scoped_ptr<ExternalVideoSurfaceContainer> external_video_surface_container_;
 #endif
 
   // Player ID of the fullscreen media player.
   int fullscreen_player_id_;
 
   // Whether the fullscreen player has been Release()-d.
   bool fullscreen_player_is_released_;
 
   WebContents* web_contents_;
 
   // Object for retrieving resources media players.
   scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_