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_AES_DECRYPTOR_H_ | 5 #ifndef MEDIA_CDM_AES_DECRYPTOR_H_ |
6 #define MEDIA_CDM_AES_DECRYPTOR_H_ | 6 #define MEDIA_CDM_AES_DECRYPTOR_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
11 #include <set> | 11 #include <set> |
12 #include <string> | 12 #include <string> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/containers/scoped_ptr_hash_map.h" | 15 #include "base/containers/scoped_ptr_hash_map.h" |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
18 #include "base/synchronization/lock.h" | 18 #include "base/synchronization/lock.h" |
19 #include "media/base/cdm_context.h" | 19 #include "media/base/cdm_context.h" |
20 #include "media/base/cdm_promise.h" | |
xhwang
2016/10/24 17:06:14
It seems you only need this in the .cc file.
| |
20 #include "media/base/decryptor.h" | 21 #include "media/base/decryptor.h" |
21 #include "media/base/media_export.h" | 22 #include "media/base/media_export.h" |
22 #include "media/base/media_keys.h" | 23 #include "media/base/media_keys.h" |
23 | 24 |
24 class GURL; | 25 class GURL; |
25 | 26 |
26 namespace crypto { | 27 namespace crypto { |
27 class SymmetricKey; | 28 class SymmetricKey; |
28 } | 29 } |
29 | 30 |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
159 // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the | 160 // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the |
160 // main thread but called on the media thread. | 161 // main thread but called on the media thread. |
161 mutable base::Lock new_key_cb_lock_; | 162 mutable base::Lock new_key_cb_lock_; |
162 | 163 |
163 DISALLOW_COPY_AND_ASSIGN(AesDecryptor); | 164 DISALLOW_COPY_AND_ASSIGN(AesDecryptor); |
164 }; | 165 }; |
165 | 166 |
166 } // namespace media | 167 } // namespace media |
167 | 168 |
168 #endif // MEDIA_CDM_AES_DECRYPTOR_H_ | 169 #endif // MEDIA_CDM_AES_DECRYPTOR_H_ |
OLD | NEW |