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 <memory> |
10 #include <string> | 11 #include <string> |
11 #include <vector> | 12 #include <vector> |
12 | 13 |
13 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
14 #include "base/macros.h" | 15 #include "base/macros.h" |
15 #include "base/memory/ref_counted.h" | 16 #include "base/memory/ref_counted.h" |
16 #include "base/memory/scoped_ptr.h" | |
17 #include "base/synchronization/lock.h" | 17 #include "base/synchronization/lock.h" |
18 #include "media/base/cdm_key_information.h" | 18 #include "media/base/cdm_key_information.h" |
19 #include "media/cdm/aes_decryptor.h" | 19 #include "media/cdm/aes_decryptor.h" |
20 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" | 20 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" |
21 | 21 |
22 // Enable this to use the fake decoder for testing. | 22 // Enable this to use the fake decoder for testing. |
23 // TODO(tomfinegan): Move fake audio decoder into a separate class. | 23 // TODO(tomfinegan): Move fake audio decoder into a separate class. |
24 #if 0 | 24 #if 0 |
25 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER | 25 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER |
26 #endif | 26 #endif |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 | 195 |
196 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) | 196 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) |
197 int channel_count_; | 197 int channel_count_; |
198 int bits_per_channel_; | 198 int bits_per_channel_; |
199 int samples_per_second_; | 199 int samples_per_second_; |
200 int64_t output_timestamp_base_in_microseconds_; | 200 int64_t output_timestamp_base_in_microseconds_; |
201 int total_samples_generated_; | 201 int total_samples_generated_; |
202 #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER | 202 #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER |
203 | 203 |
204 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) | 204 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) |
205 scoped_ptr<FFmpegCdmAudioDecoder> audio_decoder_; | 205 std::unique_ptr<FFmpegCdmAudioDecoder> audio_decoder_; |
206 #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER | 206 #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER |
207 | 207 |
208 scoped_ptr<CdmVideoDecoder> video_decoder_; | 208 std::unique_ptr<CdmVideoDecoder> video_decoder_; |
209 | 209 |
210 scoped_ptr<FileIOTestRunner> file_io_test_runner_; | 210 std::unique_ptr<FileIOTestRunner> file_io_test_runner_; |
211 | 211 |
212 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); | 212 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); |
213 }; | 213 }; |
214 | 214 |
215 } // namespace media | 215 } // namespace media |
216 | 216 |
217 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ | 217 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ |
OLD | NEW |