media/media.gyp - Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

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/media.gyp

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scoped_ptr --> inline WidevineCdmDelegateAndroid Created 5 years, 8 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/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index e4518deb0a679ac529f26596097f4d14cc1bf453..05de2354a473ff3ba9d6d57be36bc6158f2ac07a 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1747,6 +1747,8 @@

'base/android/demuxer_android.h',

'base/android/demuxer_stream_player_params.cc',

'base/android/demuxer_stream_player_params.h',

+ 'base/android/media_client_android.cc',

+ 'base/android/media_client_android.h',

'base/android/media_codec_bridge.cc',

'base/android/media_codec_bridge.h',

'base/android/media_common_android.h',

@@ -1754,6 +1756,8 @@

'base/android/media_decoder_job.h',

'base/android/media_drm_bridge.cc',

'base/android/media_drm_bridge.h',

+ 'base/android/media_drm_bridge_delegate.cc',

+ 'base/android/media_drm_bridge_delegate.h',

'base/android/media_jni_registrar.cc',

'base/android/media_jni_registrar.h',

'base/android/media_player_android.cc',

« media/base/android/media_drm_bridge.cc ('K') | « media/base/android/media_drm_bridge_delegate.cc ('k') | no next file » | no next file with comments »