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

Side by Side Diff: content/renderer/media/crypto/renderer_cdm_manager.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
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 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 20 matching lines...) Expand all
31 ~RendererCdmManager() override; 31 ~RendererCdmManager() override;
32 32
33 // RenderFrameObserver overrides. 33 // RenderFrameObserver overrides.
34 bool OnMessageReceived(const IPC::Message& msg) override; 34 bool OnMessageReceived(const IPC::Message& msg) override;
35 35
36 // Encrypted media related methods. 36 // Encrypted media related methods.
37 void InitializeCdm(int cdm_id, 37 void InitializeCdm(int cdm_id,
38 uint32_t promise_id, 38 uint32_t promise_id,
39 ProxyMediaKeys* media_keys, 39 ProxyMediaKeys* media_keys,
40 const std::string& key_system, 40 const std::string& key_system,
41 const GURL& security_origin, 41 const GURL& security_origin);
42 bool use_hw_secure_codecs);
43 void SetServerCertificate(int cdm_id, 42 void SetServerCertificate(int cdm_id,
44 uint32_t promise_id, 43 uint32_t promise_id,
45 const std::vector<uint8>& certificate); 44 const std::vector<uint8>& certificate);
46 void CreateSessionAndGenerateRequest( 45 void CreateSessionAndGenerateRequest(
47 int cdm_id, 46 int cdm_id,
48 uint32_t promise_id, 47 uint32_t promise_id,
49 CdmHostMsg_CreateSession_InitDataType init_data_type, 48 CdmHostMsg_CreateSession_InitDataType init_data_type,
50 const std::vector<uint8>& init_data); 49 const std::vector<uint8>& init_data);
51 void UpdateSession(int cdm_id, 50 void UpdateSession(int cdm_id,
52 uint32_t promise_id, 51 uint32_t promise_id,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 103
105 // CDM ID to ProxyMediaKeys mapping. 104 // CDM ID to ProxyMediaKeys mapping.
106 std::map<int, ProxyMediaKeys*> proxy_media_keys_map_; 105 std::map<int, ProxyMediaKeys*> proxy_media_keys_map_;
107 106
108 DISALLOW_COPY_AND_ASSIGN(RendererCdmManager); 107 DISALLOW_COPY_AND_ASSIGN(RendererCdmManager);
109 }; 108 };
110 109
111 } // namespace content 110 } // namespace content
112 111
113 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_ 112 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/render_cdm_factory.cc ('k') | content/renderer/media/crypto/renderer_cdm_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698