diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 05:52:59 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 05:52:59 +0000 |
| commit | 9680cdc110ca880595a88c2498293f4febb3348d (patch) | |
| tree | dc67cf6a4d92360162137e92122b2589c6e48f5d /content/common/media | |
| parent | e76d1454ed9a28d8f07d4c4c43d4edfc09766f94 (diff) | |
| download | chromium_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 'content/common/media')
| -rw-r--r-- | content/common/media/media_player_messages_android.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h index b47fcfd..60cf744 100644 --- a/content/common/media/media_player_messages_android.h +++ b/content/common/media/media_player_messages_android.h @@ -12,6 +12,7 @@ #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "media/base/android/media_player_android.h" +#include "media/base/media_keys.h" #include "ui/gfx/rect_f.h" #undef IPC_MESSAGE_EXPORT @@ -23,6 +24,7 @@ IPC_ENUM_TRAITS(media::AudioCodec) IPC_ENUM_TRAITS(media::DemuxerStream::Status) IPC_ENUM_TRAITS(media::DemuxerStream::Type) +IPC_ENUM_TRAITS(media::MediaKeys::KeyError) IPC_ENUM_TRAITS(media::VideoCodec) IPC_STRUCT_TRAITS_BEGIN(media::MediaPlayerHostMsg_DemuxerReady_Params) @@ -200,3 +202,44 @@ IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface, gfx::RectF /* rect */) #endif + +// Messages for encrypted media extensions API ------------------------------ + +IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_GenerateKeyRequest, + int /* player_id */, + std::string /* key_system */, + std::string /* type */, + std::vector<uint8> /* init_data */) + +IPC_MESSAGE_ROUTED5(MediaPlayerHostMsg_AddKey, + int /* player_id */, + std::string /* key_system */, + std::vector<uint8> /* key */, + std::vector<uint8> /* init_data */, + std::string /* session_id */) + +IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_CancelKeyRequest, + int /* player_id */, + std::string /* key_system */, + std::string /* session_id */) + +IPC_MESSAGE_ROUTED3(MediaPlayerMsg_KeyAdded, + int /* player_id */, + std::string /* key_system */, + std::string /* session_id */) + +IPC_MESSAGE_ROUTED5(MediaPlayerMsg_KeyError, + int /* player_id */, + std::string /* key_system */, + std::string /* session_id */, + media::MediaKeys::KeyError /* error_code */, + int /* system_code */) + +IPC_MESSAGE_ROUTED5(MediaPlayerMsg_KeyMessage, + int /* player_id */, + std::string /* key_system */, + std::string /* session_id */, + std::string /* message */, + std::string /* destination_url */) + +// NeedKey is fired and handled in the renderer. Hence no message is needed. |