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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1132773003: Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 11 matching lines...) Expand all
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 INIT_DATA_TYPE_MAX) 30 INIT_DATA_TYPE_MAX)
31 31
32 IPC_STRUCT_BEGIN(CdmHostMsg_InitializeCdm_Params)
33 IPC_STRUCT_MEMBER(std::string, key_system)
34 IPC_STRUCT_MEMBER(GURL, security_origin)
35 IPC_STRUCT_MEMBER(bool, use_hw_secure_codecs)
36 IPC_STRUCT_END()
37
38 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation) 32 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
39 IPC_STRUCT_TRAITS_MEMBER(key_id) 33 IPC_STRUCT_TRAITS_MEMBER(key_id)
40 IPC_STRUCT_TRAITS_MEMBER(status) 34 IPC_STRUCT_TRAITS_MEMBER(status)
41 IPC_STRUCT_TRAITS_MEMBER(system_code) 35 IPC_STRUCT_TRAITS_MEMBER(system_code)
42 IPC_STRUCT_TRAITS_END() 36 IPC_STRUCT_TRAITS_END()
43 37
44 // Messages from render to browser. 38 // Messages from render to browser.
45 39
46 IPC_MESSAGE_CONTROL4(CdmHostMsg_InitializeCdm, 40 IPC_MESSAGE_CONTROL5(CdmHostMsg_InitializeCdm,
47 int /* render_frame_id */, 41 int /* render_frame_id */,
48 int /* cdm_id */, 42 int /* cdm_id */,
49 uint32_t /* promise_id */, 43 uint32_t /* promise_id */,
50 CdmHostMsg_InitializeCdm_Params /* params */) 44 std::string /* key_system */,
45 GURL /* security_origin */)
51 46
52 IPC_MESSAGE_CONTROL4(CdmHostMsg_SetServerCertificate, 47 IPC_MESSAGE_CONTROL4(CdmHostMsg_SetServerCertificate,
53 int /* render_frame_id */, 48 int /* render_frame_id */,
54 int /* cdm_id */, 49 int /* cdm_id */,
55 uint32_t /* promise_id */, 50 uint32_t /* promise_id */,
56 std::vector<uint8_t> /* certificate */) 51 std::vector<uint8_t> /* certificate */)
57 52
58 IPC_MESSAGE_CONTROL5(CdmHostMsg_CreateSessionAndGenerateRequest, 53 IPC_MESSAGE_CONTROL5(CdmHostMsg_CreateSessionAndGenerateRequest,
59 int /* render_frame_id */, 54 int /* render_frame_id */,
60 int /* cdm_id */, 55 int /* cdm_id */,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 int /* cdm_id */, 113 int /* cdm_id */,
119 uint32_t /* promise_id */, 114 uint32_t /* promise_id */,
120 std::string /* session_id */) 115 std::string /* session_id */)
121 116
122 IPC_MESSAGE_ROUTED5(CdmMsg_RejectPromise, 117 IPC_MESSAGE_ROUTED5(CdmMsg_RejectPromise,
123 int /* cdm_id */, 118 int /* cdm_id */,
124 uint32_t /* promise_id */, 119 uint32_t /* promise_id */,
125 media::MediaKeys::Exception /* exception */, 120 media::MediaKeys::Exception /* exception */,
126 uint32_t /* system_code */, 121 uint32_t /* system_code */,
127 std::string /* error_message */) 122 std::string /* error_message */)
OLDNEW
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698