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

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

Issue 17022008: Pass InitializeCDM() call through IPC to the browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 7 years, 6 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 9
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 #if defined(GOOGLE_TV) 207 #if defined(GOOGLE_TV)
208 // Notify the player about the external surface, requesting it if necessary. 208 // Notify the player about the external surface, requesting it if necessary.
209 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface, 209 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
210 int /* player_id */, 210 int /* player_id */,
211 bool /* is_request */, 211 bool /* is_request */,
212 gfx::RectF /* rect */) 212 gfx::RectF /* rect */)
213 213
214 #endif 214 #endif
215 215
216 // Messages for encrypted media extensions API ------------------------------ 216 // Messages for encrypted media extensions API ------------------------------
217 // TODO(xhwang): Move the following messages to a separate file.
217 218
218 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_GenerateKeyRequest, 219 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_InitializeCDM,
219 int /* player_id */, 220 int /* media_keys_id */,
221 std::vector<uint8> /* uuid */)
222
223 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_GenerateKeyRequest,
224 int /* media_keys_id */,
220 std::string /* type */, 225 std::string /* type */,
221 std::vector<uint8> /* init_data */) 226 std::vector<uint8> /* init_data */)
222 227
223 IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey, 228 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey,
224 int /* player_id */, 229 int /* media_keys_id */,
225 std::vector<uint8> /* key */, 230 std::vector<uint8> /* key */,
226 std::vector<uint8> /* init_data */, 231 std::vector<uint8> /* init_data */,
227 std::string /* session_id */) 232 std::string /* session_id */)
228 233
229 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest, 234 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest,
230 int /* player_id */, 235 int /* media_keys_id */,
231 std::string /* session_id */) 236 std::string /* session_id */)
232 237
233 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded, 238 IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded,
234 int /* player_id */, 239 int /* media_keys_id */,
235 std::string /* session_id */) 240 std::string /* session_id */)
236 241
237 IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError, 242 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError,
238 int /* player_id */, 243 int /* media_keys_id */,
239 std::string /* session_id */, 244 std::string /* session_id */,
240 media::MediaKeys::KeyError /* error_code */, 245 media::MediaKeys::KeyError /* error_code */,
241 int /* system_code */) 246 int /* system_code */)
242 247
243 IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage, 248 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
244 int /* player_id */, 249 int /* media_keys_id */,
245 std::string /* session_id */, 250 std::string /* session_id */,
246 std::string /* message */, 251 std::string /* message */,
247 std::string /* destination_url */) 252 std::string /* destination_url */)
248
249 // NeedKey is fired and handled in the renderer. Hence no message is needed.
OLDNEW
« no previous file with comments | « content/browser/android/media_player_manager_impl.cc ('k') | content/renderer/media/webmediaplayer_proxy_impl_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698