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

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

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

index ff9463d695ee2a417491b965a24789d27675b63a..76c22c19c0ff1998286c16474cceab4231b4b854 100644

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

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

@@ -29,6 +29,7 @@

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

#include "media/base/android/media_player_bridge.h"

#include "media/base/android/media_source_player.h"

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

#include "media/base/android/media_url_interceptor.h"

using media::MediaCodecPlayer;

@@ -164,7 +165,7 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer(

}

case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: {

- if (MediaPlayerAndroid::UseMediaThread()) {

+ if (media::UseMediaThreadForMediaPlayback()) {

return new MediaCodecPlayer(

media_player_params.player_id,

weak_ptr_factory_.GetWeakPtr(),