media/base/android/media_source_player.h - Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Moved GetMEdiaTaskRunner() and UseMediaThread() to a separate file, renamed the latter 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

« media/base/android/media_drm_bridge.cc ('K') | « media/base/android/media_player_android.cc ('k') | media/base/android/media_source_player.cc » ('j') | media/base/android/media_source_player.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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();