OLD | NEW |
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 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/synchronization/lock.h" | 15 #include "base/synchronization/lock.h" |
| 16 #include "media/base/cdm_promise.h" |
16 #include "media/cdm/aes_decryptor.h" | 17 #include "media/cdm/aes_decryptor.h" |
17 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" | 18 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" |
18 | 19 |
19 // Enable this to use the fake decoder for testing. | 20 // Enable this to use the fake decoder for testing. |
20 // TODO(tomfinegan): Move fake audio decoder into a separate class. | 21 // TODO(tomfinegan): Move fake audio decoder into a separate class. |
21 #if 0 | 22 #if 0 |
22 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER | 23 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER |
23 #endif | 24 #endif |
24 | 25 |
25 namespace media { | 26 namespace media { |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 scoped_ptr<CdmVideoDecoder> video_decoder_; | 190 scoped_ptr<CdmVideoDecoder> video_decoder_; |
190 | 191 |
191 scoped_ptr<FileIOTestRunner> file_io_test_runner_; | 192 scoped_ptr<FileIOTestRunner> file_io_test_runner_; |
192 | 193 |
193 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); | 194 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); |
194 }; | 195 }; |
195 | 196 |
196 } // namespace media | 197 } // namespace media |
197 | 198 |
198 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ | 199 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ |
OLD | NEW |