Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(748)

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 2075303002: [DO NOT COMMIT] Initial MediaPlayerRenderer plumbing and basic features (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 12835699e8efdc29328e6d7341ae6cafe0b9977e..d5f19506e76d6111dd47f83632716f226aff88db 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -28,6 +28,7 @@
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/video_layer.h"
#include "media/audio/null_audio_sink.h"
+#include "media/base/android/url_demuxer_stream_provider.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/cdm_context.h"
#include "media/base/limits.h"
@@ -45,6 +46,7 @@
#include "media/blink/webmediasource_impl.h"
#include "media/filters/chunk_demuxer.h"
#include "media/filters/ffmpeg_demuxer.h"
+#include "media/media_features.h"
#include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h"
#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
@@ -269,7 +271,9 @@ void WebMediaPlayerImpl::load(LoadType load_type,
}
bool WebMediaPlayerImpl::supportsOverlayFullscreenVideo() {
-#if defined(OS_ANDROID)
+#if BUILDFLAG(FORCE_MOJO_MEDIA_PLAYER_RENDERER)
+ return true;
+#elif defined(OS_ANDROID)
// OverlayFullscreenVideo is only used when we're H/W decoding to an
// SurfaceView underlay on Android. It's possible that we haven't initialized
// any decoders before entering fullscreen, so we won't know whether to use
@@ -1293,6 +1297,12 @@ void WebMediaPlayerImpl::StartPipeline() {
Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb =
BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnEncryptedMediaInitData);
+#if BUILDFLAG(FORCE_MOJO_MEDIA_PLAYER_RENDERER)
+ demuxer_.reset(new UrlDemuxerStreamProvider(GURL()));
+ pipeline_controller_.Start(demuxer_.get(), this, true, true);
+ return;
Julien Isorce Samsung 2016/08/08 13:01:58 Hi, not sure what CL is the most up to date with h
+#endif
+
// Figure out which demuxer to use.
if (load_type_ != LoadTypeMediaSource) {
DCHECK(!chunk_demuxer_);

Powered by Google App Engine
This is Rietveld 408576698