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

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

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 1 month 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 | « media/cdm/player_tracker_impl.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('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 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER 138 #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
139 139
140 void StartFileIOTest(); 140 void StartFileIOTest();
141 141
142 // Callback for CDM File IO test. 142 // Callback for CDM File IO test.
143 void OnFileIOTestComplete(bool success); 143 void OnFileIOTestComplete(bool success);
144 144
145 // Keep track of the last session created. 145 // Keep track of the last session created.
146 void SetSessionId(const std::string& session_id); 146 void SetSessionId(const std::string& session_id);
147 147
148 AesDecryptor decryptor_; 148 scoped_refptr<AesDecryptor> decryptor_;
149 149
150 ClearKeyCdmHost* host_; 150 ClearKeyCdmHost* host_;
151 151
152 const std::string key_system_; 152 const std::string key_system_;
153 153
154 std::string last_session_id_; 154 std::string last_session_id_;
155 std::string next_renewal_message_; 155 std::string next_renewal_message_;
156 156
157 // In order to simulate LoadSession(), CreateSession() and then 157 // In order to simulate LoadSession(), CreateSession() and then
158 // UpdateSession() will be called to create a session with known keys. 158 // UpdateSession() will be called to create a session with known keys.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 scoped_ptr<CdmVideoDecoder> video_decoder_; 205 scoped_ptr<CdmVideoDecoder> video_decoder_;
206 206
207 scoped_ptr<FileIOTestRunner> file_io_test_runner_; 207 scoped_ptr<FileIOTestRunner> file_io_test_runner_;
208 208
209 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); 209 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
210 }; 210 };
211 211
212 } // namespace media 212 } // namespace media
213 213
214 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 214 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
OLDNEW
« no previous file with comments | « media/cdm/player_tracker_impl.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698