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

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

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Fixed MediaDrmBridgeTest unit tests 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
« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_source_player.h
diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
index ab3bda3e72c3f4eaadd3647b7238a73b5ac81b61..bfa3935c5d0ccfa890b7ea04b021a4e91616d96f 100644
--- a/media/base/android/media_source_player.h
+++ b/media/base/android/media_source_player.h
@@ -94,7 +94,8 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
// Callback to notify that MediaCrypto is ready in |drm_bridge_|.
- void OnMediaCryptoReady();
+ void OnMediaCryptoReady(MediaDrmBridge::JavaObjectPtr media_crypto,
+ bool needs_protected_surface);
// Handle pending events if all the decoder jobs are not currently decoding.
void ProcessPendingEvents();
« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698