| 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 20fd34e89de28e72e243f44ec986366dcabc57af..7bf69c8cfb6339061dc3c2d01adec0d1a7304951 100644
|
| --- a/content/browser/media/android/browser_media_player_manager.cc
|
| +++ b/content/browser/media/android/browser_media_player_manager.cc
|
| @@ -27,6 +27,7 @@
|
| #include "content/public/common/content_switches.h"
|
| #include "media/base/android/media_player_bridge.h"
|
| #include "media/base/android/media_source_player.h"
|
| +#include "media/base/android/media_source_player_with_dedicated_thread.h"
|
| #include "media/base/android/media_url_interceptor.h"
|
| #include "media/base/media_switches.h"
|
|
|
| @@ -34,6 +35,7 @@ using media::MediaPlayerAndroid;
|
| using media::MediaPlayerBridge;
|
| using media::MediaPlayerManager;
|
| using media::MediaSourcePlayer;
|
| +using media::MediaSourcePlayerWithDedicatedThread;
|
|
|
| namespace content {
|
|
|
| @@ -113,13 +115,24 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer(
|
| }
|
|
|
| case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: {
|
| - return new MediaSourcePlayer(
|
| - media_player_params.player_id,
|
| - manager,
|
| - base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
|
| - weak_ptr_factory_.GetWeakPtr()),
|
| - demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
|
| - media_player_params.frame_url);
|
| + if (base::CommandLine::ForCurrentProcess()->
|
| + HasSwitch(switches::kEnableMediaThreadForMediaPlayback)) {
|
| + return new MediaSourcePlayerWithDedicatedThread(
|
| + media_player_params.player_id,
|
| + manager,
|
| + base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
|
| + weak_ptr_factory_.GetWeakPtr()),
|
| + demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
|
| + media_player_params.frame_url);
|
| + } else {
|
| + return new MediaSourcePlayer(
|
| + media_player_params.player_id,
|
| + manager,
|
| + base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
|
| + weak_ptr_factory_.GetWeakPtr()),
|
| + demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
|
| + media_player_params.frame_url);
|
| + }
|
| }
|
| }
|
|
|
|
|