content/renderer/media/android/webmediaplayer_android.cc - Issue 23875003: Merge 219225 "Run |demuxer_| related tasks in the media thread i..."

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: content/renderer/media/android/webmediaplayer_android.cc

Issue 23875003: Merge 219225 "Run |demuxer_| related tasks in the media thread i..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/

Patch Set: Created 7 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

« content/renderer/media/android/media_source_delegate.cc ('K') | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.cc

===================================================================

--- content/renderer/media/android/webmediaplayer_android.cc (revision 220850)

+++ content/renderer/media/android/webmediaplayer_android.cc (working copy)

@@ -65,12 +65,14 @@

RendererMediaPlayerManager* manager,

WebMediaPlayerProxyAndroid* proxy,

StreamTextureFactory* factory,

+ const scoped_refptr<base::MessageLoopProxy>& media_loop,

media::MediaLog* media_log)

: frame_(frame),

client_(client),

delegate_(delegate),

buffered_(1u),

main_loop_(base::MessageLoopProxy::current()),

+ media_loop_(media_loop),

ignore_metadata_duration_change_(false),

pending_seek_(0),

seeking_(false),

@@ -222,7 +224,7 @@

if (source_type_ != MediaPlayerAndroid::SOURCE_TYPE_URL) {

has_media_info_ = true;

media_source_delegate_.reset(

- new MediaSourceDelegate(proxy_, player_id_, media_log_));

+ new MediaSourceDelegate(proxy_, player_id_, media_loop_, media_log_));

// |media_source_delegate_| is owned, so Unretained() is safe here.

if (source_type_ == MediaPlayerAndroid::SOURCE_TYPE_MSE) {

media_source_delegate_->InitializeMediaSource(