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

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

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 22 matching lines...) Expand all
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();
36 36
37 // ContentDecryptionModule implementation. 37 // ContentDecryptionModule implementation.
38 virtual void CreateSession(uint32 promise_id, 38 virtual void CreateSession(uint32 promise_id,
39 const char* init_data_type, 39 const char* init_data_type,
40 uint32 init_data_type_size, 40 uint32 init_data_type_size,
41 const uint8* init_data, 41 const uint8* init_data,
42 uint32 init_data_size, 42 uint32 init_data_size,
43 cdm::SessionType session_type) OVERRIDE; 43 cdm::SessionType session_type) override;
44 virtual void LoadSession(uint32 promise_id, 44 virtual void LoadSession(uint32 promise_id,
45 const char* web_session_id, 45 const char* web_session_id,
46 uint32_t web_session_id_length) OVERRIDE; 46 uint32_t web_session_id_length) override;
47 virtual void UpdateSession(uint32 promise_id, 47 virtual void UpdateSession(uint32 promise_id,
48 const char* web_session_id, 48 const char* web_session_id,
49 uint32_t web_session_id_length, 49 uint32_t web_session_id_length,
50 const uint8* response, 50 const uint8* response,
51 uint32 response_size) OVERRIDE; 51 uint32 response_size) override;
52 virtual void CloseSession(uint32 promise_id, 52 virtual void CloseSession(uint32 promise_id,
53 const char* web_session_id, 53 const char* web_session_id,
54 uint32_t web_session_id_length) OVERRIDE; 54 uint32_t web_session_id_length) override;
55 virtual void RemoveSession(uint32 promise_id, 55 virtual void RemoveSession(uint32 promise_id,
56 const char* web_session_id, 56 const char* web_session_id,
57 uint32_t web_session_id_length) OVERRIDE; 57 uint32_t web_session_id_length) override;
58 virtual void GetUsableKeyIds(uint32_t promise_id, 58 virtual void GetUsableKeyIds(uint32_t promise_id,
59 const char* web_session_id, 59 const char* web_session_id,
60 uint32_t web_session_id_length) OVERRIDE; 60 uint32_t web_session_id_length) override;
61 virtual void SetServerCertificate( 61 virtual void SetServerCertificate(
62 uint32 promise_id, 62 uint32 promise_id,
63 const uint8_t* server_certificate_data, 63 const uint8_t* server_certificate_data,
64 uint32_t server_certificate_data_size) OVERRIDE; 64 uint32_t server_certificate_data_size) override;
65 virtual void TimerExpired(void* context) OVERRIDE; 65 virtual void TimerExpired(void* context) override;
66 virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer, 66 virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
67 cdm::DecryptedBlock* decrypted_block) OVERRIDE; 67 cdm::DecryptedBlock* decrypted_block) override;
68 virtual cdm::Status InitializeAudioDecoder( 68 virtual cdm::Status InitializeAudioDecoder(
69 const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE; 69 const cdm::AudioDecoderConfig& audio_decoder_config) override;
70 virtual cdm::Status InitializeVideoDecoder( 70 virtual cdm::Status InitializeVideoDecoder(
71 const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE; 71 const cdm::VideoDecoderConfig& video_decoder_config) override;
72 virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE; 72 virtual void DeinitializeDecoder(cdm::StreamType decoder_type) override;
73 virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE; 73 virtual void ResetDecoder(cdm::StreamType decoder_type) override;
74 virtual cdm::Status DecryptAndDecodeFrame( 74 virtual cdm::Status DecryptAndDecodeFrame(
75 const cdm::InputBuffer& encrypted_buffer, 75 const cdm::InputBuffer& encrypted_buffer,
76 cdm::VideoFrame* video_frame) OVERRIDE; 76 cdm::VideoFrame* video_frame) override;
77 virtual cdm::Status DecryptAndDecodeSamples( 77 virtual cdm::Status DecryptAndDecodeSamples(
78 const cdm::InputBuffer& encrypted_buffer, 78 const cdm::InputBuffer& encrypted_buffer,
79 cdm::AudioFrames* audio_frames) OVERRIDE; 79 cdm::AudioFrames* audio_frames) override;
80 virtual void Destroy() OVERRIDE; 80 virtual void Destroy() override;
81 virtual void OnPlatformChallengeResponse( 81 virtual void OnPlatformChallengeResponse(
82 const cdm::PlatformChallengeResponse& response) OVERRIDE; 82 const cdm::PlatformChallengeResponse& response) override;
83 virtual void OnQueryOutputProtectionStatus( 83 virtual void OnQueryOutputProtectionStatus(
84 uint32_t link_mask, uint32_t output_protection_mask) OVERRIDE; 84 uint32_t link_mask, uint32_t output_protection_mask) override;
85 85
86 private: 86 private:
87 // Emulates a session stored for |session_id_for_emulated_loadsession_|. This 87 // Emulates a session stored for |session_id_for_emulated_loadsession_|. This
88 // is necessary since aes_decryptor.cc does not support storing sessions. 88 // is necessary since aes_decryptor.cc does not support storing sessions.
89 void LoadLoadableSession(); 89 void LoadLoadableSession();
90 90
91 // ContentDecryptionModule callbacks. 91 // ContentDecryptionModule callbacks.
92 void OnSessionMessage(const std::string& web_session_id, 92 void OnSessionMessage(const std::string& web_session_id,
93 const std::vector<uint8>& message, 93 const std::vector<uint8>& message,
94 const GURL& destination_url); 94 const GURL& destination_url);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 scoped_ptr<CdmVideoDecoder> video_decoder_; 191 scoped_ptr<CdmVideoDecoder> video_decoder_;
192 192
193 scoped_ptr<FileIOTestRunner> file_io_test_runner_; 193 scoped_ptr<FileIOTestRunner> file_io_test_runner_;
194 194
195 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); 195 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
196 }; 196 };
197 197
198 } // namespace media 198 } // namespace media
199 199
200 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 200 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
OLDNEW
« no previous file with comments | « media/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698