diff options
| author | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 21:03:13 +0000 |
|---|---|---|
| committer | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 21:03:13 +0000 |
| commit | f6ef737cb988d80cf46d9a584c8961b0e00cfe28 (patch) | |
| tree | 78f768c23ab7552c72908e1608397437bb3657a7 /content/common/media | |
| parent | d2382c9fd71b2a029f9499705d3ddb524e2e8e82 (diff) | |
| download | chromium_src-f6ef737cb988d80cf46d9a584c8961b0e00cfe28.zip chromium_src-f6ef737cb988d80cf46d9a584c8961b0e00cfe28.tar.gz chromium_src-f6ef737cb988d80cf46d9a584c8961b0e00cfe28.tar.bz2 | |
Update Android EME IPC
The EME IPC message CreateSession() now uses an enum for session type rather
than passing a string. Also updates SessionMessage() to use a GURL rather than
just passing a string.
BUG=327449,326663
TEST=Able to play encrypted media on Android
Review URL: https://codereview.chromium.org/126633002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/media')
| -rw-r--r-- | content/common/media/media_player_messages_android.h | 7 | ||||
| -rw-r--r-- | content/common/media/media_player_messages_enums_android.h | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h index 145fc0b..4a5fbfc 100644 --- a/content/common/media/media_player_messages_android.h +++ b/content/common/media/media_player_messages_android.h @@ -65,6 +65,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) IPC_STRUCT_TRAITS_END() IPC_ENUM_TRAITS(MediaPlayerHostMsg_Initialize_Type) +IPC_ENUM_TRAITS(MediaKeysHostMsg_CreateSession_Type) // Chrome for Android seek message sequence is: // 1. Renderer->Browser MediaPlayerHostMsg_Seek @@ -286,9 +287,8 @@ IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM, IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession, int /* media_keys_id */, uint32_t /* session_id */, - std::string /* type */, + MediaKeysHostMsg_CreateSession_Type /* type */, std::vector<uint8> /* init_data */) -// TODO(jrummell): Use enum for type (http://crbug.com/327449) IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession, int /* media_keys_id */, @@ -311,8 +311,7 @@ IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage, int /* media_keys_id */, uint32_t /* session_id */, std::vector<uint8> /* message */, - std::string /* destination_url */) -// TODO(jrummell): Use GURL for destination_url (http://crbug.com/326663) + GURL /* destination_url */) IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady, int /* media_keys_id */, diff --git a/content/common/media/media_player_messages_enums_android.h b/content/common/media/media_player_messages_enums_android.h index 97818ff..56625a0 100644 --- a/content/common/media/media_player_messages_enums_android.h +++ b/content/common/media/media_player_messages_enums_android.h @@ -11,4 +11,10 @@ enum MediaPlayerHostMsg_Initialize_Type { MEDIA_PLAYER_TYPE_MEDIA_SOURCE, }; +// Dictates the session type when an EME session is created. +enum MediaKeysHostMsg_CreateSession_Type { + CREATE_SESSION_TYPE_WEBM, + CREATE_SESSION_TYPE_MP4, +}; + #endif // CONTENT_COMMON_MEDIA_MEDIA_PLAYER_MESSAGES_ENUMS_ANDROID_H_ |