| 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_CRYPTO_AES_DECRYPTOR_H_ | 5 #ifndef MEDIA_CRYPTO_AES_DECRYPTOR_H_ |
| 6 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_ | 6 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/containers/scoped_ptr_hash_map.h" | 12 #include "base/containers/scoped_ptr_hash_map.h" |
| 13 #include "base/macros.h" |
| 13 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/synchronization/lock.h" | 16 #include "base/synchronization/lock.h" |
| 16 #include "media/base/cdm_context.h" | 17 #include "media/base/cdm_context.h" |
| 17 #include "media/base/decryptor.h" | 18 #include "media/base/decryptor.h" |
| 18 #include "media/base/media_export.h" | 19 #include "media/base/media_export.h" |
| 19 #include "media/base/media_keys.h" | 20 #include "media/base/media_keys.h" |
| 20 | 21 |
| 21 class GURL; | 22 class GURL; |
| 22 | 23 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the | 157 // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the |
| 157 // main thread but called on the media thread. | 158 // main thread but called on the media thread. |
| 158 mutable base::Lock new_key_cb_lock_; | 159 mutable base::Lock new_key_cb_lock_; |
| 159 | 160 |
| 160 DISALLOW_COPY_AND_ASSIGN(AesDecryptor); | 161 DISALLOW_COPY_AND_ASSIGN(AesDecryptor); |
| 161 }; | 162 }; |
| 162 | 163 |
| 163 } // namespace media | 164 } // namespace media |
| 164 | 165 |
| 165 #endif // MEDIA_CRYPTO_AES_DECRYPTOR_H_ | 166 #endif // MEDIA_CRYPTO_AES_DECRYPTOR_H_ |
| OLD | NEW |