summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-05 05:52:59 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-05 05:52:59 +0000
commit9680cdc110ca880595a88c2498293f4febb3348d (patch)
treedc67cf6a4d92360162137e92122b2589c6e48f5d /media
parente76d1454ed9a28d8f07d4c4c43d4edfc09766f94 (diff)
downloadchromium_src-9680cdc110ca880595a88c2498293f4febb3348d.zip
chromium_src-9680cdc110ca880595a88c2498293f4febb3348d.tar.gz
chromium_src-9680cdc110ca880595a88c2498293f4febb3348d.tar.bz2
Add IPC messages and handling code for EME on Clank.
BUG=233420 TEST=Enabled MSE/EME and tested on the WebM EME demo page (http://downloads.webmproject.org/adaptive-encrypted-demo/adaptive/dash-player.html). NeedKey is fired to the app and GenerateKeyRequest is passed to the browser process. Review URL: https://chromiumcodereview.appspot.com/16272005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/android/media_player_manager.h26
1 files changed, 25 insertions, 1 deletions
diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h
index 34c049e..b86ea0d 100644
--- a/media/base/android/media_player_manager.h
+++ b/media/base/android/media_player_manager.h
@@ -6,8 +6,9 @@
#define MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
#include "base/time.h"
-#include "media/base/media_export.h"
#include "media/base/android/demuxer_stream_player_params.h"
+#include "media/base/media_export.h"
+#include "media/base/media_keys.h"
namespace content {
class RenderViewHost;
@@ -102,6 +103,29 @@ class MEDIA_EXPORT MediaPlayerManager {
virtual void OnMediaSeekRequest(int player_id,
base::TimeDelta time_to_seek,
bool request_surface) = 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 the player wants to send a KeyAdded.
+ virtual void OnKeyAdded(int player_id,
+ const std::string& key_system,
+ const std::string& session_id) = 0;
+
+ // Called when the player wants to send a KeyError.
+ virtual void OnKeyError(int player_id,
+ const std::string& key_system,
+ const std::string& session_id,
+ media::MediaKeys::KeyError error_code,
+ int system_code) = 0;
+
+ // Called when the player wants to send a KeyMessage.
+ virtual void OnKeyMessage(int player_id,
+ const std::string& key_system,
+ const std::string& session_id,
+ const std::string& message,
+ const std::string& destination_url) = 0;
};
} // namespace media