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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/media/android/media_web_contents_observer.cc

Issue 315733003: Separate BrowserCdmManager from BrowserMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review. Please diff against PS1 for easier life! Created 6 years, 7 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
« content/browser/media/android/browser_media_player_manager.cc ('K') | « content/browser/media/android/media_web_contents_observer.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | content/browser/media/cdm/browser_cdm_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/android/media_web_contents_observer.cc
diff --git a/content/browser/media/android/media_web_contents_observer.cc b/content/browser/media/android/media_web_contents_observer.cc
index 711375c250455e1c466972f8567ab9181c0bcd5e..834629864c497cc10e8144a1bd5c68652c61c43f 100644
--- a/content/browser/media/android/media_web_contents_observer.cc
+++ b/content/browser/media/android/media_web_contents_observer.cc
@@ -4,16 +4,22 @@
#include "content/browser/media/android/media_web_contents_observer.h"
+#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "content/browser/media/android/browser_media_player_manager.h"
+#include "content/browser/media/cdm/browser_cdm_manager.h"
#include "content/common/media/cdm_messages.h"
#include "content/common/media/media_player_messages_android.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "ipc/ipc_message_macros.h"
+#include "media/base/android/media_player_android.h"
namespace content {
+using media::BrowserCdm;
+using media::MediaPlayerAndroid;
+
MediaWebContentsObserver::MediaWebContentsObserver(
RenderViewHost* render_view_host)
: WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)) {
@@ -26,90 +32,155 @@ void MediaWebContentsObserver::RenderFrameDeleted(
RenderFrameHost* render_frame_host) {
uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
media_player_managers_.erase(key);
+ cdm_managers_.erase(key);
}
bool MediaWebContentsObserver::OnMessageReceived(
const IPC::Message& msg,
RenderFrameHost* render_frame_host) {
- BrowserMediaPlayerManager* player_manager =
- GetMediaPlayerManager(render_frame_host);
- DCHECK(player_manager);
+ if (OnMediaPlayerMessageReceived(msg, render_frame_host))
+ return true;
+
+ if (OnCdmMessageReceived(msg, render_frame_host))
+ return true;
+
+ if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
+ return true;
+
+ return false;
+}
+bool MediaWebContentsObserver::OnMediaPlayerMessageReceived(
+ const IPC::Message& msg,
+ RenderFrameHost* render_frame_host) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserver, msg)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_EnterFullscreen,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnEnterFullscreen)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_ExitFullscreen,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnExitFullscreen)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Initialize,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnInitialize)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Start,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnStart)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Seek,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnSeek)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Pause,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnPause)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_SetVolume,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnSetVolume)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_SetPoster,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnSetPoster)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_Release,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnReleaseResources)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_DestroyMediaPlayer,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::OnDestroyPlayer)
IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_DestroyAllMediaPlayers,
- player_manager,
+ GetMediaPlayerManager(render_frame_host),
BrowserMediaPlayerManager::DestroyAllMediaPlayers)
- IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_SetCdm,
- player_manager,
- BrowserMediaPlayerManager::OnSetCdm)
+#if defined(VIDEO_HOLE)
+ IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface,
+ GetMediaPlayerManager(render_frame_host),
+ BrowserMediaPlayerManager::OnNotifyExternalSurface)
+#endif // defined(VIDEO_HOLE)
+ IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_END_MESSAGE_MAP()
+ return handled;
+}
+
+bool MediaWebContentsObserver::OnCdmMessageReceived(
+ const IPC::Message& msg,
+ RenderFrameHost* render_frame_host) {
+ bool handled = true;
+ IPC_BEGIN_MESSAGE_MAP(MediaWebContentsObserver, msg)
IPC_MESSAGE_FORWARD(CdmHostMsg_InitializeCdm,
- player_manager,
- BrowserMediaPlayerManager::OnInitializeCdm)
+ GetCdmManager(render_frame_host),
+ BrowserCdmManager::OnInitializeCdm)
IPC_MESSAGE_FORWARD(CdmHostMsg_CreateSession,
- player_manager,
- BrowserMediaPlayerManager::OnCreateSession)
+ GetCdmManager(render_frame_host),
+ BrowserCdmManager::OnCreateSession)
IPC_MESSAGE_FORWARD(CdmHostMsg_UpdateSession,
- player_manager,
- BrowserMediaPlayerManager::OnUpdateSession)
+ GetCdmManager(render_frame_host),
+ BrowserCdmManager::OnUpdateSession)
IPC_MESSAGE_FORWARD(CdmHostMsg_ReleaseSession,
- player_manager,
- BrowserMediaPlayerManager::OnReleaseSession)
+ GetCdmManager(render_frame_host),
+ BrowserCdmManager::OnReleaseSession)
IPC_MESSAGE_FORWARD(CdmHostMsg_DestroyCdm,
- player_manager,
- BrowserMediaPlayerManager::OnDestroyCdm)
-#if defined(VIDEO_HOLE)
- IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface,
- player_manager,
- BrowserMediaPlayerManager::OnNotifyExternalSurface)
-#endif // defined(VIDEO_HOLE)
+ GetCdmManager(render_frame_host),
+ BrowserCdmManager::OnDestroyCdm)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
}
+bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived(
+ const IPC::Message& msg,
+ RenderFrameHost* render_frame_host) {
+ bool handled = true;
+ IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(
+ MediaWebContentsObserver, msg, render_frame_host)
+ IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_SetCdm, OnSetCdm)
+ IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_END_MESSAGE_MAP()
+ return handled;
+}
+
+void MediaWebContentsObserver::OnSetCdm(RenderFrameHost* render_frame_host,
+ int player_id,
+ int cdm_id) {
+ BrowserMediaPlayerManager* media_player_manager =
ddorwin 2014/06/04 01:02:30 nit: do we need this variable? Same below.
xhwang 2014/06/04 18:54:07 Done.
+ GetMediaPlayerManager(render_frame_host);
+ MediaPlayerAndroid* media_player = media_player_manager->GetPlayer(player_id);
+ if (!media_player) {
+ NOTREACHED();
+ DVLOG(1) << "OnSetCdm: MediaPlayer not found for " << player_id;
ddorwin 2014/06/04 01:02:30 Just << the NOTREACHED().
xhwang 2014/06/04 18:54:07 Done.
+ return;
+ }
+
+ BrowserCdmManager* cdm_manager = GetCdmManager(render_frame_host);
+ BrowserCdm* cdm = cdm_manager->GetCdm(cdm_id);
+ if (!cdm) {
+ NOTREACHED();
+ DVLOG(1) << "OnSetCdm: CDM not found for " << cdm_id;
+ return;
+ }
+
+ // TODO(xhwang): This could possibly fail. In that case we should reject the
+ // promise.
+ media_player->SetCdm(cdm);
+}
+
BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
RenderFrameHost* render_frame_host) {
uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
if (!media_player_managers_.contains(key)) {
media_player_managers_.set(
key,
- scoped_ptr<BrowserMediaPlayerManager>(
- BrowserMediaPlayerManager::Create(render_frame_host)));
+ make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host)));
}
return media_player_managers_.get(key);
}
+BrowserCdmManager* MediaWebContentsObserver::GetCdmManager(
+ RenderFrameHost* render_frame_host) {
+ uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
+ if (!cdm_managers_.contains(key)) {
+ cdm_managers_.set(
+ key, make_scoped_ptr(BrowserCdmManager::Create(render_frame_host)));
+ }
+ return cdm_managers_.get(key);
+}
+
void MediaWebContentsObserver::PauseVideo() {
for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin();
iter != media_player_managers_.end(); ++iter) {
« content/browser/media/android/browser_media_player_manager.cc ('K') | « content/browser/media/android/media_web_contents_observer.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | content/browser/media/cdm/browser_cdm_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698