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 <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/macros.h" |
14 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
15 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
16 #include "base/synchronization/lock.h" | 17 #include "base/synchronization/lock.h" |
17 #include "media/cdm/aes_decryptor.h" | 18 #include "media/cdm/aes_decryptor.h" |
18 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" | 19 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" |
19 | 20 |
20 // Enable this to use the fake decoder for testing. | 21 // Enable this to use the fake decoder for testing. |
21 // TODO(tomfinegan): Move fake audio decoder into a separate class. | 22 // TODO(tomfinegan): Move fake audio decoder into a separate class. |
22 #if 0 | 23 #if 0 |
23 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER | 24 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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_ |
OLD | NEW |