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

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

Issue 959503002: BrowserCdmManager: Do not pass MIME types as init_data_type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add USE_PROPRIETARY_CODECS guards to fix Android GN build (see crbug.com/461901). Created 5 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 content decryption module (CDM) implementation. 5 // IPC messages for content decryption module (CDM) implementation.
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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/common/media/cdm_messages_enums.h" 13 #include "content/common/media/cdm_messages_enums.h"
14 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
15 #include "media/base/cdm_key_information.h" 15 #include "media/base/cdm_key_information.h"
16 #include "media/base/media_keys.h" 16 #include "media/base/media_keys.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 #undef IPC_MESSAGE_EXPORT 19 #undef IPC_MESSAGE_EXPORT
20 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT 20 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
21 #define IPC_MESSAGE_START CdmMsgStart 21 #define IPC_MESSAGE_START CdmMsgStart
22 22
23 IPC_ENUM_TRAITS_MAX_VALUE(media::CdmKeyInformation::KeyStatus, 23 IPC_ENUM_TRAITS_MAX_VALUE(media::CdmKeyInformation::KeyStatus,
24 media::CdmKeyInformation::KEY_STATUS_MAX) 24 media::CdmKeyInformation::KEY_STATUS_MAX)
25 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::Exception, 25 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::Exception,
26 media::MediaKeys::EXCEPTION_MAX) 26 media::MediaKeys::EXCEPTION_MAX)
27 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType, 27 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType,
28 media::MediaKeys::MESSAGE_TYPE_MAX) 28 media::MediaKeys::MESSAGE_TYPE_MAX)
29 IPC_ENUM_TRAITS_MAX_VALUE(CdmHostMsg_CreateSession_InitDataType, 29 IPC_ENUM_TRAITS_MAX_VALUE(CdmHostMsg_CreateSession_InitDataType,
30 CREATE_SESSION_TYPE_LAST) 30 INIT_DATA_TYPE_MAX)
31 31
32 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation) 32 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
33 IPC_STRUCT_TRAITS_MEMBER(key_id) 33 IPC_STRUCT_TRAITS_MEMBER(key_id)
34 IPC_STRUCT_TRAITS_MEMBER(status) 34 IPC_STRUCT_TRAITS_MEMBER(status)
35 IPC_STRUCT_TRAITS_MEMBER(system_code) 35 IPC_STRUCT_TRAITS_MEMBER(system_code)
36 IPC_STRUCT_TRAITS_END() 36 IPC_STRUCT_TRAITS_END()
37 37
38 // Messages from render to browser. 38 // Messages from render to browser.
39 39
40 IPC_MESSAGE_CONTROL4(CdmHostMsg_InitializeCdm, 40 IPC_MESSAGE_CONTROL4(CdmHostMsg_InitializeCdm,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 int /* cdm_id */, 112 int /* cdm_id */,
113 uint32_t /* promise_id */, 113 uint32_t /* promise_id */,
114 std::string /* session_id */) 114 std::string /* session_id */)
115 115
116 IPC_MESSAGE_ROUTED5(CdmMsg_RejectPromise, 116 IPC_MESSAGE_ROUTED5(CdmMsg_RejectPromise,
117 int /* cdm_id */, 117 int /* cdm_id */,
118 uint32_t /* promise_id */, 118 uint32_t /* promise_id */,
119 media::MediaKeys::Exception /* exception */, 119 media::MediaKeys::Exception /* exception */,
120 uint32_t /* system_code */, 120 uint32_t /* system_code */,
121 std::string /* error_message */) 121 std::string /* error_message */)
OLDNEW
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.cc ('k') | content/common/media/cdm_messages_enums.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698