Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Side by Side Diff: content/common/media/media_player_messages_android.h

Issue 181483005: Rename MediaKeys*Msg to Cdm*Msg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git cl format Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // IPC messages for android media player. 5 // IPC messages for android media player.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 IPC_STRUCT_TRAITS_MEMBER(iv) 58 IPC_STRUCT_TRAITS_MEMBER(iv)
59 IPC_STRUCT_TRAITS_MEMBER(subsamples) 59 IPC_STRUCT_TRAITS_MEMBER(subsamples)
60 IPC_STRUCT_TRAITS_END() 60 IPC_STRUCT_TRAITS_END()
61 61
62 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) 62 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
63 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) 63 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
64 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) 64 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
65 IPC_STRUCT_TRAITS_END() 65 IPC_STRUCT_TRAITS_END()
66 66
67 IPC_ENUM_TRAITS(MediaPlayerHostMsg_Initialize_Type) 67 IPC_ENUM_TRAITS(MediaPlayerHostMsg_Initialize_Type)
68 IPC_ENUM_TRAITS(MediaKeysHostMsg_CreateSession_Type)
69 68
70 // Chrome for Android seek message sequence is: 69 // Chrome for Android seek message sequence is:
71 // 1. Renderer->Browser MediaPlayerHostMsg_Seek 70 // 1. Renderer->Browser MediaPlayerHostMsg_Seek
72 // This is the beginning of actual seek flow in response to web app requests 71 // This is the beginning of actual seek flow in response to web app requests
73 // for seeks and browser MediaPlayerMsg_SeekRequests. With this message, 72 // for seeks and browser MediaPlayerMsg_SeekRequests. With this message,
74 // the renderer asks browser to perform actual seek. At most one of these 73 // the renderer asks browser to perform actual seek. At most one of these
75 // actual seeks will be in process between this message and renderer's later 74 // actual seeks will be in process between this message and renderer's later
76 // receipt of MediaPlayerMsg_SeekCompleted from the browser. 75 // receipt of MediaPlayerMsg_SeekCompleted from the browser.
77 // 2. Browser->Renderer MediaPlayerMsg_SeekCompleted 76 // 2. Browser->Renderer MediaPlayerMsg_SeekCompleted
78 // Once the browser determines the seek is complete, it sends this message to 77 // Once the browser determines the seek is complete, it sends this message to
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 // |is_request| true if the player is requesting the external surface. 277 // |is_request| true if the player is requesting the external surface.
279 // |rect| the boundary rectangle of the video element. 278 // |rect| the boundary rectangle of the video element.
280 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface, 279 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
281 int /* player_id */, 280 int /* player_id */,
282 bool /* is_request */, 281 bool /* is_request */,
283 gfx::RectF /* rect */) 282 gfx::RectF /* rect */)
284 #endif // defined(VIDEO_HOLE) 283 #endif // defined(VIDEO_HOLE)
285 284
286 // Messages for encrypted media extensions API ------------------------------ 285 // Messages for encrypted media extensions API ------------------------------
287 // TODO(xhwang): Move the following messages to a separate file. 286 // TODO(xhwang): Move the following messages to a separate file.
287 #undef IPC_MESSAGE_START
288 #define IPC_MESSAGE_START CdmMsgStart
288 289
289 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM, 290 IPC_ENUM_TRAITS(CdmHostMsg_CreateSession_Type)
291
292 IPC_MESSAGE_ROUTED3(CdmHostMsg_InitializeCDM,
290 int /* media_keys_id */, 293 int /* media_keys_id */,
291 std::vector<uint8> /* uuid */, 294 std::vector<uint8> /* uuid */,
292 GURL /* frame url */) 295 GURL /* frame url */)
293 296
294 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession, 297 IPC_MESSAGE_ROUTED4(CdmHostMsg_CreateSession,
295 int /* media_keys_id */, 298 int /* media_keys_id */,
296 uint32_t /* session_id */, 299 uint32_t /* session_id */,
297 MediaKeysHostMsg_CreateSession_Type /* type */, 300 CdmHostMsg_CreateSession_Type /* type */,
298 std::vector<uint8> /* init_data */) 301 std::vector<uint8> /* init_data */)
299 302
300 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession, 303 IPC_MESSAGE_ROUTED3(CdmHostMsg_UpdateSession,
301 int /* media_keys_id */, 304 int /* media_keys_id */,
302 uint32_t /* session_id */, 305 uint32_t /* session_id */,
303 std::vector<uint8> /* response */) 306 std::vector<uint8> /* response */)
304 307
305 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession, 308 IPC_MESSAGE_ROUTED2(CdmHostMsg_ReleaseSession,
306 int /* media_keys_id */, 309 int /* media_keys_id */,
307 uint32_t /* session_id */) 310 uint32_t /* session_id */)
308 311
309 IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_CancelAllPendingSessionCreations, 312 IPC_MESSAGE_ROUTED1(CdmHostMsg_CancelAllPendingSessionCreations,
310 int /* media_keys_id */) 313 int /* media_keys_id */)
311 314
312 IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated, 315 IPC_MESSAGE_ROUTED3(CdmMsg_SessionCreated,
313 int /* media_keys_id */, 316 int /* media_keys_id */,
314 uint32_t /* session_id */, 317 uint32_t /* session_id */,
315 std::string /* web_session_id */) 318 std::string /* web_session_id */)
316 319
317 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage, 320 IPC_MESSAGE_ROUTED4(CdmMsg_SessionMessage,
318 int /* media_keys_id */, 321 int /* media_keys_id */,
319 uint32_t /* session_id */, 322 uint32_t /* session_id */,
320 std::vector<uint8> /* message */, 323 std::vector<uint8> /* message */,
321 GURL /* destination_url */) 324 GURL /* destination_url */)
322 325
323 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady, 326 IPC_MESSAGE_ROUTED2(CdmMsg_SessionReady,
324 int /* media_keys_id */, 327 int /* media_keys_id */,
325 uint32_t /* session_id */) 328 uint32_t /* session_id */)
326 329
327 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed, 330 IPC_MESSAGE_ROUTED2(CdmMsg_SessionClosed,
328 int /* media_keys_id */, 331 int /* media_keys_id */,
329 uint32_t /* session_id */) 332 uint32_t /* session_id */)
330 333
331 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError, 334 IPC_MESSAGE_ROUTED4(CdmMsg_SessionError,
332 int /* media_keys_id */, 335 int /* media_keys_id */,
333 uint32_t /* session_id */, 336 uint32_t /* session_id */,
334 media::MediaKeys::KeyError /* error_code */, 337 media::MediaKeys::KeyError /* error_code */,
335 int /* system_code */) 338 int /* system_code */)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698