<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181152] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181152">181152</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-06 06:07:13 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename MediaStreamSource to RealtimeMediaSource
https://bugs.webkit.org/show_bug.cgi?id=142330
Reviewed by Eric Carlson.
MediaStreamSource is a misleading name, it's not the source of a
MediaStream.
The chain from high level to low level is: MediaStream -
MediaStreamTrack - MediaStreamTrackPrivate - RealTimeMediaSource
and a MediaStream can contains several MediaStreamTrack objects of
different types.
MediaStreamSourceStates was also renamed to
RealtimeMediaSourceStates, and MediaStreamSourceCapabilities to
RealtimeMediaSourceCapabilities, for consistency.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamAllAudioCapabilitiesh">trunk/Source/WebCore/Modules/mediastream/AllAudioCapabilities.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamAllVideoCapabilitiesh">trunk/Source/WebCore/Modules/mediastream/AllVideoCapabilities.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamAudioStreamTrackh">trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamCapabilityRangecpp">trunk/Source/WebCore/Modules/mediastream/CapabilityRange.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamCapabilityRangeh">trunk/Source/WebCore/Modules/mediastream/CapabilityRange.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaSourceStatescpp">trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaSourceStatesh">trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamCapabilitiescpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamCapabilitiesh">trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequesth">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamVideoStreamTrackh">trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodeh">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourcecpp">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourceh">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamCenterh">trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamConstraintsValidationClienth">trunk/Source/WebCore/platform/mediastream/MediaStreamConstraintsValidationClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamCreationClienth">trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamgstreamerMediaStreamCenterGStreamercpp">trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamgstreamerMediaStreamCenterGStreamerh">trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacMediaStreamCenterMaccpp">trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacMediaStreamCenterMach">trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockMediaStreamCentercpp">trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh">trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceCapabilitiesh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceStatescpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceStatesh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamSourcecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamSourceh">trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamSourceCapabilitiesh">trunk/Source/WebCore/platform/mediastream/MediaStreamSourceCapabilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamSourceStatescpp">trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamSourceStatesh">trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -2169,8 +2169,8 @@
</span><span class="cx"> platform/mediastream/MediaStreamCenter.cpp
</span><span class="cx"> platform/mediastream/MediaStreamPrivate.cpp
</span><span class="cx"> platform/mediastream/MediaStreamTrackPrivate.cpp
</span><del>- platform/mediastream/MediaStreamSource.cpp
- platform/mediastream/MediaStreamSourceStates.cpp
</del><ins>+ platform/mediastream/RealtimeMediaSource.cpp
+ platform/mediastream/RealtimeMediaSourceStates.cpp
</ins><span class="cx"> platform/mediastream/RTCIceCandidateDescriptor.cpp
</span><span class="cx"> platform/mediastream/RTCPeerConnectionHandler.cpp
</span><span class="cx"> platform/mediastream/RTCSessionDescriptionDescriptor.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-03-05 Philippe Normand <pnormand@igalia.com>
+
+ Rename MediaStreamSource to RealtimeMediaSource
+ https://bugs.webkit.org/show_bug.cgi?id=142330
+
+ Reviewed by Eric Carlson.
+
+ MediaStreamSource is a misleading name, it's not the source of a
+ MediaStream.
+
+ The chain from high level to low level is: MediaStream -
+ MediaStreamTrack - MediaStreamTrackPrivate - RealTimeMediaSource
+ and a MediaStream can contains several MediaStreamTrack objects of
+ different types.
+
+ MediaStreamSourceStates was also renamed to
+ RealtimeMediaSourceStates, and MediaStreamSourceCapabilities to
+ RealtimeMediaSourceCapabilities, for consistency.
+
</ins><span class="cx"> 2015-03-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed WinCairo port build fix since r181136.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamAllAudioCapabilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/AllAudioCapabilities.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/AllAudioCapabilities.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/AllAudioCapabilities.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -29,24 +29,24 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "MediaStreamCapabilities.h"
</span><del>-#include "MediaStreamSourceCapabilities.h"
</del><ins>+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CapabilityRange;
</span><del>-class MediaStreamSourceCapabilities;
</del><ins>+class RealtimeMediaSourceCapabilities;
</ins><span class="cx">
</span><span class="cx"> class AllAudioCapabilities : public MediaStreamCapabilities {
</span><span class="cx"> public:
</span><del>- static RefPtr<AllAudioCapabilities> create(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
</del><ins>+ static RefPtr<AllAudioCapabilities> create(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new AllAudioCapabilities(capabilities));
</span><span class="cx"> }
</span><span class="cx"> virtual ~AllAudioCapabilities() { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit AllAudioCapabilities(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
</del><ins>+ explicit AllAudioCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
</ins><span class="cx"> : MediaStreamCapabilities(capabilities)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamAllVideoCapabilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/AllVideoCapabilities.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/AllVideoCapabilities.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/AllVideoCapabilities.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -33,18 +33,18 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CapabilityRange;
</span><del>-class MediaStreamSourceCapabilities;
</del><ins>+class RealtimeMediaSourceCapabilities;
</ins><span class="cx">
</span><span class="cx"> class AllVideoCapabilities : public MediaStreamCapabilities {
</span><span class="cx"> public:
</span><del>- static RefPtr<AllVideoCapabilities> create(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
</del><ins>+ static RefPtr<AllVideoCapabilities> create(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new AllVideoCapabilities(capabilities));
</span><span class="cx"> }
</span><span class="cx"> virtual ~AllVideoCapabilities() { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit AllVideoCapabilities(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
</del><ins>+ explicit AllVideoCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
</ins><span class="cx"> : MediaStreamCapabilities(capabilities)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamAudioStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaStreamSource;
</del><ins>+class RealtimeMediaSource;
</ins><span class="cx"> class ScriptExecutionContext;
</span><span class="cx">
</span><span class="cx"> class AudioStreamTrack final : public MediaStreamTrack {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamCapabilityRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/CapabilityRange.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/CapabilityRange.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/CapabilityRange.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -40,17 +40,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<CapabilityRange> CapabilityRange::create(const MediaStreamSourceCapabilityRange& rangeInfo)
</del><ins>+RefPtr<CapabilityRange> CapabilityRange::create(const RealtimeMediaSourceCapabilityRange& rangeInfo)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new CapabilityRange(rangeInfo));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CapabilityRange::CapabilityRange(const MediaStreamSourceCapabilityRange& rangeInfo)
</del><ins>+CapabilityRange::CapabilityRange(const RealtimeMediaSourceCapabilityRange& rangeInfo)
</ins><span class="cx"> : m_rangeInfo(rangeInfo)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Deprecated::ScriptValue scriptValue(ExecState* exec, const MediaStreamSourceCapabilityRange::ValueUnion& value, MediaStreamSourceCapabilityRange::Type type)
</del><ins>+static Deprecated::ScriptValue scriptValue(ExecState* exec, const RealtimeMediaSourceCapabilityRange::ValueUnion& value, RealtimeMediaSourceCapabilityRange::Type type)
</ins><span class="cx"> {
</span><span class="cx"> // NOTE: the spec says:
</span><span class="cx"> // ... an implementation should make a reasonable attempt to translate and scale the hardware's setting
</span><span class="lines">@@ -62,13 +62,13 @@
</span><span class="cx"> // "Custom" and return jsUndefined() from the custom getter to support it.
</span><span class="cx">
</span><span class="cx"> switch (type) {
</span><del>- case MediaStreamSourceCapabilityRange::Float:
</del><ins>+ case RealtimeMediaSourceCapabilityRange::Float:
</ins><span class="cx"> return Deprecated::ScriptValue(exec->vm(), JSValue(value.asFloat));
</span><span class="cx"> break;
</span><del>- case MediaStreamSourceCapabilityRange::ULong:
</del><ins>+ case RealtimeMediaSourceCapabilityRange::ULong:
</ins><span class="cx"> return Deprecated::ScriptValue(exec->vm(), JSValue(value.asULong));
</span><span class="cx"> break;
</span><del>- case MediaStreamSourceCapabilityRange::Undefined:
</del><ins>+ case RealtimeMediaSourceCapabilityRange::Undefined:
</ins><span class="cx"> return Deprecated::ScriptValue(exec->vm(), jsUndefined());
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamCapabilityRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/CapabilityRange.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/CapabilityRange.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/CapabilityRange.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSourceCapabilities.h"
</del><ins>+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <interpreter/CallFrame.h>
</span><span class="lines">@@ -41,16 +41,16 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~CapabilityRange() { }
</span><span class="cx">
</span><del>- static RefPtr<CapabilityRange> create(const MediaStreamSourceCapabilityRange&);
</del><ins>+ static RefPtr<CapabilityRange> create(const RealtimeMediaSourceCapabilityRange&);
</ins><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue min(JSC::ExecState*) const;
</span><span class="cx"> Deprecated::ScriptValue max(JSC::ExecState*) const;
</span><span class="cx"> bool supported() const { return m_rangeInfo.supported(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CapabilityRange(const MediaStreamSourceCapabilityRange&);
</del><ins>+ CapabilityRange(const RealtimeMediaSourceCapabilityRange&);
</ins><span class="cx">
</span><del>- MediaStreamSourceCapabilityRange m_rangeInfo;
</del><ins>+ RealtimeMediaSourceCapabilityRange m_rangeInfo;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaSourceStatescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -33,24 +33,24 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<MediaSourceStates> MediaSourceStates::create(const MediaStreamSourceStates& states)
</del><ins>+RefPtr<MediaSourceStates> MediaSourceStates::create(const RealtimeMediaSourceStates& states)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new MediaSourceStates(states));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaSourceStates::MediaSourceStates(const MediaStreamSourceStates& states)
</del><ins>+MediaSourceStates::MediaSourceStates(const RealtimeMediaSourceStates& states)
</ins><span class="cx"> : m_sourceStates(states)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& MediaSourceStates::sourceType() const
</span><span class="cx"> {
</span><del>- return MediaStreamSourceStates::sourceType(m_sourceStates.sourceType());
</del><ins>+ return RealtimeMediaSourceStates::sourceType(m_sourceStates.sourceType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& MediaSourceStates::facingMode() const
</span><span class="cx"> {
</span><del>- return MediaStreamSourceStates::facingMode(m_sourceStates.facingMode());
</del><ins>+ return RealtimeMediaSourceStates::facingMode(m_sourceStates.facingMode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaSourceStatesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSourceCapabilities.h"
</del><ins>+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class MediaSourceStates : public RefCounted<MediaSourceStates>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- static RefPtr<MediaSourceStates> create(const MediaStreamSourceStates&);
</del><ins>+ static RefPtr<MediaSourceStates> create(const RealtimeMediaSourceStates&);
</ins><span class="cx">
</span><span class="cx"> const AtomicString& sourceType() const;
</span><span class="cx"> const AtomicString& sourceId() const { return m_sourceStates.sourceId(); }
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> const AtomicString& facingMode() const;
</span><span class="cx"> unsigned long volume() const { return m_sourceStates.volume(); }
</span><span class="cx">
</span><del>- bool hasVideoSource() const { return m_sourceStates.sourceType() == MediaStreamSourceStates::Camera; }
</del><ins>+ bool hasVideoSource() const { return m_sourceStates.sourceType() == RealtimeMediaSourceStates::Camera; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit MediaSourceStates(const MediaStreamSourceStates&);
</del><ins>+ explicit MediaSourceStates(const RealtimeMediaSourceStates&);
</ins><span class="cx">
</span><del>- MediaStreamSourceStates m_sourceStates;
</del><ins>+ RealtimeMediaSourceStates m_sourceStates;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "MediaStreamCenter.h"
</span><span class="cx"> #include "MediaStreamRegistry.h"
</span><del>-#include "MediaStreamSource.h"
</del><span class="cx"> #include "MediaStreamTrackEvent.h"
</span><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include "VideoStreamTrack.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context)
</span><span class="cx"> {
</span><del>- return MediaStream::create(context, MediaStreamPrivate::create(Vector<RefPtr<MediaStreamSource>>(), Vector<RefPtr<MediaStreamSource>>()));
</del><ins>+ return MediaStream::create(context, MediaStreamPrivate::create(Vector<RefPtr<RealtimeMediaSource>>(), Vector<RefPtr<RealtimeMediaSource>>()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context, PassRefPtr<MediaStream> stream)
</span><span class="lines">@@ -216,9 +216,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaStream::haveTrackWithSource(PassRefPtr<MediaStreamSource> source)
</del><ins>+bool MediaStream::haveTrackWithSource(PassRefPtr<RealtimeMediaSource> source)
</ins><span class="cx"> {
</span><del>- if (source->type() == MediaStreamSource::Audio) {
</del><ins>+ if (source->type() == RealtimeMediaSource::Audio) {
</ins><span class="cx"> for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it) {
</span><span class="cx"> if ((*it)->source() == source.get())
</span><span class="cx"> return true;
</span><span class="lines">@@ -288,13 +288,13 @@
</span><span class="cx"> ContextDestructionObserver::contextDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStream::addRemoteSource(MediaStreamSource* source)
</del><ins>+void MediaStream::addRemoteSource(RealtimeMediaSource* source)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(source);
</span><span class="cx"> addRemoteTrack(MediaStreamTrackPrivate::create(source).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStream::removeRemoteSource(MediaStreamSource* source)
</del><ins>+void MediaStream::removeRemoteSource(RealtimeMediaSource* source)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(source);
</span><span class="cx"> if (!active())
</span><span class="lines">@@ -324,13 +324,13 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrack> track;
</span><span class="cx"> switch (privateTrack->type()) {
</span><del>- case MediaStreamSource::Audio:
</del><ins>+ case RealtimeMediaSource::Audio:
</ins><span class="cx"> track = AudioStreamTrack::create(*scriptExecutionContext(), *privateTrack);
</span><span class="cx"> break;
</span><del>- case MediaStreamSource::Video:
</del><ins>+ case RealtimeMediaSource::Video:
</ins><span class="cx"> track = VideoStreamTrack::create(*scriptExecutionContext(), *privateTrack);
</span><span class="cx"> break;
</span><del>- case MediaStreamSource::None:
</del><ins>+ case RealtimeMediaSource::None:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -377,14 +377,14 @@
</span><span class="cx"> return MediaStreamRegistry::registry();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<RefPtr<MediaStreamTrack>>* MediaStream::trackVectorForType(MediaStreamSource::Type type)
</del><ins>+Vector<RefPtr<MediaStreamTrack>>* MediaStream::trackVectorForType(RealtimeMediaSource::Type type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><del>- case MediaStreamSource::Audio:
</del><ins>+ case RealtimeMediaSource::Audio:
</ins><span class="cx"> return &m_audioTracks;
</span><del>- case MediaStreamSource::Video:
</del><ins>+ case RealtimeMediaSource::Video:
</ins><span class="cx"> return &m_videoTracks;
</span><del>- case MediaStreamSource::None:
</del><ins>+ case RealtimeMediaSource::None:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -109,22 +109,22 @@
</span><span class="cx"> // MediaStreamPrivateClient
</span><span class="cx"> virtual void trackDidEnd() override final;
</span><span class="cx"> virtual void setStreamIsActive(bool) override final;
</span><del>- virtual void addRemoteSource(MediaStreamSource*) override final;
- virtual void removeRemoteSource(MediaStreamSource*) override final;
</del><ins>+ virtual void addRemoteSource(RealtimeMediaSource*) override final;
+ virtual void removeRemoteSource(RealtimeMediaSource*) override final;
</ins><span class="cx"> virtual void addRemoteTrack(MediaStreamTrackPrivate*) override final;
</span><span class="cx"> virtual void removeRemoteTrack(MediaStreamTrackPrivate*) override final;
</span><span class="cx">
</span><span class="cx"> bool removeTrack(PassRefPtr<MediaStreamTrack>);
</span><span class="cx"> bool addTrack(PassRefPtr<MediaStreamTrack>);
</span><span class="cx">
</span><del>- bool haveTrackWithSource(PassRefPtr<MediaStreamSource>);
</del><ins>+ bool haveTrackWithSource(PassRefPtr<RealtimeMediaSource>);
</ins><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><span class="cx"> void scheduledEventTimerFired();
</span><span class="cx">
</span><span class="cx"> void cloneMediaStreamTrackVector(Vector<RefPtr<MediaStreamTrack>>&, const Vector<RefPtr<MediaStreamTrack>>&);
</span><span class="cx">
</span><del>- Vector<RefPtr<MediaStreamTrack>>* trackVectorForType(MediaStreamSource::Type);
</del><ins>+ Vector<RefPtr<MediaStreamTrack>>* trackVectorForType(RealtimeMediaSource::Type);
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamPrivate> m_private;
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>> m_audioTracks;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> #include "AllVideoCapabilities.h"
</span><span class="cx"> #include "CapabilityRange.h"
</span><span class="cx"> #include "MediaSourceStates.h"
</span><del>-#include "MediaStreamSourceCapabilities.h"
</del><ins>+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<MediaStreamCapabilities> MediaStreamCapabilities::create(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
</del><ins>+RefPtr<MediaStreamCapabilities> MediaStreamCapabilities::create(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
</ins><span class="cx"> {
</span><span class="cx"> if (capabilities->hasVideoSource())
</span><span class="cx"> return AllVideoCapabilities::create(capabilities);
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> return AllAudioCapabilities::create(capabilities);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamCapabilities::MediaStreamCapabilities(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
</del><ins>+MediaStreamCapabilities::MediaStreamCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
</ins><span class="cx"> : m_SourceCapabilities(capabilities)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -58,12 +58,12 @@
</span><span class="cx"> if (!count)
</span><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><del>- const Vector<MediaStreamSourceStates::SourceType>& sourceTypes = m_SourceCapabilities->sourceTypes();
</del><ins>+ const Vector<RealtimeMediaSourceStates::SourceType>& sourceTypes = m_SourceCapabilities->sourceTypes();
</ins><span class="cx"> Vector<String> capabilities;
</span><span class="cx"> capabilities.reserveCapacity(count);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < count; ++i)
</span><del>- capabilities.append(MediaStreamSourceStates::sourceType(sourceTypes[i]));
</del><ins>+ capabilities.append(RealtimeMediaSourceStates::sourceType(sourceTypes[i]));
</ins><span class="cx">
</span><span class="cx"> return capabilities;
</span><span class="cx"> }
</span><span class="lines">@@ -92,12 +92,12 @@
</span><span class="cx"> if (!count)
</span><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><del>- const Vector<MediaStreamSourceStates::VideoFacingMode>& facingModes = m_SourceCapabilities->facingModes();
</del><ins>+ const Vector<RealtimeMediaSourceStates::VideoFacingMode>& facingModes = m_SourceCapabilities->facingModes();
</ins><span class="cx"> Vector<String> capabilities;
</span><span class="cx"> capabilities.reserveCapacity(count);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < count; ++i)
</span><del>- capabilities.append(MediaStreamSourceStates::facingMode(facingModes[i]));
</del><ins>+ capabilities.append(RealtimeMediaSourceStates::facingMode(facingModes[i]));
</ins><span class="cx">
</span><span class="cx"> return capabilities;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamCapabilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "MediaStreamCapabilities.h"
</span><del>-#include "MediaStreamSourceCapabilities.h"
</del><ins>+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -38,11 +38,11 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CapabilityRange;
</span><del>-class MediaStreamSourceCapabilities;
</del><ins>+class RealtimeMediaSourceCapabilities;
</ins><span class="cx">
</span><span class="cx"> class MediaStreamCapabilities : public RefCounted<MediaStreamCapabilities>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- static RefPtr<MediaStreamCapabilities> create(PassRefPtr<MediaStreamSourceCapabilities>);
</del><ins>+ static RefPtr<MediaStreamCapabilities> create(PassRefPtr<RealtimeMediaSourceCapabilities>);
</ins><span class="cx"> virtual ~MediaStreamCapabilities() { }
</span><span class="cx">
</span><span class="cx"> virtual Vector<String> sourceType() const;
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> bool hasVideoSource() { return m_SourceCapabilities->hasVideoSource(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit MediaStreamCapabilities(PassRefPtr<MediaStreamSourceCapabilities>);
</del><ins>+ explicit MediaStreamCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities>);
</ins><span class="cx">
</span><del>- RefPtr<MediaStreamSourceCapabilities> m_SourceCapabilities;
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> m_SourceCapabilities;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> m_privateTrack->setClient(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrack::setSource(PassRefPtr<MediaStreamSource> newSource)
</del><ins>+void MediaStreamTrack::setSource(PassRefPtr<RealtimeMediaSource> newSource)
</ins><span class="cx"> {
</span><span class="cx"> m_privateTrack->setSource(newSource);
</span><span class="cx"> }
</span><span class="lines">@@ -136,11 +136,11 @@
</span><span class="cx"> static NeverDestroyed<AtomicString> newState("new", AtomicString::ConstructFromLiteral);
</span><span class="cx">
</span><span class="cx"> switch (m_privateTrack->readyState()) {
</span><del>- case MediaStreamSource::Live:
</del><ins>+ case RealtimeMediaSource::Live:
</ins><span class="cx"> return live;
</span><del>- case MediaStreamSource::New:
</del><ins>+ case RealtimeMediaSource::New:
</ins><span class="cx"> return newState;
</span><del>- case MediaStreamSource::Ended:
</del><ins>+ case RealtimeMediaSource::Ended:
</ins><span class="cx"> return ended;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -172,10 +172,10 @@
</span><span class="cx"> // The source may be shared by multiple tracks, so its states is not necessarily
</span><span class="cx"> // in sync with the track state. A track that is new or has ended always has a source
</span><span class="cx"> // type of "none".
</span><del>- RefPtr<MediaStreamSourceCapabilities> sourceCapabilities = m_privateTrack->capabilities();
- MediaStreamSource::ReadyState readyState = m_privateTrack->readyState();
- if (readyState == MediaStreamSource::New || readyState == MediaStreamSource::Ended)
- sourceCapabilities->setSourceType(MediaStreamSourceStates::None);
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> sourceCapabilities = m_privateTrack->capabilities();
+ RealtimeMediaSource::ReadyState readyState = m_privateTrack->readyState();
+ if (readyState == RealtimeMediaSource::New || readyState == RealtimeMediaSource::Ended)
+ sourceCapabilities->setSourceType(RealtimeMediaSourceStates::None);
</ins><span class="cx">
</span><span class="cx"> return MediaStreamCapabilities::create(sourceCapabilities.release());
</span><span class="cx"> }
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrack> MediaStreamTrack::clone()
</span><span class="cx"> {
</span><del>- if (m_privateTrack->type() == MediaStreamSource::Audio)
</del><ins>+ if (m_privateTrack->type() == RealtimeMediaSource::Audio)
</ins><span class="cx"> return AudioStreamTrack::create(*this);
</span><span class="cx">
</span><span class="cx"> return VideoStreamTrack::create(*this);
</span><span class="lines">@@ -235,10 +235,10 @@
</span><span class="cx"> if (stopped())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- MediaStreamSource::ReadyState readyState = m_privateTrack->readyState();
- if (readyState == MediaStreamSource::Live)
</del><ins>+ RealtimeMediaSource::ReadyState readyState = m_privateTrack->readyState();
+ if (readyState == RealtimeMediaSource::Live)
</ins><span class="cx"> scheduleEventDispatch(Event::create(eventNames().startedEvent, false, false));
</span><del>- else if (readyState == MediaStreamSource::Ended && !m_stoppingTrack)
</del><ins>+ else if (readyState == RealtimeMediaSource::Ended && !m_stoppingTrack)
</ins><span class="cx"> scheduleEventDispatch(Event::create(eventNames().endedEvent, false, false));
</span><span class="cx">
</span><span class="cx"> configureTrackRendering();
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrack::trackDidEnd()
</span><span class="cx"> {
</span><del>- m_privateTrack->setReadyState(MediaStreamSource::Ended);
</del><ins>+ m_privateTrack->setReadyState(RealtimeMediaSource::Ended);
</ins><span class="cx">
</span><span class="cx"> for (Vector<Observer*>::iterator i = m_observers.begin(); i != m_observers.end(); ++i)
</span><span class="cx"> (*i)->trackDidEnd();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventTarget.h"
</span><del>-#include "MediaStreamSource.h"
</del><span class="cx"> #include "MediaStreamTrackPrivate.h"
</span><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(overconstrained);
</span><span class="cx">
</span><del>- MediaStreamSource* source() const { return m_privateTrack->source(); }
</del><ins>+ RealtimeMediaSource* source() const { return m_privateTrack->source(); }
</ins><span class="cx"> MediaStreamTrackPrivate& privateTrack() { return m_privateTrack.get(); }
</span><span class="cx">
</span><span class="cx"> bool ended() const;
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> explicit MediaStreamTrack(MediaStreamTrack&);
</span><span class="cx"> MediaStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&, const Dictionary*);
</span><span class="cx">
</span><del>- void setSource(PassRefPtr<MediaStreamSource>);
</del><ins>+ void setSource(PassRefPtr<RealtimeMediaSource>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void configureTrackRendering();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "MediaStreamCreationClient.h"
</span><del>-#include "MediaStreamSource.h"
</del><span class="cx"> #include "NavigatorUserMediaErrorCallback.h"
</span><span class="cx"> #include "NavigatorUserMediaSuccessCallback.h"
</span><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamVideoStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaStreamSource;
</del><ins>+class RealtimeMediaSource;
</ins><span class="cx"> class ScriptExecutionContext;
</span><span class="cx">
</span><span class="cx"> class VideoStreamTrack final : public MediaStreamTrack {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -49,16 +49,16 @@
</span><span class="cx"> setNodeType(NodeTypeMediaStreamAudioDestination);
</span><span class="cx">
</span><span class="cx"> m_source = MediaStreamAudioSource::create();
</span><del>- Vector<RefPtr<MediaStreamSource>> audioSources;
</del><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
</ins><span class="cx"> audioSources.append(m_source);
</span><del>- m_stream = MediaStream::create(*context->scriptExecutionContext(), MediaStreamPrivate::create(audioSources, Vector<RefPtr<MediaStreamSource>>()));
</del><ins>+ m_stream = MediaStream::create(*context->scriptExecutionContext(), MediaStreamPrivate::create(audioSources, Vector<RefPtr<RealtimeMediaSource>>()));
</ins><span class="cx">
</span><span class="cx"> m_source->setAudioFormat(numberOfChannels, context->sampleRate());
</span><span class="cx">
</span><span class="cx"> initialize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamSource* MediaStreamAudioDestinationNode::mediaStreamSource()
</del><ins>+RealtimeMediaSource* MediaStreamAudioDestinationNode::mediaStreamSource()
</ins><span class="cx"> {
</span><span class="cx"> return m_source.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioDestinationNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual void process(size_t framesToProcess);
</span><span class="cx"> virtual void reset();
</span><span class="cx">
</span><del>- MediaStreamSource* mediaStreamSource();
</del><ins>+ RealtimeMediaSource* mediaStreamSource();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaStreamAudioDestinationNode(AudioContext*, size_t numberOfChannels);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -40,11 +40,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamAudioSource::MediaStreamAudioSource()
</span><del>- : MediaStreamSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), MediaStreamSource::Audio, "MediaStreamAudioDestinationNode")
</del><ins>+ : RealtimeMediaSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), RealtimeMediaSource::Audio, "MediaStreamAudioDestinationNode")
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamSourceCapabilities> MediaStreamAudioSource::capabilities() const
</del><ins>+RefPtr<RealtimeMediaSourceCapabilities> MediaStreamAudioSource::capabilities() const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement this.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=122430
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const MediaStreamSourceStates& MediaStreamAudioSource::states()
</del><ins>+const RealtimeMediaSourceStates& MediaStreamAudioSource::states()
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: implement this.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=122430
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "AudioDestinationConsumer.h"
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AudioBus;
</span><del>-class MediaStreamSourceCapabilities;
</del><ins>+class RealtimeMediaSourceCapabilities;
</ins><span class="cx">
</span><del>-class MediaStreamAudioSource : public MediaStreamSource {
</del><ins>+class MediaStreamAudioSource : public RealtimeMediaSource {
</ins><span class="cx"> public:
</span><span class="cx"> static RefPtr<MediaStreamAudioSource> create();
</span><span class="cx">
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool useIDForTrackID() const { return true; }
</span><span class="cx">
</span><del>- virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const;
- virtual const MediaStreamSourceStates& states();
</del><ins>+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const;
+ virtual const RealtimeMediaSourceStates& states();
</ins><span class="cx">
</span><span class="cx"> const String& deviceId() const { return m_deviceId; }
</span><span class="cx"> void setDeviceId(const String& deviceId) { m_deviceId = deviceId; }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> String m_deviceId;
</span><span class="cx"> Mutex m_audioConsumersLock;
</span><span class="cx"> Vector<RefPtr<AudioDestinationConsumer>> m_audioConsumers;
</span><del>- MediaStreamSourceStates m_currentStates;
</del><ins>+ RealtimeMediaSourceStates m_currentStates;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 070334D61459FFD5008D8D45 /* TrackBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 070334D9145A006F008D8D45 /* TrackBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070334D8145A006F008D8D45 /* TrackBase.cpp */; };
</span><span class="cx"> 070334E9145A1F36008D8D45 /* JSTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070334E8145A1F35008D8D45 /* JSTrackCustom.cpp */; };
</span><del>- 070363D6181A146500C074A5 /* MediaStreamSourceStates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070363D4181A146500C074A5 /* MediaStreamSourceStates.cpp */; };
- 070363D7181A146500C074A5 /* MediaStreamSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363D5181A146500C074A5 /* MediaStreamSourceStates.h */; };
</del><span class="cx"> 070363E0181A1CDC00C074A5 /* AVAudioCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363D8181A1CDC00C074A5 /* AVAudioCaptureSource.h */; };
</span><span class="cx"> 070363E1181A1CDC00C074A5 /* AVAudioCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363D9181A1CDC00C074A5 /* AVAudioCaptureSource.mm */; };
</span><span class="cx"> 070363E2181A1CDC00C074A5 /* AVCaptureDeviceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363DA181A1CDC00C074A5 /* AVCaptureDeviceManager.h */; };
</span><span class="lines">@@ -82,7 +80,6 @@
</span><span class="cx"> 070363E5181A1CDC00C074A5 /* AVMediaCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363DD181A1CDC00C074A5 /* AVMediaCaptureSource.mm */; };
</span><span class="cx"> 070363E6181A1CDC00C074A5 /* AVVideoCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */; };
</span><span class="cx"> 070363E7181A1CDC00C074A5 /* AVVideoCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */; };
</span><del>- 070584FD17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 070584FB17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 070584FF17F9F05E005F2BCB /* CapabilityRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070584FE17F9F05E005F2BCB /* CapabilityRange.cpp */; };
</span><span class="cx"> 0705850217FA10D0005F2BCB /* JSAllVideoCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705850017FA10D0005F2BCB /* JSAllVideoCapabilities.cpp */; };
</span><span class="cx"> 0705850317FA10D0005F2BCB /* JSAllVideoCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705850117FA10D0005F2BCB /* JSAllVideoCapabilities.h */; };
</span><span class="lines">@@ -259,9 +256,7 @@
</span><span class="cx"> 078E093217D1684600420AA1 /* MediaStreamCenterMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0729B14F17CFCCA0004F1D60 /* MediaStreamCenterMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093317D16B0600420AA1 /* MediaStreamCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */; };
</span><span class="cx"> 078E093417D16B0B00420AA1 /* MediaStreamCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 078E093617D16B2100420AA1 /* MediaStreamSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */; };
</del><span class="cx"> 078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 078E093817D16B2C00420AA1 /* MediaStreamSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9F17CF0AD400848E51 /* MediaStreamSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 078E093917D16B2C00420AA1 /* MediaStreamCreationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093A17D16E1C00420AA1 /* MediaConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9917CF0AD400848E51 /* MediaConstraints.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E093C17D16E1C00420AA1 /* RTCDataChannelHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1775,6 +1770,11 @@
</span><span class="cx"> 4A38BF5114FE1C0900612512 /* WebSocketDeflateFramer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A38BF4F14FE1C0900612512 /* WebSocketDeflateFramer.h */; };
</span><span class="cx"> 4A4F48A916B0DFC000EDBB29 /* DocumentRuleSets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */; };
</span><span class="cx"> 4A4F48AA16B0DFC000EDBB29 /* DocumentRuleSets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */; };
</span><ins>+ 4A4F65701AA997F100E38CDD /* RealtimeMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */; };
+ 4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */; };
+ 4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */; };
+ 4A4F65731AA997F100E38CDD /* RealtimeMediaSourceStates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F656E1AA997F100E38CDD /* RealtimeMediaSourceStates.cpp */; };
+ 4A4F65741AA997F100E38CDD /* RealtimeMediaSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */; };
</ins><span class="cx"> 4A5A2ADB161E7E00005889DD /* WebSocketExtensionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5A2AD9161E7E00005889DD /* WebSocketExtensionParser.cpp */; };
</span><span class="cx"> 4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */; };
</span><span class="cx"> 4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */; };
</span><span class="lines">@@ -7016,8 +7016,6 @@
</span><span class="cx"> 070334D61459FFD5008D8D45 /* TrackBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackBase.h; sourceTree = "<group>"; };
</span><span class="cx"> 070334D8145A006F008D8D45 /* TrackBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 070334E8145A1F35008D8D45 /* JSTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackCustom.cpp; sourceTree = "<group>"; };
</span><del>- 070363D4181A146500C074A5 /* MediaStreamSourceStates.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamSourceStates.cpp; sourceTree = "<group>"; };
- 070363D5181A146500C074A5 /* MediaStreamSourceStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamSourceStates.h; sourceTree = "<group>"; };
</del><span class="cx"> 070363D8181A1CDC00C074A5 /* AVAudioCaptureSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVAudioCaptureSource.h; sourceTree = "<group>"; };
</span><span class="cx"> 070363D9181A1CDC00C074A5 /* AVAudioCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVAudioCaptureSource.mm; sourceTree = "<group>"; };
</span><span class="cx"> 070363DA181A1CDC00C074A5 /* AVCaptureDeviceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVCaptureDeviceManager.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7026,7 +7024,6 @@
</span><span class="cx"> 070363DD181A1CDC00C074A5 /* AVMediaCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVMediaCaptureSource.mm; sourceTree = "<group>"; };
</span><span class="cx"> 070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVVideoCaptureSource.h; sourceTree = "<group>"; };
</span><span class="cx"> 070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVVideoCaptureSource.mm; sourceTree = "<group>"; };
</span><del>- 070584FB17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamSourceCapabilities.h; sourceTree = "<group>"; };
</del><span class="cx"> 070584FE17F9F05E005F2BCB /* CapabilityRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CapabilityRange.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0705850017FA10D0005F2BCB /* JSAllVideoCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAllVideoCapabilities.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0705850117FA10D0005F2BCB /* JSAllVideoCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAllVideoCapabilities.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7151,8 +7148,6 @@
</span><span class="cx"> 07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamCenter.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCenter.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamPrivate.h; sourceTree = "<group>"; };
</span><del>- 07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamSource.cpp; sourceTree = "<group>"; };
- 07221B9F17CF0AD400848E51 /* MediaStreamSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamSource.h; sourceTree = "<group>"; };
</del><span class="cx"> 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCreationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandler.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandlerClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8898,6 +8893,11 @@
</span><span class="cx"> 4A38BF4F14FE1C0900612512 /* WebSocketDeflateFramer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketDeflateFramer.h; sourceTree = "<group>"; };
</span><span class="cx"> 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentRuleSets.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentRuleSets.h; sourceTree = "<group>"; };
</span><ins>+ 4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeMediaSource.cpp; sourceTree = "<group>"; };
+ 4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeMediaSource.h; sourceTree = "<group>"; };
+ 4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeMediaSourceCapabilities.h; sourceTree = "<group>"; };
+ 4A4F656E1AA997F100E38CDD /* RealtimeMediaSourceStates.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeMediaSourceStates.cpp; sourceTree = "<group>"; };
+ 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeMediaSourceStates.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4A5A2AD9161E7E00005889DD /* WebSocketExtensionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketExtensionParser.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketExtensionParser.h; sourceTree = "<group>"; };
</span><span class="cx"> 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFeatureValue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14568,6 +14568,11 @@
</span><span class="cx"> 07221B9217CF0AD400848E51 /* mediastream */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */,
+ 4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */,
+ 4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */,
+ 4A4F656E1AA997F100E38CDD /* RealtimeMediaSourceStates.cpp */,
+ 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */,
</ins><span class="cx"> 0729B14D17CFCCA0004F1D60 /* mac */,
</span><span class="cx"> 07221B9917CF0AD400848E51 /* MediaConstraints.h */,
</span><span class="cx"> 07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */,
</span><span class="lines">@@ -14576,11 +14581,6 @@
</span><span class="cx"> 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */,
</span><span class="cx"> 0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */,
</span><span class="cx"> 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */,
</span><del>- 07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */,
- 07221B9F17CF0AD400848E51 /* MediaStreamSource.h */,
- 070584FB17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h */,
- 070363D4181A146500C074A5 /* MediaStreamSourceStates.cpp */,
- 070363D5181A146500C074A5 /* MediaStreamSourceStates.h */,
</del><span class="cx"> 07FFDE66181AED420072D409 /* MediaStreamTrackPrivate.cpp */,
</span><span class="cx"> 07FFDE67181AED420072D409 /* MediaStreamTrackPrivate.h */,
</span><span class="cx"> 076306E217E22A43005A7C4E /* MediaStreamTrackSourcesRequestClient.h */,
</span><span class="lines">@@ -23539,6 +23539,7 @@
</span><span class="cx"> 49E912AD0EFAC906009D0CAF /* AnimationList.h in Headers */,
</span><span class="cx"> 6C568CB119DAFEA000430CA2 /* MaskImageOperation.h in Headers */,
</span><span class="cx"> 0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
</span><ins>+ 4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */,
</ins><span class="cx"> 93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
</span><span class="cx"> 1A8F6BBD0DB55CDC001DB794 /* ApplicationCache.h in Headers */,
</span><span class="cx"> 1A8F6BBF0DB55CDC001DB794 /* ApplicationCacheGroup.h in Headers */,
</span><span class="lines">@@ -24601,6 +24602,7 @@
</span><span class="cx"> 2D8287F716E4A0380086BD00 /* HitTestLocation.h in Headers */,
</span><span class="cx"> 930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */,
</span><span class="cx"> 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */,
</span><ins>+ 4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */,
</ins><span class="cx"> BC3BC29C0E91AB0F00835588 /* HostWindow.h in Headers */,
</span><span class="cx"> FD31609912B026F700C1A359 /* HRTFDatabase.h in Headers */,
</span><span class="cx"> 5CD9F5671AA0F74200DA45FF /* DFABytecodeCompiler.h in Headers */,
</span><span class="lines">@@ -25589,9 +25591,6 @@
</span><span class="cx"> 078E091617D14D1C00420AA1 /* MediaStreamEvent.h in Headers */,
</span><span class="cx"> 078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */,
</span><span class="cx"> 078E091717D14D1C00420AA1 /* MediaStreamRegistry.h in Headers */,
</span><del>- 078E093817D16B2C00420AA1 /* MediaStreamSource.h in Headers */,
- 070584FD17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h in Headers */,
- 070363D7181A146500C074A5 /* MediaStreamSourceStates.h in Headers */,
</del><span class="cx"> 078E091817D14D1C00420AA1 /* MediaStreamTrack.h in Headers */,
</span><span class="cx"> 078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */,
</span><span class="cx"> 07FFDE69181AED420072D409 /* MediaStreamTrackPrivate.h in Headers */,
</span><span class="lines">@@ -26347,6 +26346,7 @@
</span><span class="cx"> 087558C613B4A57D00F49307 /* SurrogatePairAwareTextIterator.h in Headers */,
</span><span class="cx"> 62C1217D11AB9E77003C462C /* SuspendableTimer.h in Headers */,
</span><span class="cx"> B22279740D00BF220071B782 /* SVGAElement.h in Headers */,
</span><ins>+ 4A4F65741AA997F100E38CDD /* RealtimeMediaSourceStates.h in Headers */,
</ins><span class="cx"> 24D912B113CA9A1F00D21915 /* SVGAltGlyphDefElement.h in Headers */,
</span><span class="cx"> 65653F2E0D9727D200CA9723 /* SVGAltGlyphElement.h in Headers */,
</span><span class="cx"> 24D912B813CA9A6900D21915 /* SVGAltGlyphItemElement.h in Headers */,
</span><span class="lines">@@ -27737,6 +27737,7 @@
</span><span class="cx"> 2E3BC109117D479800B9409A /* DOMFileError.mm in Sources */,
</span><span class="cx"> BC00F0080E0A185500FD04E3 /* DOMFileList.mm in Sources */,
</span><span class="cx"> 2ED609BC1145B07100C8684E /* DOMFormData.cpp in Sources */,
</span><ins>+ 4A4F65731AA997F100E38CDD /* RealtimeMediaSourceStates.cpp in Sources */,
</ins><span class="cx"> 0F54DCE11880F901003EEDBB /* DOMGestureEvent.mm in Sources */,
</span><span class="cx"> BC1A37B7097C715F0019F3D8 /* DOMHTML.mm in Sources */,
</span><span class="cx"> 85DF81280AA7787200486AD7 /* DOMHTMLAnchorElement.mm in Sources */,
</span><span class="lines">@@ -28595,6 +28596,7 @@
</span><span class="cx"> 511EF2C417F0FD3500E4FA16 /* JSIDBFactory.cpp in Sources */,
</span><span class="cx"> 511EF2C517F0FD3500E4FA16 /* JSIDBIndex.cpp in Sources */,
</span><span class="cx"> 511EF2C617F0FD3500E4FA16 /* JSIDBKeyRange.cpp in Sources */,
</span><ins>+ 4A4F65701AA997F100E38CDD /* RealtimeMediaSource.cpp in Sources */,
</ins><span class="cx"> 511EF2C717F0FD3500E4FA16 /* JSIDBObjectStore.cpp in Sources */,
</span><span class="cx"> 511EF2D117F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp in Sources */,
</span><span class="cx"> 511EF2C817F0FD3500E4FA16 /* JSIDBOpenDBRequest.cpp in Sources */,
</span><span class="lines">@@ -29130,8 +29132,6 @@
</span><span class="cx"> 078E090017D14CEE00420AA1 /* MediaStreamEvent.cpp in Sources */,
</span><span class="cx"> 0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */,
</span><span class="cx"> 078E090117D14CEE00420AA1 /* MediaStreamRegistry.cpp in Sources */,
</span><del>- 078E093617D16B2100420AA1 /* MediaStreamSource.cpp in Sources */,
- 070363D6181A146500C074A5 /* MediaStreamSourceStates.cpp in Sources */,
</del><span class="cx"> 078E090217D14CEE00420AA1 /* MediaStreamTrack.cpp in Sources */,
</span><span class="cx"> 078E090317D14CEE00420AA1 /* MediaStreamTrackEvent.cpp in Sources */,
</span><span class="cx"> 07FFDE68181AED420072D409 /* MediaStreamTrackPrivate.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamCenterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class MediaConstraints;
</span><span class="cx"> class MediaStreamCreationClient;
</span><del>-class MediaStreamSourceStates;
</del><ins>+class RealtimeMediaSourceStates;
</ins><span class="cx"> class MediaStreamTrackSourcesRequestClient;
</span><span class="cx">
</span><span class="cx"> class MediaStreamCenter {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamConstraintsValidationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamConstraintsValidationClient.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamConstraintsValidationClient.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamConstraintsValidationClient.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamCreationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<MediaStreamPrivate> MediaStreamPrivate::create(const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
</del><ins>+PassRefPtr<MediaStreamPrivate> MediaStreamPrivate::create(const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new MediaStreamPrivate(createCanonicalUUIDString(), audioSources, videoSources));
</span><span class="cx"> }
</span><span class="lines">@@ -53,47 +53,47 @@
</span><span class="cx"> return adoptRef(new MediaStreamPrivate(createCanonicalUUIDString(), audioPrivateTracks, videoPrivateTracks));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::addSource(PassRefPtr<MediaStreamSource> prpSource)
</del><ins>+void MediaStreamPrivate::addSource(PassRefPtr<RealtimeMediaSource> prpSource)
</ins><span class="cx"> {
</span><del>- RefPtr<MediaStreamSource> source = prpSource;
</del><ins>+ RefPtr<RealtimeMediaSource> source = prpSource;
</ins><span class="cx"> switch (source->type()) {
</span><del>- case MediaStreamSource::Audio:
</del><ins>+ case RealtimeMediaSource::Audio:
</ins><span class="cx"> if (m_audioStreamSources.find(source) == notFound)
</span><span class="cx"> m_audioStreamSources.append(source);
</span><span class="cx"> break;
</span><del>- case MediaStreamSource::Video:
</del><ins>+ case RealtimeMediaSource::Video:
</ins><span class="cx"> if (m_videoStreamSources.find(source) == notFound)
</span><span class="cx"> m_videoStreamSources.append(source);
</span><span class="cx"> break;
</span><del>- case MediaStreamSource::None:
</del><ins>+ case RealtimeMediaSource::None:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::removeSource(PassRefPtr<MediaStreamSource> source)
</del><ins>+void MediaStreamPrivate::removeSource(PassRefPtr<RealtimeMediaSource> source)
</ins><span class="cx"> {
</span><span class="cx"> size_t pos = notFound;
</span><span class="cx"> switch (source->type()) {
</span><del>- case MediaStreamSource::Audio:
</del><ins>+ case RealtimeMediaSource::Audio:
</ins><span class="cx"> pos = m_audioStreamSources.find(source);
</span><span class="cx"> if (pos == notFound)
</span><span class="cx"> return;
</span><span class="cx"> m_audioStreamSources.remove(pos);
</span><span class="cx"> break;
</span><del>- case MediaStreamSource::Video:
</del><ins>+ case RealtimeMediaSource::Video:
</ins><span class="cx"> pos = m_videoStreamSources.find(source);
</span><span class="cx"> if (pos == notFound)
</span><span class="cx"> return;
</span><span class="cx"> m_videoStreamSources.remove(pos);
</span><span class="cx"> break;
</span><del>- case MediaStreamSource::None:
</del><ins>+ case RealtimeMediaSource::None:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::addRemoteSource(MediaStreamSource* source)
</del><ins>+void MediaStreamPrivate::addRemoteSource(RealtimeMediaSource* source)
</ins><span class="cx"> {
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->addRemoteSource(source);
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> addSource(source);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::removeRemoteSource(MediaStreamSource* source)
</del><ins>+void MediaStreamPrivate::removeRemoteSource(RealtimeMediaSource* source)
</ins><span class="cx"> {
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->removeRemoteSource(source);
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> removeTrack(track);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamPrivate::MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
</del><ins>+MediaStreamPrivate::MediaStreamPrivate(const String& id, const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources)
</ins><span class="cx"> : m_client(0)
</span><span class="cx"> , m_id(id)
</span><span class="cx"> , m_isActive(false)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> void MediaStreamPrivate::addTrack(PassRefPtr<MediaStreamTrackPrivate> prpTrack)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamTrackPrivate> track = prpTrack;
</span><del>- Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == MediaStreamSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
</del><ins>+ Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == RealtimeMediaSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
</ins><span class="cx">
</span><span class="cx"> size_t pos = tracks.find(track);
</span><span class="cx"> if (pos != notFound)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::removeTrack(PassRefPtr<MediaStreamTrackPrivate> track)
</span><span class="cx"> {
</span><del>- Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == MediaStreamSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
</del><ins>+ Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == RealtimeMediaSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
</ins><span class="cx">
</span><span class="cx"> size_t pos = tracks.find(track);
</span><span class="cx"> if (pos == notFound)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "MediaStreamTrackPrivate.h"
</span><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -50,15 +50,15 @@
</span><span class="cx"> virtual ~MediaStreamPrivateClient() { }
</span><span class="cx">
</span><span class="cx"> virtual void setStreamIsActive(bool) = 0;
</span><del>- virtual void addRemoteSource(MediaStreamSource*) = 0;
- virtual void removeRemoteSource(MediaStreamSource*) = 0;
</del><ins>+ virtual void addRemoteSource(RealtimeMediaSource*) = 0;
+ virtual void removeRemoteSource(RealtimeMediaSource*) = 0;
</ins><span class="cx"> virtual void addRemoteTrack(MediaStreamTrackPrivate*) = 0;
</span><span class="cx"> virtual void removeRemoteTrack(MediaStreamTrackPrivate*) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaStreamPrivate : public RefCounted<MediaStreamPrivate> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<MediaStreamPrivate> create(const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources);
</del><ins>+ static PassRefPtr<MediaStreamPrivate> create(const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources);
</ins><span class="cx"> static PassRefPtr<MediaStreamPrivate> create(const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks);
</span><span class="cx">
</span><span class="cx"> virtual ~MediaStreamPrivate() { }
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> String id() const { return m_id; }
</span><span class="cx">
</span><span class="cx"> unsigned numberOfAudioSources() const { return m_audioStreamSources.size(); }
</span><del>- MediaStreamSource* audioSources(unsigned index) const { return m_audioStreamSources[index].get(); }
</del><ins>+ RealtimeMediaSource* audioSources(unsigned index) const { return m_audioStreamSources[index].get(); }
</ins><span class="cx">
</span><span class="cx"> unsigned numberOfVideoSources() const { return m_videoStreamSources.size(); }
</span><del>- MediaStreamSource* videoSources(unsigned index) const { return m_videoStreamSources[index].get(); }
</del><ins>+ RealtimeMediaSource* videoSources(unsigned index) const { return m_videoStreamSources[index].get(); }
</ins><span class="cx">
</span><span class="cx"> unsigned numberOfAudioTracks() const { return m_audioPrivateTracks.size(); }
</span><span class="cx"> MediaStreamTrackPrivate* audioTracks(unsigned index) const { return m_audioPrivateTracks[index].get(); }
</span><span class="lines">@@ -80,11 +80,11 @@
</span><span class="cx"> unsigned numberOfVideoTracks() const { return m_videoPrivateTracks.size(); }
</span><span class="cx"> MediaStreamTrackPrivate* videoTracks(unsigned index) const { return m_videoPrivateTracks[index].get(); }
</span><span class="cx">
</span><del>- void addSource(PassRefPtr<MediaStreamSource>);
- void removeSource(PassRefPtr<MediaStreamSource>);
</del><ins>+ void addSource(PassRefPtr<RealtimeMediaSource>);
+ void removeSource(PassRefPtr<RealtimeMediaSource>);
</ins><span class="cx">
</span><del>- void addRemoteSource(MediaStreamSource*);
- void removeRemoteSource(MediaStreamSource*);
</del><ins>+ void addRemoteSource(RealtimeMediaSource*);
+ void removeRemoteSource(RealtimeMediaSource*);
</ins><span class="cx">
</span><span class="cx"> bool active() const { return m_isActive; }
</span><span class="cx"> void setActive(bool);
</span><span class="lines">@@ -96,13 +96,13 @@
</span><span class="cx"> void removeRemoteTrack(MediaStreamTrackPrivate*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources);
</del><ins>+ MediaStreamPrivate(const String& id, const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources);
</ins><span class="cx"> MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks);
</span><span class="cx">
</span><span class="cx"> MediaStreamPrivateClient* m_client;
</span><span class="cx"> String m_id;
</span><del>- Vector<RefPtr<MediaStreamSource>> m_audioStreamSources;
- Vector<RefPtr<MediaStreamSource>> m_videoStreamSources;
</del><ins>+ Vector<RefPtr<RealtimeMediaSource>> m_audioStreamSources;
+ Vector<RefPtr<RealtimeMediaSource>> m_videoStreamSources;
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<MediaStreamTrackPrivate>> m_audioPrivateTracks;
</span><span class="cx"> Vector<RefPtr<MediaStreamTrackPrivate>> m_videoPrivateTracks;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamSourcecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -1,160 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Google Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamSource.h"
-
-#include "MediaStreamCenter.h"
-#include "MediaStreamSourceCapabilities.h"
-#include "UUID.h"
-
-namespace WebCore {
-
-MediaStreamSource::MediaStreamSource(const String& id, Type type, const String& name)
- : m_id(id)
- , m_type(type)
- , m_name(name)
- , m_readyState(New)
- , m_enabled(true)
- , m_muted(false)
- , m_readonly(false)
- , m_remote(false)
-{
- if (!m_id.isEmpty())
- return;
-
- m_id = createCanonicalUUIDString();
-}
-
-void MediaStreamSource::reset()
-{
- m_readyState = New;
- m_enabled = true;
- m_muted = false;
- m_readonly = false;
- m_remote = false;
-}
-
-void MediaStreamSource::setReadyState(ReadyState readyState)
-{
- if (m_readyState == Ended || m_readyState == readyState)
- return;
-
- m_readyState = readyState;
- for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer)
- (*observer)->sourceReadyStateChanged();
-
- if (m_readyState == Live) {
- startProducingData();
- return;
- }
-
- // There are no more consumers of this source's data, shut it down as appropriate.
- if (m_readyState == Ended)
- stopProducingData();
-}
-
-void MediaStreamSource::addObserver(MediaStreamSource::Observer* observer)
-{
- m_observers.append(observer);
-}
-
-void MediaStreamSource::removeObserver(MediaStreamSource::Observer* observer)
-{
- size_t pos = m_observers.find(observer);
- if (pos != notFound)
- m_observers.remove(pos);
-
- if (!m_observers.size())
- stop();
-}
-
-void MediaStreamSource::setMuted(bool muted)
-{
- if (m_muted == muted)
- return;
-
- m_muted = muted;
-
- if (m_readyState == Ended)
- return;
-
- for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer)
- (*observer)->sourceMutedChanged();
-}
-
-void MediaStreamSource::setEnabled(bool enabled)
-{
- if (!enabled) {
- // Don't disable the source unless all observers are disabled.
- for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer) {
- if ((*observer)->observerIsEnabled())
- return;
- }
- }
-
- if (m_enabled == enabled)
- return;
-
- m_enabled = enabled;
-
- if (m_readyState == Ended)
- return;
-
- if (!enabled)
- stopProducingData();
- else
- startProducingData();
-
- for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer)
- (*observer)->sourceEnabledChanged();
-}
-
-bool MediaStreamSource::readonly() const
-{
- return m_readonly;
-}
-
-void MediaStreamSource::stop()
-{
- // This is called from the track.stop() method, which should "Permanently stop the generation of data
- // for track's source", so go straight to ended. This will notify any other tracks using this source
- // that it is no longer available.
- setReadyState(Ended);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamSourceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -1,129 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Ericsson AB. All rights reserved.
- * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Ericsson nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MediaStreamSource_h
-#define MediaStreamSource_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaConstraints.h"
-#include "MediaStreamSourceCapabilities.h"
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class AudioBus;
-class MediaConstraints;
-class MediaStreamPrivate;
-class MediaStreamSourceStates;
-
-class MediaStreamSource : public RefCounted<MediaStreamSource> {
-public:
- class Observer {
- public:
- virtual ~Observer() { }
-
- // Source state changes.
- virtual void sourceReadyStateChanged() = 0;
- virtual void sourceMutedChanged() = 0;
- virtual void sourceEnabledChanged() = 0;
-
- // Observer state queries.
- virtual bool observerIsEnabled() = 0;
- };
-
- virtual ~MediaStreamSource() { }
-
- bool isAudioStreamSource() const { return type() == Audio; }
- virtual bool useIDForTrackID() const { return false; }
-
- const String& id() const { return m_id; }
-
- enum Type { None, Audio, Video };
- Type type() const { return m_type; }
-
- virtual const String& name() const { return m_name; }
- virtual void setName(const String& name) { m_name = name; }
-
- virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const = 0;
- virtual const MediaStreamSourceStates& states() = 0;
-
- enum ReadyState { New = 0, Live = 1, Ended = 2 };
- virtual ReadyState readyState() const { return m_readyState; }
- virtual void setReadyState(ReadyState);
-
- virtual bool enabled() const { return m_enabled; }
- virtual void setEnabled(bool);
-
- virtual bool muted() const { return m_muted; }
- virtual void setMuted(bool);
-
- virtual bool readonly() const;
- virtual void setReadonly(bool readonly) { m_readonly = readonly; }
-
- virtual bool remote() const { return m_remote; }
- virtual void setRemote(bool remote) { m_remote = remote; }
-
- void addObserver(Observer*);
- void removeObserver(Observer*);
-
- virtual void startProducingData() { }
- virtual void stopProducingData() { }
-
- void stop();
-
- void reset();
-
-protected:
- MediaStreamSource(const String& id, Type, const String& name);
-
-private:
- String m_id;
- Type m_type;
- String m_name;
- ReadyState m_readyState;
- Vector<Observer*> m_observers;
-
- bool m_enabled;
- bool m_muted;
- bool m_readonly;
- bool m_remote;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // MediaStreamSource_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamSourceCapabilitiesh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/MediaStreamSourceCapabilities.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamSourceCapabilities.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamSourceCapabilities.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -1,149 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MediaStreamSourceCapabilities_h
-#define MediaStreamSourceCapabilities_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamSourceStates.h"
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-class MediaStreamSourceCapabilityRange {
-public:
-
- MediaStreamSourceCapabilityRange(float min, float max, bool supported = true)
- : m_type(Float)
- {
- m_min.asFloat = min;
- m_max.asFloat = max;
- m_supported = supported;
- }
-
- MediaStreamSourceCapabilityRange(unsigned long min, unsigned long max, bool supported = true)
- : m_type(ULong)
- {
- m_min.asULong = min;
- m_max.asULong = max;
- m_supported = supported;
- }
-
- MediaStreamSourceCapabilityRange()
- {
- m_type = Undefined;
- m_min.asULong = 0;
- m_max.asULong = 0;
- m_supported = false;
- }
-
- enum Type { Undefined, Float, ULong };
-
- union ValueUnion {
- unsigned long asULong;
- float asFloat;
- };
-
- const ValueUnion& min() const { return m_min; }
- const ValueUnion& max() const { return m_max; }
- Type type() const { return m_type; }
- bool supported() const { return m_supported; }
-
-private:
- ValueUnion m_min;
- ValueUnion m_max;
- Type m_type;
- bool m_supported;
-};
-
-class MediaStreamSourceCapabilities : public RefCounted<MediaStreamSourceCapabilities> {
-public:
- static PassRefPtr<MediaStreamSourceCapabilities> create()
- {
- return adoptRef(new MediaStreamSourceCapabilities());
- }
-
- ~MediaStreamSourceCapabilities() { }
-
- const Vector<MediaStreamSourceStates::SourceType>& sourceTypes() { return m_sourceType; }
- void setSourceType(MediaStreamSourceStates::SourceType sourceType) { m_sourceType.resizeToFit(1); addSourceType(sourceType); }
- void addSourceType(MediaStreamSourceStates::SourceType sourceType)
- {
- if (sourceType == MediaStreamSourceStates::Camera)
- m_videoSource = true;
- m_sourceType.append(sourceType);
- }
-
- const Vector<AtomicString>& sourceId() { return m_sourceId; }
- void setSourceId(const AtomicString& id) { m_sourceId.reserveCapacity(1); m_sourceId.insert(0, id); }
-
- const Vector<MediaStreamSourceStates::VideoFacingMode>& facingModes() { return m_facingMode; }
- void addFacingMode(MediaStreamSourceStates::VideoFacingMode mode) { m_facingMode.append(mode); }
-
- const MediaStreamSourceCapabilityRange& width() { return m_width; }
- void setWidthRange(const MediaStreamSourceCapabilityRange& width) { m_width = width; }
-
- const MediaStreamSourceCapabilityRange& height() { return m_height; }
- void setHeightRange(const MediaStreamSourceCapabilityRange& height) { m_height = height; }
-
- const MediaStreamSourceCapabilityRange& frameRate() { return m_frameRate; }
- void setFrameRateRange(const MediaStreamSourceCapabilityRange& frameRate) { m_frameRate = frameRate; }
-
- const MediaStreamSourceCapabilityRange& aspectRatio() { return m_aspectRatio; }
- void setAspectRatioRange(const MediaStreamSourceCapabilityRange& aspectRatio) { m_aspectRatio = aspectRatio; }
-
- const MediaStreamSourceCapabilityRange& volume() { return m_volume; }
- void setVolumeRange(const MediaStreamSourceCapabilityRange& volume) { m_volume = volume; }
-
- bool hasVideoSource() { return m_videoSource; }
- void setHasVideoSource(bool isVideo) { m_videoSource = isVideo;; }
-
-private:
- MediaStreamSourceCapabilities()
- : m_videoSource(false)
- {
- }
-
- Vector<AtomicString> m_sourceId;
- Vector<MediaStreamSourceStates::SourceType> m_sourceType;
- Vector<MediaStreamSourceStates::VideoFacingMode> m_facingMode;
-
- MediaStreamSourceCapabilityRange m_width;
- MediaStreamSourceCapabilityRange m_height;
- MediaStreamSourceCapabilityRange m_frameRate;
- MediaStreamSourceCapabilityRange m_aspectRatio;
- MediaStreamSourceCapabilityRange m_volume;
-
- bool m_videoSource;
-};
-
-} // namespace WebCore
-
-#endif // MediaStreamSourceCapabilities_h
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamSourceStatescpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -1,86 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Google Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamSourceStates.h"
-
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-
-const AtomicString& MediaStreamSourceStates::facingMode(MediaStreamSourceStates::VideoFacingMode mode)
-{
- static NeverDestroyed<AtomicString> userFacing("user", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> environmentFacing("environment", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> leftFacing("left", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> rightFacing("right", AtomicString::ConstructFromLiteral);
-
- switch (mode) {
- case MediaStreamSourceStates::User:
- return userFacing;
- case MediaStreamSourceStates::Environment:
- return environmentFacing;
- case MediaStreamSourceStates::Left:
- return leftFacing;
- case MediaStreamSourceStates::Right:
- return rightFacing;
- case MediaStreamSourceStates::Unknown:
- return emptyAtom;
- }
-
- ASSERT_NOT_REACHED();
- return emptyAtom;
-}
-
-const AtomicString& MediaStreamSourceStates::sourceType(MediaStreamSourceStates::SourceType sourceType)
-{
- static NeverDestroyed<AtomicString> none("none", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> camera("camera", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> microphone("microphone", AtomicString::ConstructFromLiteral);
-
- switch (sourceType) {
- case MediaStreamSourceStates::None:
- return none;
- case MediaStreamSourceStates::Camera:
- return camera;
- case MediaStreamSourceStates::Microphone:
- return microphone;
- }
-
- ASSERT_NOT_REACHED();
- return emptyAtom;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamSourceStatesh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MediaStreamSourceStates_h
-#define MediaStreamSourceStates_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-class MediaStreamSourceStates {
-public:
- enum SourceType { None, Camera, Microphone };
- enum VideoFacingMode { Unknown, User, Environment, Left, Right };
-
- MediaStreamSourceStates()
- : m_sourceType(None)
- , m_facingMode(Unknown)
- , m_width(0)
- , m_height(0)
- , m_frameRate(0)
- , m_aspectRatio(0)
- , m_volume(0)
- {
- }
-
- static const AtomicString& sourceType(MediaStreamSourceStates::SourceType);
- static const AtomicString& facingMode(MediaStreamSourceStates::VideoFacingMode);
-
- SourceType sourceType() const { return m_sourceType; }
- void setSourceType(SourceType type) { m_sourceType = type; }
-
- const AtomicString& sourceId() const { return m_sourceId; }
- void setSourceId(const AtomicString& sourceId) { m_sourceId = sourceId; }
-
- VideoFacingMode facingMode() const { return m_facingMode; }
- void setFacingMode(VideoFacingMode facingMode) { m_facingMode = facingMode; }
-
- unsigned long width() const { return m_width; }
- void setWidth(unsigned long width) { m_width = width; }
-
- unsigned long height() const { return m_height; }
- void setHeight(unsigned long height) { m_height = height; }
-
- float frameRate() const { return m_frameRate; }
- void setFrameRate(float frameRate) { m_frameRate = frameRate; }
-
- float aspectRatio() const { return m_aspectRatio; }
- void setAspectRatio(float aspectRatio) { m_aspectRatio = aspectRatio; }
-
- unsigned long volume() const { return m_volume; }
- void setVolume(unsigned long volume) { m_volume = volume; }
-
-private:
- SourceType m_sourceType;
- AtomicString m_sourceId;
- VideoFacingMode m_facingMode;
- unsigned long m_width;
- unsigned long m_height;
- float m_frameRate;
- float m_aspectRatio;
- unsigned long m_volume;
-};
-
-} // namespace WebCore
-
-#endif // MediaStreamSourceStates_h
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(PassRefPtr<MediaStreamSource> source)
</del><ins>+PassRefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(PassRefPtr<RealtimeMediaSource> source)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new MediaStreamTrackPrivate(source));
</span><span class="cx"> }
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx"> m_ignoreMutations = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamTrackPrivate::MediaStreamTrackPrivate(PassRefPtr<MediaStreamSource> source)
</del><ins>+MediaStreamTrackPrivate::MediaStreamTrackPrivate(PassRefPtr<RealtimeMediaSource> source)
</ins><span class="cx"> : m_source(nullptr)
</span><span class="cx"> , m_client(nullptr)
</span><del>- , m_readyState(MediaStreamSource::New)
</del><ins>+ , m_readyState(RealtimeMediaSource::New)
</ins><span class="cx"> , m_muted(false)
</span><span class="cx"> , m_enabled(true)
</span><span class="cx"> , m_stopped(false)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> m_source->removeObserver(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrackPrivate::setSource(PassRefPtr<MediaStreamSource> source)
</del><ins>+void MediaStreamTrackPrivate::setSource(PassRefPtr<RealtimeMediaSource> source)
</ins><span class="cx"> {
</span><span class="cx"> if (m_source)
</span><span class="cx"> m_source->removeObserver(this);
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaStreamTrackPrivate::ended() const
</span><span class="cx"> {
</span><del>- return m_stopped || (m_source && m_source->readyState() == MediaStreamSource::Ended);
</del><ins>+ return m_stopped || (m_source && m_source->readyState() == RealtimeMediaSource::Ended);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaStreamTrackPrivate::muted() const
</span><span class="lines">@@ -183,30 +183,30 @@
</span><span class="cx"> if (stopSource == StopTrackAndStopSource && m_source)
</span><span class="cx"> m_source->stop();
</span><span class="cx">
</span><del>- setReadyState(MediaStreamSource::Ended);
</del><ins>+ setReadyState(RealtimeMediaSource::Ended);
</ins><span class="cx"> m_stopped = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamSource::ReadyState MediaStreamTrackPrivate::readyState() const
</del><ins>+RealtimeMediaSource::ReadyState MediaStreamTrackPrivate::readyState() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_stopped)
</span><del>- return MediaStreamSource::Ended;
</del><ins>+ return RealtimeMediaSource::Ended;
</ins><span class="cx">
</span><span class="cx"> return m_readyState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrackPrivate::setReadyState(MediaStreamSource::ReadyState state)
</del><ins>+void MediaStreamTrackPrivate::setReadyState(RealtimeMediaSource::ReadyState state)
</ins><span class="cx"> {
</span><del>- if (m_readyState == MediaStreamSource::Ended || m_readyState == state)
</del><ins>+ if (m_readyState == RealtimeMediaSource::Ended || m_readyState == state)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- MediaStreamSource::ReadyState oldState = m_readyState;
</del><ins>+ RealtimeMediaSource::ReadyState oldState = m_readyState;
</ins><span class="cx"> m_readyState = state;
</span><span class="cx">
</span><span class="cx"> if (!m_client || m_ignoreMutations)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ((m_readyState == MediaStreamSource::Live && oldState == MediaStreamSource::New) || m_readyState == MediaStreamSource::Ended)
</del><ins>+ if ((m_readyState == RealtimeMediaSource::Live && oldState == RealtimeMediaSource::New) || m_readyState == RealtimeMediaSource::Ended)
</ins><span class="cx"> m_client->trackReadyStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -221,25 +221,25 @@
</span><span class="cx"> return m_constraints;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const MediaStreamSourceStates& MediaStreamTrackPrivate::states() const
</del><ins>+const RealtimeMediaSourceStates& MediaStreamTrackPrivate::states() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_source) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const MediaStreamSourceStates, noState, ());
</del><ins>+ DEPRECATED_DEFINE_STATIC_LOCAL(const RealtimeMediaSourceStates, noState, ());
</ins><span class="cx"> return noState;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_source->states();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamSource::Type MediaStreamTrackPrivate::type() const
</del><ins>+RealtimeMediaSource::Type MediaStreamTrackPrivate::type() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_source)
</span><del>- return MediaStreamSource::None;
</del><ins>+ return RealtimeMediaSource::None;
</ins><span class="cx">
</span><span class="cx"> return m_source->type();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamSourceCapabilities> MediaStreamTrackPrivate::capabilities() const
</del><ins>+RefPtr<RealtimeMediaSourceCapabilities> MediaStreamTrackPrivate::capabilities() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_source)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MediaSourceStates;
</span><del>-class MediaStreamSourceCapabilities;
</del><ins>+class RealtimeMediaSourceCapabilities;
</ins><span class="cx">
</span><span class="cx"> class MediaStreamTrackPrivateClient {
</span><span class="cx"> public:
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> virtual void trackEnabledChanged() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class MediaStreamTrackPrivate : public RefCounted<MediaStreamTrackPrivate>, public MediaStreamSource::Observer {
</del><ins>+class MediaStreamTrackPrivate : public RefCounted<MediaStreamTrackPrivate>, public RealtimeMediaSource::Observer {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<MediaStreamTrackPrivate> create(PassRefPtr<MediaStreamSource>);
</del><ins>+ static PassRefPtr<MediaStreamTrackPrivate> create(PassRefPtr<RealtimeMediaSource>);
</ins><span class="cx">
</span><span class="cx"> virtual ~MediaStreamTrackPrivate();
</span><span class="cx">
</span><span class="lines">@@ -67,13 +67,13 @@
</span><span class="cx"> bool enabled() const { return m_enabled; }
</span><span class="cx"> void setEnabled(bool);
</span><span class="cx">
</span><del>- void setReadyState(MediaStreamSource::ReadyState);
- MediaStreamSource::ReadyState readyState() const;
</del><ins>+ void setReadyState(RealtimeMediaSource::ReadyState);
+ RealtimeMediaSource::ReadyState readyState() const;
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaStreamTrackPrivate> clone();
</span><span class="cx">
</span><del>- MediaStreamSource* source() const { return m_source.get(); }
- void setSource(PassRefPtr<MediaStreamSource>);
</del><ins>+ RealtimeMediaSource* source() const { return m_source.get(); }
+ void setSource(PassRefPtr<RealtimeMediaSource>);
</ins><span class="cx">
</span><span class="cx"> enum StopBehavior { StopTrackAndStopSource, StopTrackOnly };
</span><span class="cx"> void stop(StopBehavior);
</span><span class="lines">@@ -81,10 +81,10 @@
</span><span class="cx">
</span><span class="cx"> void setClient(MediaStreamTrackPrivateClient* client) { m_client = client; }
</span><span class="cx">
</span><del>- MediaStreamSource::Type type() const;
</del><ins>+ RealtimeMediaSource::Type type() const;
</ins><span class="cx">
</span><del>- const MediaStreamSourceStates& states() const;
- RefPtr<MediaStreamSourceCapabilities> capabilities() const;
</del><ins>+ const RealtimeMediaSourceStates& states() const;
+ RefPtr<RealtimeMediaSourceCapabilities> capabilities() const;
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaConstraints> constraints() const;
</span><span class="cx"> void applyConstraints(PassRefPtr<MediaConstraints>);
</span><span class="lines">@@ -93,21 +93,21 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit MediaStreamTrackPrivate(const MediaStreamTrackPrivate&);
</span><del>- MediaStreamTrackPrivate(PassRefPtr<MediaStreamSource>);
</del><ins>+ MediaStreamTrackPrivate(PassRefPtr<RealtimeMediaSource>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaStreamTrackPrivateClient* client() const { return m_client; }
</span><span class="cx">
</span><del>- // MediaStreamSourceObserver
</del><ins>+ // RealtimeMediaSourceObserver
</ins><span class="cx"> virtual void sourceReadyStateChanged() override final;
</span><span class="cx"> virtual void sourceMutedChanged() override final;
</span><span class="cx"> virtual void sourceEnabledChanged() override final;
</span><span class="cx"> virtual bool observerIsEnabled() override final;
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> m_source;
</del><ins>+ RefPtr<RealtimeMediaSource> m_source;
</ins><span class="cx"> MediaStreamTrackPrivateClient* m_client;
</span><span class="cx"> RefPtr<MediaConstraints> m_constraints;
</span><del>- MediaStreamSource::ReadyState m_readyState;
</del><ins>+ RealtimeMediaSource::ReadyState m_readyState;
</ins><span class="cx"> mutable String m_id;
</span><span class="cx">
</span><span class="cx"> bool m_muted;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaStreamSource;
</del><ins>+class RealtimeMediaSource;
</ins><span class="cx"> class RTCConfigurationPrivate;
</span><span class="cx"> class RTCDTMFSenderHandler;
</span><span class="cx"> class RTCDataChannelHandler;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span><span class="cx"> virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;
</span><span class="cx"> virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;
</span><del>- virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) = 0;
</del><ins>+ virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<RealtimeMediaSource>) = 0;
</ins><span class="cx"> virtual void stop() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecppfromrev181151trunkSourceWebCoreplatformmediastreamMediaStreamSourcecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (from rev 181151, trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp) (0 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -0,0 +1,159 @@
</span><ins>+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Google Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(MEDIA_STREAM)
+#include "RealtimeMediaSource.h"
+
+#include "MediaStreamCenter.h"
+#include "RealtimeMediaSourceCapabilities.h"
+#include "UUID.h"
+
+namespace WebCore {
+
+RealtimeMediaSource::RealtimeMediaSource(const String& id, Type type, const String& name)
+ : m_id(id)
+ , m_type(type)
+ , m_name(name)
+ , m_readyState(New)
+ , m_enabled(true)
+ , m_muted(false)
+ , m_readonly(false)
+ , m_remote(false)
+{
+ if (!m_id.isEmpty())
+ return;
+
+ m_id = createCanonicalUUIDString();
+}
+
+void RealtimeMediaSource::reset()
+{
+ m_readyState = New;
+ m_enabled = true;
+ m_muted = false;
+ m_readonly = false;
+ m_remote = false;
+}
+
+void RealtimeMediaSource::setReadyState(ReadyState readyState)
+{
+ if (m_readyState == Ended || m_readyState == readyState)
+ return;
+
+ m_readyState = readyState;
+ for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer)
+ (*observer)->sourceReadyStateChanged();
+
+ if (m_readyState == Live) {
+ startProducingData();
+ return;
+ }
+
+ // There are no more consumers of this source's data, shut it down as appropriate.
+ if (m_readyState == Ended)
+ stopProducingData();
+}
+
+void RealtimeMediaSource::addObserver(RealtimeMediaSource::Observer* observer)
+{
+ m_observers.append(observer);
+}
+
+void RealtimeMediaSource::removeObserver(RealtimeMediaSource::Observer* observer)
+{
+ size_t pos = m_observers.find(observer);
+ if (pos != notFound)
+ m_observers.remove(pos);
+
+ if (!m_observers.size())
+ stop();
+}
+
+void RealtimeMediaSource::setMuted(bool muted)
+{
+ if (m_muted == muted)
+ return;
+
+ m_muted = muted;
+
+ if (m_readyState == Ended)
+ return;
+
+ for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer)
+ (*observer)->sourceMutedChanged();
+}
+
+void RealtimeMediaSource::setEnabled(bool enabled)
+{
+ if (!enabled) {
+ // Don't disable the source unless all observers are disabled.
+ for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer) {
+ if ((*observer)->observerIsEnabled())
+ return;
+ }
+ }
+
+ if (m_enabled == enabled)
+ return;
+
+ m_enabled = enabled;
+
+ if (m_readyState == Ended)
+ return;
+
+ if (!enabled)
+ stopProducingData();
+ else
+ startProducingData();
+
+ for (auto observer = m_observers.begin(); observer != m_observers.end(); ++observer)
+ (*observer)->sourceEnabledChanged();
+}
+
+bool RealtimeMediaSource::readonly() const
+{
+ return m_readonly;
+}
+
+void RealtimeMediaSource::stop()
+{
+ // This is called from the track.stop() method, which should "Permanently stop the generation of data
+ // for track's source", so go straight to ended. This will notify any other tracks using this source
+ // that it is no longer available.
+ setReadyState(Ended);
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcehfromrev181151trunkSourceWebCoreplatformmediastreamMediaStreamSourceh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (from rev 181151, trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h) (0 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -0,0 +1,129 @@
</span><ins>+/*
+ * Copyright (C) 2011 Ericsson AB. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Ericsson nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RealtimeMediaSource_h
+#define RealtimeMediaSource_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "MediaConstraints.h"
+#include "RealtimeMediaSourceCapabilities.h"
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class AudioBus;
+class MediaConstraints;
+class MediaStreamPrivate;
+class RealtimeMediaSourceStates;
+
+class RealtimeMediaSource : public RefCounted<RealtimeMediaSource> {
+public:
+ class Observer {
+ public:
+ virtual ~Observer() { }
+
+ // Source state changes.
+ virtual void sourceReadyStateChanged() = 0;
+ virtual void sourceMutedChanged() = 0;
+ virtual void sourceEnabledChanged() = 0;
+
+ // Observer state queries.
+ virtual bool observerIsEnabled() = 0;
+ };
+
+ virtual ~RealtimeMediaSource() { }
+
+ bool isAudioStreamSource() const { return type() == Audio; }
+ virtual bool useIDForTrackID() const { return false; }
+
+ const String& id() const { return m_id; }
+
+ enum Type { None, Audio, Video };
+ Type type() const { return m_type; }
+
+ virtual const String& name() const { return m_name; }
+ virtual void setName(const String& name) { m_name = name; }
+
+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const = 0;
+ virtual const RealtimeMediaSourceStates& states() = 0;
+
+ enum ReadyState { New = 0, Live = 1, Ended = 2 };
+ virtual ReadyState readyState() const { return m_readyState; }
+ virtual void setReadyState(ReadyState);
+
+ virtual bool enabled() const { return m_enabled; }
+ virtual void setEnabled(bool);
+
+ virtual bool muted() const { return m_muted; }
+ virtual void setMuted(bool);
+
+ virtual bool readonly() const;
+ virtual void setReadonly(bool readonly) { m_readonly = readonly; }
+
+ virtual bool remote() const { return m_remote; }
+ virtual void setRemote(bool remote) { m_remote = remote; }
+
+ void addObserver(Observer*);
+ void removeObserver(Observer*);
+
+ virtual void startProducingData() { }
+ virtual void stopProducingData() { }
+
+ void stop();
+
+ void reset();
+
+protected:
+ RealtimeMediaSource(const String& id, Type, const String& name);
+
+private:
+ String m_id;
+ Type m_type;
+ String m_name;
+ ReadyState m_readyState;
+ Vector<Observer*> m_observers;
+
+ bool m_enabled;
+ bool m_muted;
+ bool m_readonly;
+ bool m_remote;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // RealtimeMediaSource_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceCapabilitieshfromrev181151trunkSourceWebCoreplatformmediastreamMediaStreamSourceCapabilitiesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h (from rev 181151, trunk/Source/WebCore/platform/mediastream/MediaStreamSourceCapabilities.h) (0 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -0,0 +1,149 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RealtimeMediaSourceCapabilities_h
+#define RealtimeMediaSourceCapabilities_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "RealtimeMediaSourceStates.h"
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
+
+namespace WebCore {
+
+class RealtimeMediaSourceCapabilityRange {
+public:
+
+ RealtimeMediaSourceCapabilityRange(float min, float max, bool supported = true)
+ : m_type(Float)
+ {
+ m_min.asFloat = min;
+ m_max.asFloat = max;
+ m_supported = supported;
+ }
+
+ RealtimeMediaSourceCapabilityRange(unsigned long min, unsigned long max, bool supported = true)
+ : m_type(ULong)
+ {
+ m_min.asULong = min;
+ m_max.asULong = max;
+ m_supported = supported;
+ }
+
+ RealtimeMediaSourceCapabilityRange()
+ {
+ m_type = Undefined;
+ m_min.asULong = 0;
+ m_max.asULong = 0;
+ m_supported = false;
+ }
+
+ enum Type { Undefined, Float, ULong };
+
+ union ValueUnion {
+ unsigned long asULong;
+ float asFloat;
+ };
+
+ const ValueUnion& min() const { return m_min; }
+ const ValueUnion& max() const { return m_max; }
+ Type type() const { return m_type; }
+ bool supported() const { return m_supported; }
+
+private:
+ ValueUnion m_min;
+ ValueUnion m_max;
+ Type m_type;
+ bool m_supported;
+};
+
+class RealtimeMediaSourceCapabilities : public RefCounted<RealtimeMediaSourceCapabilities> {
+public:
+ static PassRefPtr<RealtimeMediaSourceCapabilities> create()
+ {
+ return adoptRef(new RealtimeMediaSourceCapabilities());
+ }
+
+ ~RealtimeMediaSourceCapabilities() { }
+
+ const Vector<RealtimeMediaSourceStates::SourceType>& sourceTypes() { return m_sourceType; }
+ void setSourceType(RealtimeMediaSourceStates::SourceType sourceType) { m_sourceType.resizeToFit(1); addSourceType(sourceType); }
+ void addSourceType(RealtimeMediaSourceStates::SourceType sourceType)
+ {
+ if (sourceType == RealtimeMediaSourceStates::Camera)
+ m_videoSource = true;
+ m_sourceType.append(sourceType);
+ }
+
+ const Vector<AtomicString>& sourceId() { return m_sourceId; }
+ void setSourceId(const AtomicString& id) { m_sourceId.reserveCapacity(1); m_sourceId.insert(0, id); }
+
+ const Vector<RealtimeMediaSourceStates::VideoFacingMode>& facingModes() { return m_facingMode; }
+ void addFacingMode(RealtimeMediaSourceStates::VideoFacingMode mode) { m_facingMode.append(mode); }
+
+ const RealtimeMediaSourceCapabilityRange& width() { return m_width; }
+ void setWidthRange(const RealtimeMediaSourceCapabilityRange& width) { m_width = width; }
+
+ const RealtimeMediaSourceCapabilityRange& height() { return m_height; }
+ void setHeightRange(const RealtimeMediaSourceCapabilityRange& height) { m_height = height; }
+
+ const RealtimeMediaSourceCapabilityRange& frameRate() { return m_frameRate; }
+ void setFrameRateRange(const RealtimeMediaSourceCapabilityRange& frameRate) { m_frameRate = frameRate; }
+
+ const RealtimeMediaSourceCapabilityRange& aspectRatio() { return m_aspectRatio; }
+ void setAspectRatioRange(const RealtimeMediaSourceCapabilityRange& aspectRatio) { m_aspectRatio = aspectRatio; }
+
+ const RealtimeMediaSourceCapabilityRange& volume() { return m_volume; }
+ void setVolumeRange(const RealtimeMediaSourceCapabilityRange& volume) { m_volume = volume; }
+
+ bool hasVideoSource() { return m_videoSource; }
+ void setHasVideoSource(bool isVideo) { m_videoSource = isVideo;; }
+
+private:
+ RealtimeMediaSourceCapabilities()
+ : m_videoSource(false)
+ {
+ }
+
+ Vector<AtomicString> m_sourceId;
+ Vector<RealtimeMediaSourceStates::SourceType> m_sourceType;
+ Vector<RealtimeMediaSourceStates::VideoFacingMode> m_facingMode;
+
+ RealtimeMediaSourceCapabilityRange m_width;
+ RealtimeMediaSourceCapabilityRange m_height;
+ RealtimeMediaSourceCapabilityRange m_frameRate;
+ RealtimeMediaSourceCapabilityRange m_aspectRatio;
+ RealtimeMediaSourceCapabilityRange m_volume;
+
+ bool m_videoSource;
+};
+
+} // namespace WebCore
+
+#endif // RealtimeMediaSourceCapabilities_h
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceStatescppfromrev181151trunkSourceWebCoreplatformmediastreamMediaStreamSourceStatescpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.cpp (from rev 181151, trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.cpp) (0 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.cpp (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of Google Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(MEDIA_STREAM)
+#include "RealtimeMediaSourceStates.h"
+
+#include <wtf/NeverDestroyed.h>
+
+namespace WebCore {
+
+const AtomicString& RealtimeMediaSourceStates::facingMode(RealtimeMediaSourceStates::VideoFacingMode mode)
+{
+ static NeverDestroyed<AtomicString> userFacing("user", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> environmentFacing("environment", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> leftFacing("left", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> rightFacing("right", AtomicString::ConstructFromLiteral);
+
+ switch (mode) {
+ case RealtimeMediaSourceStates::User:
+ return userFacing;
+ case RealtimeMediaSourceStates::Environment:
+ return environmentFacing;
+ case RealtimeMediaSourceStates::Left:
+ return leftFacing;
+ case RealtimeMediaSourceStates::Right:
+ return rightFacing;
+ case RealtimeMediaSourceStates::Unknown:
+ return emptyAtom;
+ }
+
+ ASSERT_NOT_REACHED();
+ return emptyAtom;
+}
+
+const AtomicString& RealtimeMediaSourceStates::sourceType(RealtimeMediaSourceStates::SourceType sourceType)
+{
+ static NeverDestroyed<AtomicString> none("none", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> camera("camera", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> microphone("microphone", AtomicString::ConstructFromLiteral);
+
+ switch (sourceType) {
+ case RealtimeMediaSourceStates::None:
+ return none;
+ case RealtimeMediaSourceStates::Camera:
+ return camera;
+ case RealtimeMediaSourceStates::Microphone:
+ return microphone;
+ }
+
+ ASSERT_NOT_REACHED();
+ return emptyAtom;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceStateshfromrev181151trunkSourceWebCoreplatformmediastreamMediaStreamSourceStatesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.h (from rev 181151, trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.h) (0 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RealtimeMediaSourceStates_h
+#define RealtimeMediaSourceStates_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
+
+namespace WebCore {
+
+class RealtimeMediaSourceStates {
+public:
+ enum SourceType { None, Camera, Microphone };
+ enum VideoFacingMode { Unknown, User, Environment, Left, Right };
+
+ RealtimeMediaSourceStates()
+ : m_sourceType(None)
+ , m_facingMode(Unknown)
+ , m_width(0)
+ , m_height(0)
+ , m_frameRate(0)
+ , m_aspectRatio(0)
+ , m_volume(0)
+ {
+ }
+
+ static const AtomicString& sourceType(RealtimeMediaSourceStates::SourceType);
+ static const AtomicString& facingMode(RealtimeMediaSourceStates::VideoFacingMode);
+
+ SourceType sourceType() const { return m_sourceType; }
+ void setSourceType(SourceType type) { m_sourceType = type; }
+
+ const AtomicString& sourceId() const { return m_sourceId; }
+ void setSourceId(const AtomicString& sourceId) { m_sourceId = sourceId; }
+
+ VideoFacingMode facingMode() const { return m_facingMode; }
+ void setFacingMode(VideoFacingMode facingMode) { m_facingMode = facingMode; }
+
+ unsigned long width() const { return m_width; }
+ void setWidth(unsigned long width) { m_width = width; }
+
+ unsigned long height() const { return m_height; }
+ void setHeight(unsigned long height) { m_height = height; }
+
+ float frameRate() const { return m_frameRate; }
+ void setFrameRate(float frameRate) { m_frameRate = frameRate; }
+
+ float aspectRatio() const { return m_aspectRatio; }
+ void setAspectRatio(float aspectRatio) { m_aspectRatio = aspectRatio; }
+
+ unsigned long volume() const { return m_volume; }
+ void setVolume(unsigned long volume) { m_volume = volume; }
+
+private:
+ SourceType m_sourceType;
+ AtomicString m_sourceId;
+ VideoFacingMode m_facingMode;
+ unsigned long m_width;
+ unsigned long m_height;
+ float m_frameRate;
+ float m_aspectRatio;
+ unsigned long m_volume;
+};
+
+} // namespace WebCore
+
+#endif // RealtimeMediaSourceStates_h
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamgstreamerMediaStreamCenterGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaStreamCreationClient.h"
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><del>-#include "MediaStreamSourceCapabilities.h"
</del><span class="cx"> #include "MediaStreamTrackSourcesRequestClient.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx"> RefPtr<MediaStreamCreationClient> client = prpQueryClient;
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><del>- Vector<RefPtr<MediaStreamSource>> audioSources;
- Vector<RefPtr<MediaStreamSource>> videoSources;
</del><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
+ Vector<RefPtr<RealtimeMediaSource>> videoSources;
</ins><span class="cx"> // FIXME: fill source vectors, see bug #110150.
</span><span class="cx"> client->didCreateStream(MediaStreamPrivate::create(audioSources, videoSources));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamgstreamerMediaStreamCenterGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MediaStreamPrivate;
</span><del>-class MediaStreamSource;
</del><ins>+class RealtimeMediaSource;
</ins><span class="cx"> class MediaStreamSourcesQueryClient;
</span><span class="cx">
</span><span class="cx"> class MediaStreamCenterGStreamer : public MediaStreamCenter {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> AVAudioCaptureSource(AVCaptureDevice*, const AtomicString&, PassRefPtr<MediaConstraints>);
</span><span class="cx"> virtual ~AVAudioCaptureSource();
</span><span class="cx">
</span><del>- virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const override;
</del><ins>+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const override;
</ins><span class="cx"> virtual void captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutput*, CMSampleBufferRef, AVCaptureConnection*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setupCaptureSession() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaConstraints.h"
</span><del>-#import "MediaStreamSourceStates.h"
</del><span class="cx"> #import "NotImplemented.h"
</span><ins>+#import "RealtimeMediaSourceStates.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="lines">@@ -63,17 +63,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)
</span><del>- : AVMediaCaptureSource(device, id, MediaStreamSource::Audio, constraints)
</del><ins>+ : AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio, constraints)
</ins><span class="cx"> {
</span><span class="cx"> currentStates()->setSourceId(id);
</span><del>- currentStates()->setSourceType(MediaStreamSourceStates::Microphone);
</del><ins>+ currentStates()->setSourceType(RealtimeMediaSourceStates::Microphone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVAudioCaptureSource::~AVAudioCaptureSource()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamSourceCapabilities> AVAudioCaptureSource::capabilities() const
</del><ins>+RefPtr<RealtimeMediaSourceCapabilities> AVAudioCaptureSource::capabilities() const
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
</span><span class="cx">
</span><span class="cx"> #include "MediaStreamCenter.h"
</span><del>-#include "MediaStreamSource.h"
</del><span class="cx"> #include "MediaStreamTrackSourcesRequestClient.h"
</span><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -49,15 +49,15 @@
</span><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<TrackSourceInfo>> getSourcesInfo(const String&);
</span><del>- bool verifyConstraintsForMediaType(MediaStreamSource::Type, MediaConstraints*, String&);
- RefPtr<MediaStreamSource> bestSourceForTypeAndConstraints(MediaStreamSource::Type, PassRefPtr<MediaConstraints>);
</del><ins>+ bool verifyConstraintsForMediaType(RealtimeMediaSource::Type, MediaConstraints*, String&);
+ RefPtr<RealtimeMediaSource> bestSourceForTypeAndConstraints(RealtimeMediaSource::Type, PassRefPtr<MediaConstraints>);
</ins><span class="cx">
</span><span class="cx"> enum ValidConstraints { Width = 0, Height, FrameRate, FacingMode, Gain };
</span><span class="cx"> static const Vector<AtomicString>& validConstraintNames();
</span><span class="cx"> static const Vector<AtomicString>& validFacingModes();
</span><span class="cx">
</span><del>- static bool deviceSupportsFacingMode(AVCaptureDevice*, MediaStreamSourceStates::VideoFacingMode);
- static bool isValidConstraint(MediaStreamSource::Type, const String&);
</del><ins>+ static bool deviceSupportsFacingMode(AVCaptureDevice*, RealtimeMediaSourceStates::VideoFacingMode);
+ static bool isValidConstraint(RealtimeMediaSource::Type, const String&);
</ins><span class="cx"> static String bestSessionPresetForVideoSize(AVCaptureSession*, int width, int height);
</span><span class="cx">
</span><span class="cx"> void registerForDeviceNotifications();
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> AVCaptureDeviceManager();
</span><span class="cx"> ~AVCaptureDeviceManager();
</span><span class="cx">
</span><del>- CaptureDevice* bestDeviceForFacingMode(MediaStreamSourceStates::VideoFacingMode);
- bool sessionSupportsConstraint(AVCaptureSession*, MediaStreamSource::Type, const String& name, const String& value);
</del><ins>+ CaptureDevice* bestDeviceForFacingMode(RealtimeMediaSourceStates::VideoFacingMode);
+ bool sessionSupportsConstraint(AVCaptureSession*, RealtimeMediaSource::Type, const String& name, const String& value);
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreAVCaptureDeviceManagerObserver> m_objcObserver;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> #import "AVVideoCaptureSource.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaConstraints.h"
</span><del>-#import "MediaStreamSource.h"
-#import "MediaStreamSourceStates.h"
</del><ins>+#import "RealtimeMediaSource.h"
+#import "RealtimeMediaSourceStates.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "UUID.h"
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="lines">@@ -221,30 +221,30 @@
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AVCaptureDeviceManager::deviceSupportsFacingMode(AVCaptureDeviceType *device, MediaStreamSourceStates::VideoFacingMode facingMode)
</del><ins>+bool AVCaptureDeviceManager::deviceSupportsFacingMode(AVCaptureDeviceType *device, RealtimeMediaSourceStates::VideoFacingMode facingMode)
</ins><span class="cx"> {
</span><span class="cx"> if (![device hasMediaType:AVMediaTypeVideo])
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (facingMode) {
</span><del>- case MediaStreamSourceStates::User:
</del><ins>+ case RealtimeMediaSourceStates::User:
</ins><span class="cx"> if ([device position] == AVCaptureDevicePositionFront)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case MediaStreamSourceStates::Environment:
</del><ins>+ case RealtimeMediaSourceStates::Environment:
</ins><span class="cx"> if ([device position] == AVCaptureDevicePositionBack)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case MediaStreamSourceStates::Left:
- case MediaStreamSourceStates::Right:
- case MediaStreamSourceStates::Unknown:
</del><ins>+ case RealtimeMediaSourceStates::Left:
+ case RealtimeMediaSourceStates::Right:
+ case RealtimeMediaSourceStates::Unknown:
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CaptureDevice* AVCaptureDeviceManager::bestDeviceForFacingMode(MediaStreamSourceStates::VideoFacingMode facingMode)
</del><ins>+CaptureDevice* AVCaptureDeviceManager::bestDeviceForFacingMode(RealtimeMediaSourceStates::VideoFacingMode facingMode)
</ins><span class="cx"> {
</span><span class="cx"> Vector<CaptureDevice>& devices = captureDeviceList();
</span><span class="cx">
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AVCaptureDeviceManager::sessionSupportsConstraint(AVCaptureSessionType *session, MediaStreamSource::Type type, const String& name, const String& value)
</del><ins>+bool AVCaptureDeviceManager::sessionSupportsConstraint(AVCaptureSessionType *session, RealtimeMediaSource::Type type, const String& name, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> size_t constraint = validConstraintNames().find(name);
</span><span class="cx"> if (constraint == notFound)
</span><span class="lines">@@ -268,17 +268,17 @@
</span><span class="cx">
</span><span class="cx"> switch (constraint) {
</span><span class="cx"> case Width:
</span><del>- if (type == MediaStreamSource::Audio)
</del><ins>+ if (type == RealtimeMediaSource::Audio)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !bestSessionPresetForVideoSize(session, value.toInt(), 0).isEmpty();
</span><span class="cx"> case Height:
</span><del>- if (type == MediaStreamSource::Audio)
</del><ins>+ if (type == RealtimeMediaSource::Audio)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !bestSessionPresetForVideoSize(session, 0, value.toInt()).isEmpty();
</span><span class="cx"> case FrameRate: {
</span><del>- if (type == MediaStreamSource::Audio)
</del><ins>+ if (type == RealtimeMediaSource::Audio)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // It would make sense to use [AVCaptureConnection videoMinFrameDuration] and
</span><span class="lines">@@ -287,34 +287,34 @@
</span><span class="cx"> return rate > 0 && rate <= 60;
</span><span class="cx"> }
</span><span class="cx"> case Gain: {
</span><del>- if (type != MediaStreamSource::Audio)
</del><ins>+ if (type != RealtimeMediaSource::Audio)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> float level = value.toFloat();
</span><span class="cx"> return level > 0 && level <= 1;
</span><span class="cx"> }
</span><span class="cx"> case FacingMode: {
</span><del>- if (type == MediaStreamSource::Audio)
</del><ins>+ if (type == RealtimeMediaSource::Audio)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> size_t facingMode = validFacingModes().find(value);
</span><span class="cx"> if (facingMode != notFound)
</span><span class="cx"> return false;
</span><del>- return bestDeviceForFacingMode(static_cast<MediaStreamSourceStates::VideoFacingMode>(facingMode));
</del><ins>+ return bestDeviceForFacingMode(static_cast<RealtimeMediaSourceStates::VideoFacingMode>(facingMode));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AVCaptureDeviceManager::isValidConstraint(MediaStreamSource::Type type, const String& name)
</del><ins>+bool AVCaptureDeviceManager::isValidConstraint(RealtimeMediaSource::Type type, const String& name)
</ins><span class="cx"> {
</span><span class="cx"> size_t constraint = validConstraintNames().find(name);
</span><span class="cx"> if (constraint == notFound)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (constraint == Gain)
</span><del>- return type == MediaStreamSource::Audio;
</del><ins>+ return type == RealtimeMediaSource::Audio;
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> return sourcesInfo;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AVCaptureDeviceManager::verifyConstraintsForMediaType(MediaStreamSource::Type type, MediaConstraints* constraints, String& invalidConstraint)
</del><ins>+bool AVCaptureDeviceManager::verifyConstraintsForMediaType(RealtimeMediaSource::Type type, MediaConstraints* constraints, String& invalidConstraint)
</ins><span class="cx"> {
</span><span class="cx"> if (!isAvailable())
</span><span class="cx"> return false;
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamSource> AVCaptureDeviceManager::bestSourceForTypeAndConstraints(MediaStreamSource::Type type, PassRefPtr<MediaConstraints> constraints)
</del><ins>+RefPtr<RealtimeMediaSource> AVCaptureDeviceManager::bestSourceForTypeAndConstraints(RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
</ins><span class="cx"> {
</span><span class="cx"> if (!isAvailable())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -397,23 +397,23 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: consider the constraints when choosing among multiple devices. For now just select the first available
</span><span class="cx"> // device of the appropriate type.
</span><del>- if (type == MediaStreamSource::Audio && !devices[i].m_audioSourceId.isEmpty()) {
</del><ins>+ if (type == RealtimeMediaSource::Audio && !devices[i].m_audioSourceId.isEmpty()) {
</ins><span class="cx"> if (!devices[i].m_audioSource) {
</span><span class="cx"> AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:devices[i].m_captureDeviceID];
</span><span class="cx"> ASSERT(device);
</span><span class="cx"> devices[i].m_audioSource = AVAudioCaptureSource::create(device, devices[i].m_audioSourceId, constraints);
</span><span class="cx"> }
</span><del>- devices[i].m_audioSource->setReadyState(MediaStreamSource::Live);
</del><ins>+ devices[i].m_audioSource->setReadyState(RealtimeMediaSource::Live);
</ins><span class="cx"> return devices[i].m_audioSource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (type == MediaStreamSource::Video && !devices[i].m_videoSourceId.isEmpty()) {
</del><ins>+ if (type == RealtimeMediaSource::Video && !devices[i].m_videoSourceId.isEmpty()) {
</ins><span class="cx"> if (!devices[i].m_videoSource) {
</span><span class="cx"> AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:devices[i].m_captureDeviceID];
</span><span class="cx"> ASSERT(device);
</span><span class="cx"> devices[i].m_videoSource = AVVideoCaptureSource::create(device, devices[i].m_videoSourceId, constraints);
</span><span class="cx"> }
</span><del>- devices[i].m_videoSource->setReadyState(MediaStreamSource::Live);
</del><ins>+ devices[i].m_videoSource->setReadyState(RealtimeMediaSource::Live);
</ins><span class="cx"> return devices[i].m_videoSource;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -478,10 +478,10 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(Vector<AtomicString>, modes, ());
</span><span class="cx">
</span><span class="cx"> if (!modes.size()) {
</span><del>- modes.insert(MediaStreamSourceStates::User, MediaStreamSourceStates::facingMode(MediaStreamSourceStates::User));
- modes.insert(MediaStreamSourceStates::Environment, MediaStreamSourceStates::facingMode(MediaStreamSourceStates::Environment));
- modes.insert(MediaStreamSourceStates::Left, MediaStreamSourceStates::facingMode(MediaStreamSourceStates::Left));
- modes.insert(MediaStreamSourceStates::Right, MediaStreamSourceStates::facingMode(MediaStreamSourceStates::Right));
</del><ins>+ modes.insert(RealtimeMediaSourceStates::User, RealtimeMediaSourceStates::facingMode(RealtimeMediaSourceStates::User));
+ modes.insert(RealtimeMediaSourceStates::Environment, RealtimeMediaSourceStates::facingMode(RealtimeMediaSourceStates::Environment));
+ modes.insert(RealtimeMediaSourceStates::Left, RealtimeMediaSourceStates::facingMode(RealtimeMediaSourceStates::Left));
+ modes.insert(RealtimeMediaSourceStates::Right, RealtimeMediaSourceStates::facingMode(RealtimeMediaSourceStates::Right));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return modes;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS AVCaptureAudioDataOutput;
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class AVMediaCaptureSource : public MediaStreamSource {
</del><ins>+class AVMediaCaptureSource : public RealtimeMediaSource {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~AVMediaCaptureSource();
</span><span class="cx">
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> virtual void captureSessionStoppedRunning();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- AVMediaCaptureSource(AVCaptureDevice*, const AtomicString&, MediaStreamSource::Type, PassRefPtr<MediaConstraints>);
</del><ins>+ AVMediaCaptureSource(AVCaptureDevice*, const AtomicString&, RealtimeMediaSource::Type, PassRefPtr<MediaConstraints>);
</ins><span class="cx">
</span><del>- virtual const MediaStreamSourceStates& states() override;
</del><ins>+ virtual const RealtimeMediaSourceStates& states() override;
</ins><span class="cx">
</span><span class="cx"> virtual void startProducingData() override;
</span><span class="cx"> virtual void stopProducingData() override;
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> AVCaptureSession *session() const { return m_session.get(); }
</span><span class="cx"> AVCaptureDevice *device() const { return m_device.get(); }
</span><del>- MediaStreamSourceStates* currentStates() { return &m_currentStates; }
</del><ins>+ RealtimeMediaSourceStates* currentStates() { return &m_currentStates; }
</ins><span class="cx"> MediaConstraints* constraints() { return m_constraints.get(); }
</span><span class="cx">
</span><span class="cx"> void setVideoSampleBufferDelegate(AVCaptureVideoDataOutput*);
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreAVMediaCaptureSourceObserver> m_objcObserver;
</span><span class="cx"> RefPtr<MediaConstraints> m_constraints;
</span><del>- MediaStreamSourceStates m_currentStates;
</del><ins>+ RealtimeMediaSourceStates m_currentStates;
</ins><span class="cx"> RetainPtr<AVCaptureSession> m_session;
</span><span class="cx"> RetainPtr<AVCaptureDevice> m_device;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaConstraints.h"
</span><del>-#import "MediaStreamSourceStates.h"
</del><ins>+#import "RealtimeMediaSourceStates.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "UUID.h"
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="lines">@@ -121,15 +121,15 @@
</span><span class="cx"> return globalQueue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, MediaStreamSource::Type type, PassRefPtr<MediaConstraints> constraints)
- : MediaStreamSource(id, type, emptyString())
</del><ins>+AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
+ : RealtimeMediaSource(id, type, emptyString())
</ins><span class="cx"> , m_objcObserver(adoptNS([[WebCoreAVMediaCaptureSourceObserver alloc] initWithCallback:this]))
</span><span class="cx"> , m_constraints(constraints)
</span><span class="cx"> , m_device(device)
</span><span class="cx"> , m_isRunning(false)
</span><span class="cx"> {
</span><span class="cx"> setName([device localizedName]);
</span><del>- m_currentStates.setSourceType(type == MediaStreamSource::Video ? MediaStreamSourceStates::Camera : MediaStreamSourceStates::Microphone);
</del><ins>+ m_currentStates.setSourceType(type == RealtimeMediaSource::Video ? RealtimeMediaSourceStates::Camera : RealtimeMediaSourceStates::Microphone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVMediaCaptureSource::~AVMediaCaptureSource()
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> m_isRunning = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const MediaStreamSourceStates& AVMediaCaptureSource::states()
</del><ins>+const RealtimeMediaSourceStates& AVMediaCaptureSource::states()
</ins><span class="cx"> {
</span><span class="cx"> updateStates();
</span><span class="cx"> return m_currentStates;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static RefPtr<AVMediaCaptureSource> create(AVCaptureDevice*, const AtomicString&, PassRefPtr<MediaConstraints>);
</span><span class="cx">
</span><del>- virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const override;
</del><ins>+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const override;
</ins><span class="cx"> virtual void captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutput*, CMSampleBufferRef, AVCaptureConnection*) override;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaConstraints.h"
</span><del>-#import "MediaStreamSourceStates.h"
</del><span class="cx"> #import "NotImplemented.h"
</span><ins>+#import "RealtimeMediaSourceStates.h"
</ins><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><span class="lines">@@ -81,20 +81,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
</span><del>- : AVMediaCaptureSource(device, id, MediaStreamSource::Video, constraint)
</del><ins>+ : AVMediaCaptureSource(device, id, RealtimeMediaSource::Video, constraint)
</ins><span class="cx"> , m_frameRate(0)
</span><span class="cx"> , m_width(0)
</span><span class="cx"> , m_height(0)
</span><span class="cx"> {
</span><span class="cx"> currentStates()->setSourceId(id);
</span><del>- currentStates()->setSourceType(MediaStreamSourceStates::Camera);
</del><ins>+ currentStates()->setSourceType(RealtimeMediaSourceStates::Camera);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVVideoCaptureSource::~AVVideoCaptureSource()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaStreamSourceCapabilities> AVVideoCaptureSource::capabilities() const
</del><ins>+RefPtr<RealtimeMediaSourceCapabilities> AVVideoCaptureSource::capabilities() const
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return 0;
</span><span class="lines">@@ -102,14 +102,14 @@
</span><span class="cx">
</span><span class="cx"> void AVVideoCaptureSource::updateStates()
</span><span class="cx"> {
</span><del>- MediaStreamSourceStates* states = currentStates();
</del><ins>+ RealtimeMediaSourceStates* states = currentStates();
</ins><span class="cx">
</span><span class="cx"> if ([device() position] == AVCaptureDevicePositionFront)
</span><del>- states->setFacingMode(MediaStreamSourceStates::User);
</del><ins>+ states->setFacingMode(RealtimeMediaSourceStates::User);
</ins><span class="cx"> else if ([device() position] == AVCaptureDevicePositionBack)
</span><del>- states->setFacingMode(MediaStreamSourceStates::Environment);
</del><ins>+ states->setFacingMode(RealtimeMediaSourceStates::Environment);
</ins><span class="cx"> else
</span><del>- states->setFacingMode(MediaStreamSourceStates::Unknown);
</del><ins>+ states->setFacingMode(RealtimeMediaSourceStates::Unknown);
</ins><span class="cx">
</span><span class="cx"> states->setFrameRate(m_frameRate);
</span><span class="cx"> states->setWidth(m_width);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacMediaStreamCenterMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> if (audioConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Audio, audioConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->constraintsInvalid(invalidConstraint);
</span><span class="cx"> return;
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> if (videoConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Video, videoConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->constraintsInvalid(invalidConstraint);
</span><span class="cx"> return;
</span><span class="lines">@@ -90,18 +90,18 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><del>- Vector<RefPtr<MediaStreamSource>> audioSources;
- Vector<RefPtr<MediaStreamSource>> videoSources;
</del><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
+ Vector<RefPtr<RealtimeMediaSource>> videoSources;
</ins><span class="cx">
</span><span class="cx"> if (audioConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Audio, audioConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->failedToCreateStreamWithConstraintsError(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> audioSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(MediaStreamSource::Audio, audioConstraints.get());
</del><ins>+ RefPtr<RealtimeMediaSource> audioSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(RealtimeMediaSource::Audio, audioConstraints.get());
</ins><span class="cx"> ASSERT(audioSource);
</span><span class="cx">
</span><span class="cx"> audioSources.append(audioSource.release());
</span><span class="lines">@@ -109,13 +109,13 @@
</span><span class="cx">
</span><span class="cx"> if (videoConstraints) {
</span><span class="cx"> String invalidConstraint;
</span><del>- AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
</del><ins>+ AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Video, videoConstraints.get(), invalidConstraint);
</ins><span class="cx"> if (!invalidConstraint.isEmpty()) {
</span><span class="cx"> client->failedToCreateStreamWithConstraintsError(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> videoSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(MediaStreamSource::Video, videoConstraints.get());
</del><ins>+ RefPtr<RealtimeMediaSource> videoSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(RealtimeMediaSource::Video, videoConstraints.get());
</ins><span class="cx"> ASSERT(videoSource);
</span><span class="cx">
</span><span class="cx"> videoSources.append(videoSource.release());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacMediaStreamCenterMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaStreamCenter.h"
</span><span class="cx">
</span><del>-#include "MediaStreamSource.h"
</del><ins>+#include "RealtimeMediaSource.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockMediaStreamCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -35,28 +35,28 @@
</span><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "MediaStreamCreationClient.h"
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><del>-#include "MediaStreamSource.h"
-#include "MediaStreamSourceCapabilities.h"
</del><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "MediaStreamTrackSourcesRequestClient.h"
</span><ins>+#include "RealtimeMediaSource.h"
+#include "RealtimeMediaSourceCapabilities.h"
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MockSource : public MediaStreamSource {
</del><ins>+class MockSource : public RealtimeMediaSource {
</ins><span class="cx"> public:
</span><del>- MockSource(const AtomicString& id, const AtomicString& name, MediaStreamSource::Type type)
- : MediaStreamSource(id, type, name)
</del><ins>+ MockSource(const AtomicString& id, const AtomicString& name, RealtimeMediaSource::Type type)
+ : RealtimeMediaSource(id, type, name)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~MockSource() { }
</span><span class="cx">
</span><del>- virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const { return m_capabilities; }
- virtual const MediaStreamSourceStates& states() { return m_currentStates; }
</del><ins>+ virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const { return m_capabilities; }
+ virtual const RealtimeMediaSourceStates& states() { return m_currentStates; }
</ins><span class="cx">
</span><del>- RefPtr<MediaStreamSourceCapabilities> m_capabilities;
- MediaStreamSourceStates m_currentStates;
</del><ins>+ RefPtr<RealtimeMediaSourceCapabilities> m_capabilities;
+ RealtimeMediaSourceStates m_currentStates;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<String, RefPtr<MockSource>> MockSourceMap;
</span><span class="lines">@@ -81,22 +81,22 @@
</span><span class="cx">
</span><span class="cx"> static void initializeMockSources()
</span><span class="cx"> {
</span><del>- RefPtr<MockSource> mockSource1 = adoptRef(new MockSource(mockVideoSourceID(), "Mock video device", MediaStreamSource::Video));
- mockSource1->m_capabilities = MediaStreamSourceCapabilities::create();
</del><ins>+ RefPtr<MockSource> mockSource1 = adoptRef(new MockSource(mockVideoSourceID(), "Mock video device", RealtimeMediaSource::Video));
+ mockSource1->m_capabilities = RealtimeMediaSourceCapabilities::create();
</ins><span class="cx"> mockSource1->m_capabilities->setSourceId(mockSource1->id());
</span><del>- mockSource1->m_capabilities->addSourceType(MediaStreamSourceStates::Camera);
- mockSource1->m_capabilities->addSourceType(MediaStreamSourceStates::Microphone);
- mockSource1->m_capabilities->addFacingMode(MediaStreamSourceStates::User);
- mockSource1->m_capabilities->addFacingMode(MediaStreamSourceStates::Environment);
- mockSource1->m_capabilities->setWidthRange(MediaStreamSourceCapabilityRange(320UL, 1920UL, true));
- mockSource1->m_capabilities->setHeightRange(MediaStreamSourceCapabilityRange(240UL, 1080UL, true));
- mockSource1->m_capabilities->setFrameRateRange(MediaStreamSourceCapabilityRange(15.0f, 60.0f, true));
- mockSource1->m_capabilities->setAspectRatioRange(MediaStreamSourceCapabilityRange(4 / 3.0f, 16 / 9.0f, true));
- mockSource1->m_capabilities->setVolumeRange(MediaStreamSourceCapabilityRange(10UL, 90UL, true));
</del><ins>+ mockSource1->m_capabilities->addSourceType(RealtimeMediaSourceStates::Camera);
+ mockSource1->m_capabilities->addSourceType(RealtimeMediaSourceStates::Microphone);
+ mockSource1->m_capabilities->addFacingMode(RealtimeMediaSourceStates::User);
+ mockSource1->m_capabilities->addFacingMode(RealtimeMediaSourceStates::Environment);
+ mockSource1->m_capabilities->setWidthRange(RealtimeMediaSourceCapabilityRange(320UL, 1920UL, true));
+ mockSource1->m_capabilities->setHeightRange(RealtimeMediaSourceCapabilityRange(240UL, 1080UL, true));
+ mockSource1->m_capabilities->setFrameRateRange(RealtimeMediaSourceCapabilityRange(15.0f, 60.0f, true));
+ mockSource1->m_capabilities->setAspectRatioRange(RealtimeMediaSourceCapabilityRange(4 / 3.0f, 16 / 9.0f, true));
+ mockSource1->m_capabilities->setVolumeRange(RealtimeMediaSourceCapabilityRange(10UL, 90UL, true));
</ins><span class="cx">
</span><del>- mockSource1->m_currentStates.setSourceType(MediaStreamSourceStates::Camera);
</del><ins>+ mockSource1->m_currentStates.setSourceType(RealtimeMediaSourceStates::Camera);
</ins><span class="cx"> mockSource1->m_currentStates.setSourceId(mockSource1->id());
</span><del>- mockSource1->m_currentStates.setFacingMode(MediaStreamSourceStates::User);
</del><ins>+ mockSource1->m_currentStates.setFacingMode(RealtimeMediaSourceStates::User);
</ins><span class="cx"> mockSource1->m_currentStates.setWidth(1920);
</span><span class="cx"> mockSource1->m_currentStates.setHeight(1080);
</span><span class="cx"> mockSource1->m_currentStates.setFrameRate(30);
</span><span class="lines">@@ -105,12 +105,12 @@
</span><span class="cx"> String mockSource1id = mockSource1->id();
</span><span class="cx"> mockSourceMap().add(mockSource1id, mockSource1.release());
</span><span class="cx">
</span><del>- RefPtr<MockSource> mockSource2 = adoptRef(new MockSource(mockAudioSourceID(), "Mock audio device", MediaStreamSource::Audio));
- mockSource2->m_capabilities = MediaStreamSourceCapabilities::create();
</del><ins>+ RefPtr<MockSource> mockSource2 = adoptRef(new MockSource(mockAudioSourceID(), "Mock audio device", RealtimeMediaSource::Audio));
+ mockSource2->m_capabilities = RealtimeMediaSourceCapabilities::create();
</ins><span class="cx"> mockSource2->m_capabilities->setSourceId(mockSource2->id());
</span><del>- mockSource2->m_capabilities->setVolumeRange(MediaStreamSourceCapabilityRange(0UL, 100UL, true));
</del><ins>+ mockSource2->m_capabilities->setVolumeRange(RealtimeMediaSourceCapabilityRange(0UL, 100UL, true));
</ins><span class="cx">
</span><del>- mockSource2->m_currentStates.setSourceType(MediaStreamSourceStates::Microphone);
</del><ins>+ mockSource2->m_currentStates.setSourceType(RealtimeMediaSourceStates::Microphone);
</ins><span class="cx"> mockSource2->m_currentStates.setSourceId(mockSource2->id());
</span><span class="cx"> mockSource2->m_currentStates.setVolume(50);
</span><span class="cx"> String mockSource2id = mockSource2->id();
</span><span class="lines">@@ -159,8 +159,8 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><del>- Vector<RefPtr<MediaStreamSource>> audioSources;
- Vector<RefPtr<MediaStreamSource>> videoSources;
</del><ins>+ Vector<RefPtr<RealtimeMediaSource>> audioSources;
+ Vector<RefPtr<RealtimeMediaSource>> videoSources;
</ins><span class="cx"> MockSourceMap& map = mockSourceMap();
</span><span class="cx">
</span><span class="cx"> if (audioConstraints) {
</span><span class="lines">@@ -173,9 +173,9 @@
</span><span class="cx"> MockSourceMap::iterator it = map.find(mockAudioSourceID());
</span><span class="cx"> ASSERT(it != map.end());
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> audioSource = it->value;
</del><ins>+ RefPtr<RealtimeMediaSource> audioSource = it->value;
</ins><span class="cx"> audioSource->reset();
</span><del>- audioSource->setReadyState(MediaStreamSource::Live);
</del><ins>+ audioSource->setReadyState(RealtimeMediaSource::Live);
</ins><span class="cx"> audioSources.append(audioSource.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -189,9 +189,9 @@
</span><span class="cx"> MockSourceMap::iterator it = map.find(mockVideoSourceID());
</span><span class="cx"> ASSERT(it != map.end());
</span><span class="cx">
</span><del>- RefPtr<MediaStreamSource> videoSource = it->value;
</del><ins>+ RefPtr<RealtimeMediaSource> videoSource = it->value;
</ins><span class="cx"> videoSource->reset();
</span><del>- videoSource->setReadyState(MediaStreamSource::Live);
</del><ins>+ videoSource->setReadyState(RealtimeMediaSource::Live);
</ins><span class="cx"> videoSources.append(videoSource.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> for (MockSourceMap::iterator it = map.begin(); it != end; ++it) {
</span><span class="cx"> MockSource* source = it->value.get();
</span><span class="cx">
</span><del>- sources.append(TrackSourceInfo::create(source->id(), source->type() == MediaStreamSource::Video ? TrackSourceInfo::Video : TrackSourceInfo::Audio, source->name()));
</del><ins>+ sources.append(TrackSourceInfo::create(source->id(), source->type() == RealtimeMediaSource::Video ? TrackSourceInfo::Video : TrackSourceInfo::Audio, source->name()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> requestClient->didCompleteRequest(sources);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> return std::make_unique<RTCDataChannelHandlerMock>(label, init);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<MediaStreamSource>)
</del><ins>+std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<RealtimeMediaSource>)
</ins><span class="cx"> {
</span><span class="cx"> return std::make_unique<RTCDTMFSenderHandlerMock>();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCPeerConnectionHandlerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h (181151 => 181152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2015-03-06 11:14:57 UTC (rev 181151)
+++ trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h 2015-03-06 14:07:13 UTC (rev 181152)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> virtual void removeStream(PassRefPtr<MediaStreamPrivate>) override;
</span><span class="cx"> virtual void getStats(PassRefPtr<RTCStatsRequest>) override;
</span><span class="cx"> virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) override;
</span><del>- virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) override;
</del><ins>+ virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<RealtimeMediaSource>) override;
</ins><span class="cx"> virtual void stop() override;
</span><span class="cx">
</span><span class="cx"> explicit RTCPeerConnectionHandlerMock(RTCPeerConnectionHandlerClient*);
</span></span></pre>
</div>
</div>
</body>
</html>