| 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 18 matching lines...) Expand all Loading... |
| 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; |
| 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::ScopedJavaGlobalRef; | 40 using base::android::ScopedJavaGlobalRef; |
| 40 using base::android::ScopedJavaLocalRef; | 41 using base::android::ScopedJavaLocalRef; |
| 41 | 42 |
| 42 namespace media { | 43 namespace media { |
| 43 | 44 |
| 44 namespace { | 45 namespace { |
| 45 | 46 |
| 46 // These must be in sync with Android MediaDrm REQUEST_TYPE_XXX constants! | 47 // These must be in sync with Android MediaDrm REQUEST_TYPE_XXX constants! |
| 47 // https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.htm
l | 48 // https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.htm
l |
| 48 enum class RequestType { | 49 enum class RequestType { |
| (...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 } | 899 } |
| 899 | 900 |
| 900 void MediaDrmBridge::OnHasAdditionalUsableKey() { | 901 void MediaDrmBridge::OnHasAdditionalUsableKey() { |
| 901 DCHECK(task_runner_->BelongsToCurrentThread()); | 902 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 902 DVLOG(1) << __FUNCTION__; | 903 DVLOG(1) << __FUNCTION__; |
| 903 | 904 |
| 904 player_tracker_.NotifyNewKey(); | 905 player_tracker_.NotifyNewKey(); |
| 905 } | 906 } |
| 906 | 907 |
| 907 } // namespace media | 908 } // namespace media |
| OLD | NEW |