content/browser/media/android/browser_demuxer_android.cc - 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: content/browser/media/android/browser_demuxer_android.cc

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 | « chromecast/browser/media/cast_browser_cdm_factory.cc ('k') | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/android/browser_demuxer_android.cc

diff --git a/content/browser/media/android/browser_demuxer_android.cc b/content/browser/media/android/browser_demuxer_android.cc

index b90fb39146ae5ba07ab27a77c7471ea05f1f1406..aab876394ae83e0ff9cc79300c3bc0917f2aa627 100644

--- a/content/browser/media/android/browser_demuxer_android.cc

+++ b/content/browser/media/android/browser_demuxer_android.cc

@@ -5,7 +5,7 @@

#include "content/browser/media/android/browser_demuxer_android.h"

#include "content/common/media/media_player_messages_android.h"

-#include "media/base/android/media_codec_player.h"

+#include "media/base/android/media_task_runner.h"

#include "media/base/media_switches.h"

namespace content {

@@ -56,7 +56,7 @@ class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid {

BrowserDemuxerAndroid::BrowserDemuxerAndroid()

: BrowserMessageFilter(MediaPlayerMsgStart) {

task_runner_ =

- media::MediaPlayerAndroid::UseMediaThread() ?

+ media::UseMediaThreadForMediaPlayback() ?

media::GetMediaTaskRunner().get() :

BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get();