summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-07 20:28:18 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-07 20:28:18 +0000
commit8fc0f5be02eee83d34830fe0605b30ab36a06d18 (patch)
tree55ee9fd848fbc5e24452b153f77a2bba453ccf84 /media
parent03406ba721ebad5e4c6a1dba17a0b3f7fbe0ec4c (diff)
downloadchromium_src-8fc0f5be02eee83d34830fe0605b30ab36a06d18.zip
chromium_src-8fc0f5be02eee83d34830fe0605b30ab36a06d18.tar.gz
chromium_src-8fc0f5be02eee83d34830fe0605b30ab36a06d18.tar.bz2
Separate BrowserCdmManager from BrowserMediaPlayerManager.
BUG=315312 TEST=Test pages still work. Review URL: https://codereview.chromium.org/315733003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/android/media_player_manager.h39
-rw-r--r--media/base/android/media_source_player_unittest.cc14
2 files changed, 0 insertions, 53 deletions
diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h
index d7ee791..8975552f 100644
--- a/media/base/android/media_player_manager.h
+++ b/media/base/android/media_player_manager.h
@@ -5,21 +5,13 @@
#ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
#define MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
-#include <string>
-#include <vector>
-
#include "base/basictypes.h"
#include "base/time/time.h"
#include "media/base/android/demuxer_stream_player_params.h"
#include "media/base/media_export.h"
-#include "media/base/media_keys.h"
-#include "url/gurl.h"
-
-class GURL;
namespace media {
-class BrowserCdm;
class MediaPlayerAndroid;
class MediaResourceGetter;
@@ -74,39 +66,8 @@ class MEDIA_EXPORT MediaPlayerManager {
// Release all the players managed by this object.
virtual void DestroyAllMediaPlayers() = 0;
- // Get the CDM for the given CDM ID.
- virtual BrowserCdm* GetCdm(int cdm_id) = 0;
-
// Called by the player to get a hardware protected surface.
virtual void RequestFullScreen(int player_id) = 0;
-
- // The following five methods are related to EME.
- // TODO(xhwang): These methods needs to be decoupled from MediaPlayerManager
- // to support the W3C Working Draft version of the EME spec.
- // http://crbug.com/315312
-
- // Called when CDM creates a session.
- virtual void OnSessionCreated(int cdm_id,
- uint32 session_id,
- const std::string& web_session_id) = 0;
-
- // Called when CDM wants to send a Message event.
- virtual void OnSessionMessage(int cdm_id,
- uint32 session_id,
- const std::vector<uint8>& message,
- const GURL& destination_url) = 0;
-
- // Called when CDM wants to send a Ready event.
- virtual void OnSessionReady(int cdm_id, uint32 session_id) = 0;
-
- // Called when CDM wants to send a Closed event.
- virtual void OnSessionClosed(int cdm_id, uint32 session_id) = 0;
-
- // Called when CDM wants to send an Error event.
- virtual void OnSessionError(int cdm_id,
- uint32 session_id,
- MediaKeys::KeyError error_code,
- uint32 system_code) = 0;
};
} // namespace media
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc
index 0d6c514..4889851 100644
--- a/media/base/android/media_source_player_unittest.cc
+++ b/media/base/android/media_source_player_unittest.cc
@@ -74,21 +74,7 @@ class MockMediaPlayerManager : public MediaPlayerManager {
virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; }
virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; }
virtual void DestroyAllMediaPlayers() OVERRIDE {}
- virtual BrowserCdm* GetCdm(int cdm_id) OVERRIDE { return NULL; }
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 {}
- 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,
- MediaKeys::KeyError error_code,
- uint32 system_code) OVERRIDE {}
bool playback_completed() const {
return playback_completed_;