media/base/android/media_drm_bridge.h - Issue 1344133002: MediaCodecPlayer implementation - stage 7 (DRM)

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_drm_bridge.h

Issue 1344133002: MediaCodecPlayer implementation - stage 7 (DRM) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mtplayer-drm-prepare

Patch Set: Renamed a variable 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_drm_bridge.h

diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h

index 820286669508b28a6d2d5b73970399080414051d..75dc5cd1f554e3f46d55e468bddfe31989396127 100644

--- a/media/base/android/media_drm_bridge.h

+++ b/media/base/android/media_drm_bridge.h

@@ -245,7 +245,7 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {

// by the Media thread when |use_media_thread_| is true.

PlayerTrackerImpl player_tracker_;

- CdmPromiseAdapter cdm_promise_adapter_;

+ scoped_ptr<CdmPromiseAdapter> cdm_promise_adapter_;

// Object for posting tasks on UI thread.

scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;

« no previous file with comments | « media/base/android/media_codec_video_decoder.cc ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »