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

Unified Diff: third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix condition 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
Index: third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
diff --git a/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp b/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..56d51ea993fe6f61c7105d8ed809156ee4cc9191
--- /dev/null
+++ b/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
@@ -0,0 +1,40 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "modules/srcobject/HTMLMediaElementSrcObject.h"
+
+#include "core/html/HTMLMediaElement.h"
+#include "modules/mediastream/MediaStream.h"
+#include "platform/mediastream/MediaStreamDescriptor.h"
+#include "public/platform/WebMediaElementSource.h"
+#include "public/platform/WebMediaStream.h"
+
+namespace blink {
+
+// static
+MediaStream* HTMLMediaElementSrcObject::srcObject(HTMLMediaElement& element)
+{
+ const WebMediaElementSource& source = element.getSrcObject();
+ if (source.isMediaStream()) {
+ MediaStreamDescriptor* descriptor = source.getAsMediaStream();
+ MediaStream* stream = static_cast<MediaStream*>(descriptor->client());
philipj_slow 2016/04/06 11:58:42 Can you introduce a free function toMediaStream(Me
Guido Urdaneta 2016/04/06 16:34:55 Done.
+ return stream;
+ }
+
+ return nullptr;
+}
+
+// static
+void HTMLMediaElementSrcObject::setSrcObject(HTMLMediaElement& element, MediaStream* mediaStream)
+{
+ if (!mediaStream) {
+ element.setSrcObject(WebMediaElementSource());
+ return;
+ }
+ WebMediaStream webStream = WebMediaStream(mediaStream->descriptor());
+ WebMediaElementSource webSource(webStream);
+ element.setSrcObject(webSource);
+}
+
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698