third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp - Issue 2007433002: Revert of MediaCaptureFromElement: add support for audio captureStream().

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: third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

Issue 2007433002: Revert of MediaCaptureFromElement: add support for audio captureStream(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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 | « third_party/WebKit/LayoutTests/fast/mediacapturefromelement/HTMLMediaElementCapture-creation.html ('k') | third_party/WebKit/public/platform/Platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

diff --git a/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp b/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

index aad4dab4c61a1e4856448a4223b901f9342494eb..478a74db936ae535ef8852c4ddb8a58bf16d5d13 100644

--- a/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

+++ b/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

@@ -6,8 +6,6 @@

#include "core/dom/ExceptionCode.h"

#include "core/html/HTMLMediaElement.h"

-#include "core/html/track/AudioTrackList.h"

-#include "core/html/track/VideoTrackList.h"

#include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"

#include "modules/encryptedmedia/MediaKeys.h"

#include "modules/mediastream/MediaStream.h"

@@ -39,14 +37,17 @@

return MediaStream::create(element.getExecutionContext(), MediaStreamRegistry::registry().lookupMediaStreamDescriptor(element.currentSrc().getString()));

}

+ // TODO(mcasas): Only <video> tags are supported at the moment.

+ if (element.isHTMLAudioElement()) {

+ NOTIMPLEMENTED();

+ return nullptr;

+ }

WebMediaStream webStream;

webStream.initialize(WebVector<WebMediaStreamTrack>(), WebVector<WebMediaStreamTrack>());

MediaStreamCenter::instance().didCreateMediaStream(webStream);

- if (element.hasVideo())

- Platform::current()->createHTMLVideoElementCapturer(&webStream, element.webMediaPlayer());

- if (element.hasAudio())

- Platform::current()->createHTMLAudioElementCapturer(&webStream, element.webMediaPlayer());

+ Platform::current()->createHTMLVideoElementCapturer(&webStream, element.webMediaPlayer());

return MediaStream::create(element.getExecutionContext(), webStream);

}