| 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 |
| 11 #include "base/android/build_info.h" | 11 #include "base/android/build_info.h" |
| 12 #include "base/android/jni_array.h" | 12 #include "base/android/jni_array.h" |
| 13 #include "base/android/jni_string.h" | 13 #include "base/android/jni_string.h" |
| 14 #include "base/bind.h" | 14 #include "base/bind.h" |
| 15 #include "base/callback_helpers.h" | 15 #include "base/callback_helpers.h" |
| 16 #include "base/containers/hash_tables.h" | 16 #include "base/containers/hash_tables.h" |
| 17 #include "base/lazy_instance.h" | 17 #include "base/lazy_instance.h" |
| 18 #include "base/location.h" | 18 #include "base/location.h" |
| 19 #include "base/logging.h" | 19 #include "base/logging.h" |
| 20 #include "base/macros.h" | 20 #include "base/macros.h" |
| 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/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" | 31 #include "media/base/android/provision_fetcher.h" |
| 32 #include "media/base/cdm_key_information.h" | 32 #include "media/base/cdm_key_information.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; |
| (...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 } | 898 } |
| 899 | 899 |
| 900 void MediaDrmBridge::OnHasAdditionalUsableKey() { | 900 void MediaDrmBridge::OnHasAdditionalUsableKey() { |
| 901 DCHECK(task_runner_->BelongsToCurrentThread()); | 901 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 902 DVLOG(1) << __FUNCTION__; | 902 DVLOG(1) << __FUNCTION__; |
| 903 | 903 |
| 904 player_tracker_.NotifyNewKey(); | 904 player_tracker_.NotifyNewKey(); |
| 905 } | 905 } |
| 906 | 906 |
| 907 } // namespace media | 907 } // namespace media |
| OLD | NEW |