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/feature_list.h" | 17 #include "base/feature_list.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/memory/ptr_util.h" |
21 #include "base/single_thread_task_runner.h" | 22 #include "base/single_thread_task_runner.h" |
22 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
23 #include "base/strings/string_util.h" | 24 #include "base/strings/string_util.h" |
24 #include "base/sys_byteorder.h" | 25 #include "base/sys_byteorder.h" |
25 #include "base/sys_info.h" | 26 #include "base/sys_info.h" |
26 #include "base/threading/thread_task_runner_handle.h" | 27 #include "base/threading/thread_task_runner_handle.h" |
27 #include "jni/MediaDrmBridge_jni.h" | 28 #include "jni/MediaDrmBridge_jni.h" |
28 #include "media/base/android/android_util.h" | 29 #include "media/base/android/android_util.h" |
29 #include "media/base/android/media_codec_util.h" | 30 #include "media/base/android/media_codec_util.h" |
30 #include "media/base/android/media_drm_bridge_client.h" | 31 #include "media/base/android/media_drm_bridge_client.h" |
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 DCHECK(!key_id.empty()); | 734 DCHECK(!key_id.empty()); |
734 | 735 |
735 jint j_status_code = Java_KeyStatus_getStatusCode(env, j_key_status); | 736 jint j_status_code = Java_KeyStatus_getStatusCode(env, j_key_status); |
736 CdmKeyInformation::KeyStatus key_status = | 737 CdmKeyInformation::KeyStatus key_status = |
737 ConvertKeyStatus(static_cast<KeyStatus>(j_status_code), is_key_release); | 738 ConvertKeyStatus(static_cast<KeyStatus>(j_status_code), is_key_release); |
738 | 739 |
739 DVLOG(2) << __func__ << "Key status change: " | 740 DVLOG(2) << __func__ << "Key status change: " |
740 << base::HexEncode(&key_id[0], key_id.size()) << ", " | 741 << base::HexEncode(&key_id[0], key_id.size()) << ", " |
741 << key_status; | 742 << key_status; |
742 | 743 |
743 cdm_keys_info.push_back(new CdmKeyInformation(key_id, key_status, 0)); | 744 cdm_keys_info.push_back( |
| 745 base::MakeUnique<CdmKeyInformation>(key_id, key_status, 0)); |
744 } | 746 } |
745 | 747 |
746 task_runner_->PostTask( | 748 task_runner_->PostTask( |
747 FROM_HERE, | 749 FROM_HERE, |
748 base::Bind(session_keys_change_cb_, JavaBytesToString(env, j_session_id), | 750 base::Bind(session_keys_change_cb_, JavaBytesToString(env, j_session_id), |
749 has_additional_usable_key, base::Passed(&cdm_keys_info))); | 751 has_additional_usable_key, base::Passed(&cdm_keys_info))); |
750 | 752 |
751 if (has_additional_usable_key) { | 753 if (has_additional_usable_key) { |
752 task_runner_->PostTask(FROM_HERE, | 754 task_runner_->PostTask(FROM_HERE, |
753 base::Bind(&MediaDrmBridge::OnHasAdditionalUsableKey, | 755 base::Bind(&MediaDrmBridge::OnHasAdditionalUsableKey, |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
939 } | 941 } |
940 | 942 |
941 void MediaDrmBridge::OnHasAdditionalUsableKey() { | 943 void MediaDrmBridge::OnHasAdditionalUsableKey() { |
942 DCHECK(task_runner_->BelongsToCurrentThread()); | 944 DCHECK(task_runner_->BelongsToCurrentThread()); |
943 DVLOG(1) << __func__; | 945 DVLOG(1) << __func__; |
944 | 946 |
945 player_tracker_.NotifyNewKey(); | 947 player_tracker_.NotifyNewKey(); |
946 } | 948 } |
947 | 949 |
948 } // namespace media | 950 } // namespace media |
OLD | NEW |