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..731fbc3102f0f61a976d327a6a5454eaa7270fb5 100644 |
--- a/content/browser/media/android/browser_media_player_manager.cc |
+++ b/content/browser/media/android/browser_media_player_manager.cc |
@@ -28,6 +28,7 @@ |
#include "media/base/android/media_player_bridge.h" |
#include "media/base/android/media_source_player.h" |
#include "media/base/android/media_url_interceptor.h" |
+#include "media/base/android/mt/player.h" |
#include "media/base/media_switches.h" |
using media::MediaPlayerAndroid; |
@@ -113,13 +114,23 @@ 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::kEnableMediaPlayerV2)) |
+ return new media::mt::Player( |
+ 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); |
} |
} |