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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 cdm_promise_adapter_.ResolvePromise(promise_id, session_id); | 526 cdm_promise_adapter_.ResolvePromise(promise_id, session_id); |
527 } | 527 } |
528 | 528 |
529 void MediaDrmBridge::RejectPromise(uint32_t promise_id, | 529 void MediaDrmBridge::RejectPromise(uint32_t promise_id, |
530 const std::string& error_message) { | 530 const std::string& error_message) { |
531 DVLOG(2) << __FUNCTION__; | 531 DVLOG(2) << __FUNCTION__; |
532 cdm_promise_adapter_.RejectPromise(promise_id, MediaKeys::UNKNOWN_ERROR, 0, | 532 cdm_promise_adapter_.RejectPromise(promise_id, MediaKeys::UNKNOWN_ERROR, 0, |
533 error_message); | 533 error_message); |
534 } | 534 } |
535 | 535 |
536 jobject MediaDrmBridge::GetMediaCrypto() { | |
537 DCHECK(task_runner_->BelongsToCurrentThread()); | |
538 return j_media_crypto_->obj(); | |
539 } | |
540 | |
541 void MediaDrmBridge::SetMediaCryptoReadyCB( | 536 void MediaDrmBridge::SetMediaCryptoReadyCB( |
542 const MediaCryptoReadyCB& media_crypto_ready_cb) { | 537 const MediaCryptoReadyCB& media_crypto_ready_cb) { |
543 if (!task_runner_->BelongsToCurrentThread()) { | 538 if (!task_runner_->BelongsToCurrentThread()) { |
544 task_runner_->PostTask( | 539 task_runner_->PostTask( |
545 FROM_HERE, | 540 FROM_HERE, |
546 base::Bind(&MediaDrmBridge::SetMediaCryptoReadyCB, | 541 base::Bind(&MediaDrmBridge::SetMediaCryptoReadyCB, |
547 weak_factory_.GetWeakPtr(), media_crypto_ready_cb)); | 542 weak_factory_.GetWeakPtr(), media_crypto_ready_cb)); |
548 return; | 543 return; |
549 } | 544 } |
550 | 545 |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 } | 867 } |
873 | 868 |
874 void MediaDrmBridge::OnHasAdditionalUsableKey() { | 869 void MediaDrmBridge::OnHasAdditionalUsableKey() { |
875 DCHECK(task_runner_->BelongsToCurrentThread()); | 870 DCHECK(task_runner_->BelongsToCurrentThread()); |
876 DVLOG(1) << __FUNCTION__; | 871 DVLOG(1) << __FUNCTION__; |
877 | 872 |
878 player_tracker_.NotifyNewKey(); | 873 player_tracker_.NotifyNewKey(); |
879 } | 874 } |
880 | 875 |
881 } // namespace media | 876 } // namespace media |
OLD | NEW |