OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "media/base/android/media_drm_bridge.h" | 5 #include "media/base/android/media_drm_bridge.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/single_thread_task_runner.h" | 21 #include "base/single_thread_task_runner.h" |
22 #include "base/strings/string_number_conversions.h" | 22 #include "base/strings/string_number_conversions.h" |
23 #include "base/strings/string_util.h" | 23 #include "base/strings/string_util.h" |
24 #include "base/sys_byteorder.h" | 24 #include "base/sys_byteorder.h" |
25 #include "base/sys_info.h" | 25 #include "base/sys_info.h" |
26 #include "base/threading/thread_task_runner_handle.h" | 26 #include "base/threading/thread_task_runner_handle.h" |
27 #include "jni/MediaDrmBridge_jni.h" | 27 #include "jni/MediaDrmBridge_jni.h" |
28 #include "media/base/android/media_client_android.h" | 28 #include "media/base/android/media_client_android.h" |
29 #include "media/base/android/media_codec_util.h" | 29 #include "media/base/android/media_codec_util.h" |
30 #include "media/base/android/media_drm_bridge_delegate.h" | 30 #include "media/base/android/media_drm_bridge_delegate.h" |
31 #include "media/base/android/provision_fetcher.h" | |
32 #include "media/base/cdm_key_information.h" | 31 #include "media/base/cdm_key_information.h" |
| 32 #include "media/base/provision_fetcher.h" |
33 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 33 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
34 | 34 |
35 using base::android::AttachCurrentThread; | 35 using base::android::AttachCurrentThread; |
36 using base::android::ConvertUTF8ToJavaString; | 36 using base::android::ConvertUTF8ToJavaString; |
37 using base::android::ConvertJavaStringToUTF8; | 37 using base::android::ConvertJavaStringToUTF8; |
38 using base::android::JavaByteArrayToByteVector; | 38 using base::android::JavaByteArrayToByteVector; |
39 using base::android::JavaParamRef; | 39 using base::android::JavaParamRef; |
40 using base::android::ScopedJavaGlobalRef; | 40 using base::android::ScopedJavaGlobalRef; |
41 using base::android::ScopedJavaLocalRef; | 41 using base::android::ScopedJavaLocalRef; |
42 | 42 |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
871 } | 871 } |
872 | 872 |
873 void MediaDrmBridge::OnHasAdditionalUsableKey() { | 873 void MediaDrmBridge::OnHasAdditionalUsableKey() { |
874 DCHECK(task_runner_->BelongsToCurrentThread()); | 874 DCHECK(task_runner_->BelongsToCurrentThread()); |
875 DVLOG(1) << __FUNCTION__; | 875 DVLOG(1) << __FUNCTION__; |
876 | 876 |
877 player_tracker_.NotifyNewKey(); | 877 player_tracker_.NotifyNewKey(); |
878 } | 878 } |
879 | 879 |
880 } // namespace media | 880 } // namespace media |
OLD | NEW |