media/blink/webmediaplayer_impl.cc - Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement.

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: media/blink/webmediaplayer_impl.cc

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix android compile issue Created 4 years, 9 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 | « media/blink/webmediaplayer_impl.h ('k') | third_party/WebKit/LayoutTests/media/video-srcobject-mediastream.html » ('j') | third_party/WebKit/Source/core/html/HTMLMediaElement.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/webmediaplayer_impl.cc

diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc

index f9cef4c7044b16f2ae7ad40d28288528de6cee00..6596545d57f0f47a5c065ccbea42ab19968b6443 100644

--- a/media/blink/webmediaplayer_impl.cc

+++ b/media/blink/webmediaplayer_impl.cc

@@ -48,6 +48,7 @@

#include "media/filters/chunk_demuxer.h"

#include "media/filters/ffmpeg_demuxer.h"

#include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h"

+#include "third_party/WebKit/public/platform/WebMediaElementSource.h"

#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"

#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"

#include "third_party/WebKit/public/platform/WebMediaSource.h"

@@ -264,8 +265,12 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {

media_log_->CreateEvent(MediaLogEvent::WEBMEDIAPLAYER_DESTROYED));

}

-void WebMediaPlayerImpl::load(LoadType load_type, const blink::WebURL& url,

+void WebMediaPlayerImpl::load(LoadType load_type,

+ const blink::WebMediaElementSource& source,

CORSMode cors_mode) {

+ // Only URL is supported.

+ DCHECK(source.isURL());

+ blink::WebURL url = source.getAsURL();

DVLOG(1) << __FUNCTION__ << "(" << load_type << ", " << url << ", "

<< cors_mode << ")";

if (!defer_load_cb_.is_null()) {