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

Side by Side Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 1023333002: Update External Clear Key to support CDM_8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 5 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 namespace media { 25 namespace media {
26 class FileIOTestRunner; 26 class FileIOTestRunner;
27 class CdmVideoDecoder; 27 class CdmVideoDecoder;
28 class DecoderBuffer; 28 class DecoderBuffer;
29 class FFmpegCdmAudioDecoder; 29 class FFmpegCdmAudioDecoder;
30 30
31 // Clear key implementation of the cdm::ContentDecryptionModule interface. 31 // Clear key implementation of the cdm::ContentDecryptionModule interface.
32 class ClearKeyCdm : public ClearKeyCdmInterface { 32 class ClearKeyCdm : public ClearKeyCdmInterface {
33 public: 33 public:
34 ClearKeyCdm(Host* host, const std::string& key_system); 34 ClearKeyCdm(Host* host, const std::string& key_system);
35 virtual ~ClearKeyCdm(); 35 virtual ~ClearKeyCdm();
xhwang 2015/03/23 20:35:37 Replace "virtual" with "override".
jrummell 2015/03/23 21:47:07 Done.
36 36
37 // ContentDecryptionModule implementation. 37 // ContentDecryptionModule implementation.
38 virtual void Initialize(bool allow_distinctive_identifier,
39 bool allow_persistent_state) override;
xhwang 2015/03/23 20:35:37 Here and below, with "override", no need to use "v
jrummell 2015/03/23 21:47:07 Done.
38 virtual void CreateSessionAndGenerateRequest(uint32 promise_id, 40 virtual void CreateSessionAndGenerateRequest(uint32 promise_id,
39 cdm::SessionType session_type, 41 cdm::SessionType session_type,
40 const char* init_data_type, 42 cdm::InitDataType init_data_type,
41 uint32 init_data_type_size,
42 const uint8* init_data, 43 const uint8* init_data,
43 uint32 init_data_size) override; 44 uint32 init_data_size) override;
44 virtual void LoadSession(uint32 promise_id, 45 virtual void LoadSession(uint32 promise_id,
45 cdm::SessionType session_type, 46 cdm::SessionType session_type,
46 const char* session_id, 47 const char* session_id,
47 uint32_t session_id_length) override; 48 uint32_t session_id_length) override;
48 virtual void UpdateSession(uint32 promise_id, 49 virtual void UpdateSession(uint32 promise_id,
49 const char* session_id, 50 const char* session_id,
50 uint32_t session_id_length, 51 uint32_t session_id_length,
51 const uint8* response, 52 const uint8* response,
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 scoped_ptr<CdmVideoDecoder> video_decoder_; 207 scoped_ptr<CdmVideoDecoder> video_decoder_;
207 208
208 scoped_ptr<FileIOTestRunner> file_io_test_runner_; 209 scoped_ptr<FileIOTestRunner> file_io_test_runner_;
209 210
210 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); 211 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
211 }; 212 };
212 213
213 } // namespace media 214 } // namespace media
214 215
215 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 216 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698