| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_BASE_ANDROID_MEDIA_DRM_BRIDGE_CDM_CONTEXT_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_CDM_CONTEXT_H_ |
| 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_CDM_CONTEXT_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_CDM_CONTEXT_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" |
| 13 #include "media/base/cdm_context.h" | 14 #include "media/base/cdm_context.h" |
| 14 #include "media/base/media_export.h" | 15 #include "media/base/media_export.h" |
| 15 #include "media/base/player_tracker.h" | 16 #include "media/base/player_tracker.h" |
| 16 | 17 |
| 17 namespace media { | 18 namespace media { |
| 18 | 19 |
| 19 class MediaDrmBridge; | 20 class MediaDrmBridge; |
| 20 | 21 |
| 21 // The CdmContext implementation for MediaDrmBridge. MediaDrmBridge supports | 22 // The CdmContext implementation for MediaDrmBridge. MediaDrmBridge supports |
| 22 // neither Decryptor nor CDM ID, but uses MediaCrypto to connect to MediaCodec. | 23 // neither Decryptor nor CDM ID, but uses MediaCrypto to connect to MediaCodec. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 | 65 |
| 65 private: | 66 private: |
| 66 MediaDrmBridge* const media_drm_bridge_; | 67 MediaDrmBridge* const media_drm_bridge_; |
| 67 | 68 |
| 68 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridgeCdmContext); | 69 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridgeCdmContext); |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 } // namespace media | 72 } // namespace media |
| 72 | 73 |
| 73 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_CDM_CONTEXT_H_ | 74 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_CDM_CONTEXT_H_ |
| OLD | NEW |