Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1763)

Unified Diff: media/base/android/media_source_player.cc

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Better handling of player_tracker_.NotifyNewKey() Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 4551520b25f14950dad1b51d4376767869e70af7..52b5eb44560f0c093c6df7dc22bbad667a5ed9f7 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -258,9 +258,13 @@ void MediaSourcePlayer::OnDemuxerDurationChanged(base::TimeDelta duration) {
duration_ = duration;
}
-void MediaSourcePlayer::OnMediaCryptoReady() {
+void MediaSourcePlayer::OnMediaCryptoReady(
+ MediaDrmBridge::JavaObjectPtr /* media_crypto */,
+ bool /* needs_protected_surface */) {
+ // Callback parameters are ignored in this player. They are intended for
+ // MediaCodecPlayer which uses a different threading scheme.
DCHECK(!drm_bridge_->GetMediaCrypto().is_null());
- drm_bridge_->SetMediaCryptoReadyCB(base::Closure());
+ drm_bridge_->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB());
// Retry decoder creation if the decoders are waiting for MediaCrypto.
RetryDecoderCreation(true, true);

Powered by Google App Engine
This is Rietveld 408576698