summaryrefslogtreecommitdiff
path: root/chromium/media/base/android/media_player_manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/android/media_player_manager.h')
-rw-r--r--chromium/media/base/android/media_player_manager.h50
1 files changed, 30 insertions, 20 deletions
diff --git a/chromium/media/base/android/media_player_manager.h b/chromium/media/base/android/media_player_manager.h
index 4ecac22518b..c215df59f4b 100644
--- a/chromium/media/base/android/media_player_manager.h
+++ b/chromium/media/base/android/media_player_manager.h
@@ -62,7 +62,9 @@ class MEDIA_EXPORT MediaPlayerManager {
virtual void OnBufferingUpdate(int player_id, int percentage) = 0;
// Called when seek completed. Args: player ID, current time.
- virtual void OnSeekComplete(int player_id, base::TimeDelta current_time) = 0;
+ virtual void OnSeekComplete(
+ int player_id,
+ const base::TimeDelta& current_time) = 0;
// Called when error happens. Args: player ID, error type.
virtual void OnError(int player_id, int error) = 0;
@@ -85,25 +87,33 @@ class MEDIA_EXPORT MediaPlayerManager {
// Called by the player to get a hardware protected surface.
virtual void OnProtectedSurfaceRequested(int player_id) = 0;
- // TODO(xhwang): The following three methods needs to be decoupled from
- // MediaPlayerManager to support the W3C Working Draft version of the EME
- // spec.
-
- // Called when MediaDrmBridge wants to send a KeyAdded.
- virtual void OnKeyAdded(int media_keys_id,
- const std::string& session_id) = 0;
-
- // Called when MediaDrmBridge wants to send a KeyError.
- virtual void OnKeyError(int media_keys_id,
- const std::string& session_id,
- media::MediaKeys::KeyError error_code,
- int system_code) = 0;
-
- // Called when MediaDrmBridge wants to send a KeyMessage.
- virtual void OnKeyMessage(int media_keys_id,
- const std::string& session_id,
- const std::vector<uint8>& message,
- const std::string& destination_url) = 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 MediaDrmBridge determines a SessionId.
+ virtual void OnSessionCreated(int media_keys_id,
+ uint32 session_id,
+ const std::string& web_session_id) = 0;
+
+ // Called when MediaDrmBridge wants to send a Message event.
+ virtual void OnSessionMessage(int media_keys_id,
+ uint32 session_id,
+ const std::vector<uint8>& message,
+ const std::string& destination_url) = 0;
+
+ // Called when MediaDrmBridge wants to send a Ready event.
+ virtual void OnSessionReady(int media_keys_id, uint32 session_id) = 0;
+
+ // Called when MediaDrmBridge wants to send a Closed event.
+ virtual void OnSessionClosed(int media_keys_id, uint32 session_id) = 0;
+
+ // Called when MediaDrmBridge wants to send an Error event.
+ virtual void OnSessionError(int media_keys_id,
+ uint32 session_id,
+ media::MediaKeys::KeyError error_code,
+ int system_code) = 0;
};
} // namespace media