Changeset 181152 in webkit

Timestamp:

Mar 6, 2015 6:07:13 AM (9 years ago)

Author:

Philippe Normand

Message:

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.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Modules/mediastream/AllAudioCapabilities.h (modified) (3 diffs)
• Modules/mediastream/AllVideoCapabilities.h (modified) (2 diffs)
• Modules/mediastream/AudioStreamTrack.h (modified) (1 diff)
• Modules/mediastream/CapabilityRange.cpp (modified) (2 diffs)
• Modules/mediastream/CapabilityRange.h (modified) (3 diffs)
• Modules/mediastream/MediaSourceStates.cpp (modified) (2 diffs)
• Modules/mediastream/MediaSourceStates.h (modified) (3 diffs)
• Modules/mediastream/MediaStream.cpp (modified) (7 diffs)
• Modules/mediastream/MediaStream.h (modified) (3 diffs)
• Modules/mediastream/MediaStreamCapabilities.cpp (modified) (4 diffs)
• Modules/mediastream/MediaStreamCapabilities.h (modified) (3 diffs)
• Modules/mediastream/MediaStreamTrack.cpp (modified) (6 diffs)
• Modules/mediastream/MediaStreamTrack.h (modified) (3 diffs)
• Modules/mediastream/UserMediaRequest.h (modified) (1 diff)
• Modules/mediastream/VideoStreamTrack.h (modified) (1 diff)
• Modules/webaudio/MediaStreamAudioDestinationNode.cpp (modified) (2 diffs)
• Modules/webaudio/MediaStreamAudioDestinationNode.h (modified) (1 diff)
• Modules/webaudio/MediaStreamAudioSource.cpp (modified) (2 diffs)
• Modules/webaudio/MediaStreamAudioSource.h (modified) (4 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (17 diffs)
• platform/mediastream/MediaStreamCenter.h (modified) (2 diffs)
• platform/mediastream/MediaStreamConstraintsValidationClient.h (modified) (1 diff)
• platform/mediastream/MediaStreamCreationClient.h (modified) (1 diff)
• platform/mediastream/MediaStreamPrivate.cpp (modified) (10 diffs)
• platform/mediastream/MediaStreamPrivate.h (modified) (6 diffs)
• platform/mediastream/MediaStreamTrackPrivate.cpp (modified) (8 diffs)
• platform/mediastream/MediaStreamTrackPrivate.h (modified) (7 diffs)
• platform/mediastream/RTCPeerConnectionHandler.h (modified) (2 diffs)
• platform/mediastream/RealtimeMediaSource.cpp (moved) (moved from trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp) (7 diffs)
• platform/mediastream/RealtimeMediaSource.h (moved) (moved from trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h) (6 diffs)
• platform/mediastream/RealtimeMediaSourceCapabilities.h (moved) (moved from trunk/Source/WebCore/platform/mediastream/MediaStreamSourceCapabilities.h) (9 diffs)
• platform/mediastream/RealtimeMediaSourceStates.cpp (moved) (moved from trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.cpp) (5 diffs)
• platform/mediastream/RealtimeMediaSourceStates.h (moved) (moved from trunk/Source/WebCore/platform/mediastream/MediaStreamSourceStates.h) (4 diffs)
• platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp (modified) (2 diffs)
• platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h (modified) (1 diff)
• platform/mediastream/mac/AVAudioCaptureSource.h (modified) (1 diff)
• platform/mediastream/mac/AVAudioCaptureSource.mm (modified) (3 diffs)
• platform/mediastream/mac/AVCaptureDeviceManager.h (modified) (4 diffs)
• platform/mediastream/mac/AVCaptureDeviceManager.mm (modified) (17 diffs)
• platform/mediastream/mac/AVMediaCaptureSource.h (modified) (5 diffs)
• platform/mediastream/mac/AVMediaCaptureSource.mm (modified) (4 diffs)
• platform/mediastream/mac/AVVideoCaptureSource.h (modified) (1 diff)
• platform/mediastream/mac/AVVideoCaptureSource.mm (modified) (5 diffs)
• platform/mediastream/mac/MediaStreamCenterMac.cpp (modified) (6 diffs)
• platform/mediastream/mac/MediaStreamCenterMac.h (modified) (1 diff)
• platform/mock/MockMediaStreamCenter.cpp (modified) (8 diffs)
• platform/mock/RTCPeerConnectionHandlerMock.cpp (modified) (1 diff)
• platform/mock/RTCPeerConnectionHandlerMock.h (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -2170 +2170 @@
     platform/mediastream/MediaStreamPrivate.cpp
     platform/mediastream/MediaStreamTrackPrivate.cpp
-    platform/mediastream/MediaStreamSource.cpp
-    platform/mediastream/MediaStreamSourceStates.cpp
+    platform/mediastream/RealtimeMediaSource.cpp
+    platform/mediastream/RealtimeMediaSourceStates.cpp
     platform/mediastream/RTCIceCandidateDescriptor.cpp
     platform/mediastream/RTCPeerConnectionHandler.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2015-03-06  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/Modules/mediastream/AllAudioCapabilities.h

@@ -30 +30 @@
 
 #include "MediaStreamCapabilities.h"
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include <wtf/text/WTFString.h>
 
@@ -36 +36 @@
 
 class CapabilityRange;
-class MediaStreamSourceCapabilities;
+class RealtimeMediaSourceCapabilities;
 
 class AllAudioCapabilities : public MediaStreamCapabilities {
 public:
-    static RefPtr<AllAudioCapabilities> create(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
+    static RefPtr<AllAudioCapabilities> create(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
     {
         return adoptRef(new AllAudioCapabilities(capabilities));
@@ -47 +47 @@
 
 private:
-    explicit AllAudioCapabilities(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
+    explicit AllAudioCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
         : MediaStreamCapabilities(capabilities)
     {

trunk/Source/WebCore/Modules/mediastream/AllVideoCapabilities.h

@@ -34 +34 @@
 
 class CapabilityRange;
-class MediaStreamSourceCapabilities;
+class RealtimeMediaSourceCapabilities;
 
 class AllVideoCapabilities : public MediaStreamCapabilities {
 public:
-    static RefPtr<AllVideoCapabilities> create(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
+    static RefPtr<AllVideoCapabilities> create(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
     {
         return adoptRef(new AllVideoCapabilities(capabilities));
@@ -45 +45 @@
 
 private:
-    explicit AllVideoCapabilities(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
+    explicit AllVideoCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
         : MediaStreamCapabilities(capabilities)
     {

trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h

@@ -35 +35 @@
 namespace WebCore {
 
-class MediaStreamSource;
+class RealtimeMediaSource;
 class ScriptExecutionContext;
 

trunk/Source/WebCore/Modules/mediastream/CapabilityRange.cpp

@@ -41 +41 @@
 namespace WebCore {
 
-RefPtr<CapabilityRange> CapabilityRange::create(const MediaStreamSourceCapabilityRange& rangeInfo)
+RefPtr<CapabilityRange> CapabilityRange::create(const RealtimeMediaSourceCapabilityRange& rangeInfo)
 {
     return adoptRef(new CapabilityRange(rangeInfo));
 }
 
-CapabilityRange::CapabilityRange(const MediaStreamSourceCapabilityRange& rangeInfo)
+CapabilityRange::CapabilityRange(const RealtimeMediaSourceCapabilityRange& rangeInfo)
     : m_rangeInfo(rangeInfo)
 {
 }
 
-static Deprecated::ScriptValue scriptValue(ExecState* exec, const MediaStreamSourceCapabilityRange::ValueUnion& value, MediaStreamSourceCapabilityRange::Type type)
+static Deprecated::ScriptValue scriptValue(ExecState* exec, const RealtimeMediaSourceCapabilityRange::ValueUnion& value, RealtimeMediaSourceCapabilityRange::Type type)
 {
     // NOTE: the spec says:
@@ -63 +63 @@
     
     switch (type) {
-    case MediaStreamSourceCapabilityRange::Float:
+    case RealtimeMediaSourceCapabilityRange::Float:
         return Deprecated::ScriptValue(exec->vm(), JSValue(value.asFloat));
         break;
-    case MediaStreamSourceCapabilityRange::ULong:
+    case RealtimeMediaSourceCapabilityRange::ULong:
         return Deprecated::ScriptValue(exec->vm(), JSValue(value.asULong));
         break;
-    case MediaStreamSourceCapabilityRange::Undefined:
+    case RealtimeMediaSourceCapabilityRange::Undefined:
         return Deprecated::ScriptValue(exec->vm(), jsUndefined());
         break;

trunk/Source/WebCore/Modules/mediastream/CapabilityRange.h

@@ -30 +30 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include "ScriptWrappable.h"
 #include <bindings/ScriptValue.h>
@@ -42 +42 @@
     virtual ~CapabilityRange() { }
 
-    static RefPtr<CapabilityRange> create(const MediaStreamSourceCapabilityRange&);
+    static RefPtr<CapabilityRange> create(const RealtimeMediaSourceCapabilityRange&);
 
     Deprecated::ScriptValue min(JSC::ExecState*) const;
@@ -49 +49 @@
 
 private:
-    CapabilityRange(const MediaStreamSourceCapabilityRange&);
+    CapabilityRange(const RealtimeMediaSourceCapabilityRange&);
     
-    MediaStreamSourceCapabilityRange m_rangeInfo;
+    RealtimeMediaSourceCapabilityRange m_rangeInfo;
 };
 

trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.cpp

@@ -34 +34 @@
 namespace WebCore {
 
-RefPtr<MediaSourceStates> MediaSourceStates::create(const MediaStreamSourceStates& states)
+RefPtr<MediaSourceStates> MediaSourceStates::create(const RealtimeMediaSourceStates& states)
 {
     return adoptRef(new MediaSourceStates(states));
 }
 
-MediaSourceStates::MediaSourceStates(const MediaStreamSourceStates& states)
+MediaSourceStates::MediaSourceStates(const RealtimeMediaSourceStates& states)
     : m_sourceStates(states)
 {
@@ -46 +46 @@
 const AtomicString& MediaSourceStates::sourceType() const
 {
-    return MediaStreamSourceStates::sourceType(m_sourceStates.sourceType());
+    return RealtimeMediaSourceStates::sourceType(m_sourceStates.sourceType());
 }
 
 const AtomicString& MediaSourceStates::facingMode() const
 {
-    return MediaStreamSourceStates::facingMode(m_sourceStates.facingMode());
+    return RealtimeMediaSourceStates::facingMode(m_sourceStates.facingMode());
 }
 

trunk/Source/WebCore/Modules/mediastream/MediaSourceStates.h

@@ -29 +29 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include "ScriptWrappable.h"
 #include <wtf/Forward.h>
@@ -38 +38 @@
 class MediaSourceStates : public RefCounted<MediaSourceStates>, public ScriptWrappable {
 public:
-    static RefPtr<MediaSourceStates> create(const MediaStreamSourceStates&);
+    static RefPtr<MediaSourceStates> create(const RealtimeMediaSourceStates&);
 
     const AtomicString& sourceType() const;
@@ -49 +49 @@
     unsigned long volume() const { return m_sourceStates.volume(); }
     
-    bool hasVideoSource() const { return m_sourceStates.sourceType() == MediaStreamSourceStates::Camera; }
+    bool hasVideoSource() const { return m_sourceStates.sourceType() == RealtimeMediaSourceStates::Camera; }
 
 private:
-    explicit MediaSourceStates(const MediaStreamSourceStates&);
+    explicit MediaSourceStates(const RealtimeMediaSourceStates&);
 
-    MediaStreamSourceStates m_sourceStates;
+    RealtimeMediaSourceStates m_sourceStates;
 };
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

@@ -36 +36 @@
 #include "MediaStreamCenter.h"
 #include "MediaStreamRegistry.h"
-#include "MediaStreamSource.h"
 #include "MediaStreamTrackEvent.h"
+#include "RealtimeMediaSource.h"
 #include "VideoStreamTrack.h"
 #include <wtf/NeverDestroyed.h>
@@ -45 +45 @@
 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context)
 {
-    return MediaStream::create(context, MediaStreamPrivate::create(Vector<RefPtr<MediaStreamSource>>(), Vector<RefPtr<MediaStreamSource>>()));
+    return MediaStream::create(context, MediaStreamPrivate::create(Vector<RefPtr<RealtimeMediaSource>>(), Vector<RefPtr<RealtimeMediaSource>>()));
 }
 
@@ -217 +217 @@
 }
 
-bool MediaStream::haveTrackWithSource(PassRefPtr<MediaStreamSource> source)
-{
-    if (source->type() == MediaStreamSource::Audio) {
+bool MediaStream::haveTrackWithSource(PassRefPtr<RealtimeMediaSource> source)
+{
+    if (source->type() == RealtimeMediaSource::Audio) {
         for (auto it = m_audioTracks.begin(), end = m_audioTracks.end(); it != end; ++it) {
             if ((*it)->source() == source.get())
@@ -289 +289 @@
 }
 
-void MediaStream::addRemoteSource(MediaStreamSource* source)
+void MediaStream::addRemoteSource(RealtimeMediaSource* source)
 {
     ASSERT(source);
@@ -295 +295 @@
 }
 
-void MediaStream::removeRemoteSource(MediaStreamSource* source)
+void MediaStream::removeRemoteSource(RealtimeMediaSource* source)
 {
     ASSERT(source);
@@ -325 +325 @@
     RefPtr<MediaStreamTrack> track;
     switch (privateTrack->type()) {
-    case MediaStreamSource::Audio:
+    case RealtimeMediaSource::Audio:
         track = AudioStreamTrack::create(*scriptExecutionContext(), *privateTrack);
         break;
-    case MediaStreamSource::Video:
+    case RealtimeMediaSource::Video:
         track = VideoStreamTrack::create(*scriptExecutionContext(), *privateTrack);
         break;
-    case MediaStreamSource::None:
+    case RealtimeMediaSource::None:
         ASSERT_NOT_REACHED();
         break;
@@ -378 +378 @@
 }
 
-Vector<RefPtr<MediaStreamTrack>>* MediaStream::trackVectorForType(MediaStreamSource::Type type)
+Vector<RefPtr<MediaStreamTrack>>* MediaStream::trackVectorForType(RealtimeMediaSource::Type type)
 {
     switch (type) {
-    case MediaStreamSource::Audio:
+    case RealtimeMediaSource::Audio:
         return &m_audioTracks;
-    case MediaStreamSource::Video:
+    case RealtimeMediaSource::Video:
         return &m_videoTracks;
-    case MediaStreamSource::None:
+    case RealtimeMediaSource::None:
         ASSERT_NOT_REACHED();
     }

trunk/Source/WebCore/Modules/mediastream/MediaStream.h

@@ -110 +110 @@
     virtual void trackDidEnd() override final;
     virtual void setStreamIsActive(bool) override final;
-    virtual void addRemoteSource(MediaStreamSource*) override final;
-    virtual void removeRemoteSource(MediaStreamSource*) override final;
+    virtual void addRemoteSource(RealtimeMediaSource*) override final;
+    virtual void removeRemoteSource(RealtimeMediaSource*) override final;
     virtual void addRemoteTrack(MediaStreamTrackPrivate*) override final;
     virtual void removeRemoteTrack(MediaStreamTrackPrivate*) override final;
@@ -118 +118 @@
     bool addTrack(PassRefPtr<MediaStreamTrack>);
 
-    bool haveTrackWithSource(PassRefPtr<MediaStreamSource>);
+    bool haveTrackWithSource(PassRefPtr<RealtimeMediaSource>);
 
     void scheduleDispatchEvent(PassRefPtr<Event>);
@@ -125 +125 @@
     void cloneMediaStreamTrackVector(Vector<RefPtr<MediaStreamTrack>>&, const Vector<RefPtr<MediaStreamTrack>>&);
 
-    Vector<RefPtr<MediaStreamTrack>>* trackVectorForType(MediaStreamSource::Type);
+    Vector<RefPtr<MediaStreamTrack>>* trackVectorForType(RealtimeMediaSource::Type);
 
     RefPtr<MediaStreamPrivate> m_private;

trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.cpp

@@ -34 +34 @@
 #include "CapabilityRange.h"
 #include "MediaSourceStates.h"
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 
 namespace WebCore {
 
-RefPtr<MediaStreamCapabilities> MediaStreamCapabilities::create(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
+RefPtr<MediaStreamCapabilities> MediaStreamCapabilities::create(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
 {
     if (capabilities->hasVideoSource())
@@ -46 +46 @@
 }
 
-MediaStreamCapabilities::MediaStreamCapabilities(PassRefPtr<MediaStreamSourceCapabilities> capabilities)
+MediaStreamCapabilities::MediaStreamCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities> capabilities)
     : m_SourceCapabilities(capabilities)
 {
@@ -59 +59 @@
         return Vector<String>();
     
-    const Vector<MediaStreamSourceStates::SourceType>& sourceTypes = m_SourceCapabilities->sourceTypes();
+    const Vector<RealtimeMediaSourceStates::SourceType>& sourceTypes = m_SourceCapabilities->sourceTypes();
     Vector<String> capabilities;
     capabilities.reserveCapacity(count);
     
     for (size_t i = 0; i < count; ++i)
-        capabilities.append(MediaStreamSourceStates::sourceType(sourceTypes[i]));
+        capabilities.append(RealtimeMediaSourceStates::sourceType(sourceTypes[i]));
     
     return capabilities;
@@ -93 +93 @@
         return Vector<String>();
     
-    const Vector<MediaStreamSourceStates::VideoFacingMode>& facingModes = m_SourceCapabilities->facingModes();
+    const Vector<RealtimeMediaSourceStates::VideoFacingMode>& facingModes = m_SourceCapabilities->facingModes();
     Vector<String> capabilities;
     capabilities.reserveCapacity(count);
     
     for (size_t i = 0; i < count; ++i)
-        capabilities.append(MediaStreamSourceStates::facingMode(facingModes[i]));
+        capabilities.append(RealtimeMediaSourceStates::facingMode(facingModes[i]));
     
     return capabilities;

trunk/Source/WebCore/Modules/mediastream/MediaStreamCapabilities.h

@@ -30 +30 @@
 
 #include "MediaStreamCapabilities.h"
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include "ScriptWrappable.h"
 #include <wtf/RefCounted.h>
@@ -39 +39 @@
 
 class CapabilityRange;
-class MediaStreamSourceCapabilities;
+class RealtimeMediaSourceCapabilities;
 
 class MediaStreamCapabilities : public RefCounted<MediaStreamCapabilities>, public ScriptWrappable {
 public:
-    static RefPtr<MediaStreamCapabilities> create(PassRefPtr<MediaStreamSourceCapabilities>);
+    static RefPtr<MediaStreamCapabilities> create(PassRefPtr<RealtimeMediaSourceCapabilities>);
     virtual ~MediaStreamCapabilities() { }
 
@@ -58 +58 @@
 
 protected:
-    explicit MediaStreamCapabilities(PassRefPtr<MediaStreamSourceCapabilities>);
+    explicit MediaStreamCapabilities(PassRefPtr<RealtimeMediaSourceCapabilities>);
 
-    RefPtr<MediaStreamSourceCapabilities> m_SourceCapabilities;
+    RefPtr<RealtimeMediaSourceCapabilities> m_SourceCapabilities;
 };
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -85 +85 @@
 }
 
-void MediaStreamTrack::setSource(PassRefPtr<MediaStreamSource> newSource)
+void MediaStreamTrack::setSource(PassRefPtr<RealtimeMediaSource> newSource)
 {
     m_privateTrack->setSource(newSource);
@@ -137 +137 @@
 
     switch (m_privateTrack->readyState()) {
-    case MediaStreamSource::Live:
+    case RealtimeMediaSource::Live:
         return live;
-    case MediaStreamSource::New:
+    case RealtimeMediaSource::New:
         return newState;
-    case MediaStreamSource::Ended:
+    case RealtimeMediaSource::Ended:
         return ended;
     }
@@ -173 +173 @@
     // in sync with the track state. A track that is new or has ended always has a source
     // type of "none".
-    RefPtr<MediaStreamSourceCapabilities> sourceCapabilities = m_privateTrack->capabilities();
-    MediaStreamSource::ReadyState readyState = m_privateTrack->readyState();
-    if (readyState == MediaStreamSource::New || readyState == MediaStreamSource::Ended)
-        sourceCapabilities->setSourceType(MediaStreamSourceStates::None);
+    RefPtr<RealtimeMediaSourceCapabilities> sourceCapabilities = m_privateTrack->capabilities();
+    RealtimeMediaSource::ReadyState readyState = m_privateTrack->readyState();
+    if (readyState == RealtimeMediaSource::New || readyState == RealtimeMediaSource::Ended)
+        sourceCapabilities->setSourceType(RealtimeMediaSourceStates::None);
     
     return MediaStreamCapabilities::create(sourceCapabilities.release());
@@ -195 +195 @@
 RefPtr<MediaStreamTrack> MediaStreamTrack::clone()
 {
-    if (m_privateTrack->type() == MediaStreamSource::Audio)
+    if (m_privateTrack->type() == RealtimeMediaSource::Audio)
         return AudioStreamTrack::create(*this);
 
@@ -236 +236 @@
         return;
 
-    MediaStreamSource::ReadyState readyState = m_privateTrack->readyState();
-    if (readyState == MediaStreamSource::Live)
+    RealtimeMediaSource::ReadyState readyState = m_privateTrack->readyState();
+    if (readyState == RealtimeMediaSource::Live)
         scheduleEventDispatch(Event::create(eventNames().startedEvent, false, false));
-    else if (readyState == MediaStreamSource::Ended && !m_stoppingTrack)
+    else if (readyState == RealtimeMediaSource::Ended && !m_stoppingTrack)
         scheduleEventDispatch(Event::create(eventNames().endedEvent, false, false));
 
@@ -278 +278 @@
 void MediaStreamTrack::trackDidEnd()
 {
-    m_privateTrack->setReadyState(MediaStreamSource::Ended);
+    m_privateTrack->setReadyState(RealtimeMediaSource::Ended);
 
     for (Vector<Observer*>::iterator i = m_observers.begin(); i != m_observers.end(); ++i)

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -33 +33 @@
 #include "ActiveDOMObject.h"
 #include "EventTarget.h"
-#include "MediaStreamSource.h"
 #include "MediaStreamTrackPrivate.h"
+#include "RealtimeMediaSource.h"
 #include "ScriptWrappable.h"
 #include <wtf/RefCounted.h>
@@ -91 +91 @@
     DEFINE_ATTRIBUTE_EVENT_LISTENER(overconstrained);
 
-    MediaStreamSource* source() const { return m_privateTrack->source(); }
+    RealtimeMediaSource* source() const { return m_privateTrack->source(); }
     MediaStreamTrackPrivate& privateTrack() { return m_privateTrack.get(); }
 
@@ -110 +110 @@
     MediaStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&, const Dictionary*);
 
-    void setSource(PassRefPtr<MediaStreamSource>);
+    void setSource(PassRefPtr<RealtimeMediaSource>);
 
 private:

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h

@@ -38 +38 @@
 #include "ActiveDOMObject.h"
 #include "MediaStreamCreationClient.h"
-#include "MediaStreamSource.h"
 #include "NavigatorUserMediaErrorCallback.h"
 #include "NavigatorUserMediaSuccessCallback.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>

trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h

@@ -35 +35 @@
 namespace WebCore {
 
-class MediaStreamSource;
+class RealtimeMediaSource;
 class ScriptExecutionContext;
 

trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp

@@ -50 +50 @@
 
     m_source = MediaStreamAudioSource::create();
-    Vector<RefPtr<MediaStreamSource>> audioSources;
+    Vector<RefPtr<RealtimeMediaSource>> audioSources;
     audioSources.append(m_source);
-    m_stream = MediaStream::create(*context->scriptExecutionContext(), MediaStreamPrivate::create(audioSources, Vector<RefPtr<MediaStreamSource>>()));
+    m_stream = MediaStream::create(*context->scriptExecutionContext(), MediaStreamPrivate::create(audioSources, Vector<RefPtr<RealtimeMediaSource>>()));
 
     m_source->setAudioFormat(numberOfChannels, context->sampleRate());
@@ -59 +59 @@
 }
 
-MediaStreamSource* MediaStreamAudioDestinationNode::mediaStreamSource()
+RealtimeMediaSource* MediaStreamAudioDestinationNode::mediaStreamSource()
 {
     return m_source.get();

trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.h

@@ -50 +50 @@
     virtual void reset();
     
-    MediaStreamSource* mediaStreamSource();
+    RealtimeMediaSource* mediaStreamSource();
 
 private:

trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp

@@ -41 +41 @@
 
 MediaStreamAudioSource::MediaStreamAudioSource()
-    : MediaStreamSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), MediaStreamSource::Audio, "MediaStreamAudioDestinationNode")
+    : RealtimeMediaSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), RealtimeMediaSource::Audio, "MediaStreamAudioDestinationNode")
 {
 }
 
-RefPtr<MediaStreamSourceCapabilities> MediaStreamAudioSource::capabilities() const
+RefPtr<RealtimeMediaSourceCapabilities> MediaStreamAudioSource::capabilities() const
 {
     // FIXME: implement this.
@@ -53 +53 @@
 }
 
-const MediaStreamSourceStates& MediaStreamAudioSource::states()
+const RealtimeMediaSourceStates& MediaStreamAudioSource::states()
 {
     // FIXME: implement this.

trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.h

@@ -30 +30 @@
 
 #include "AudioDestinationConsumer.h"
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/RefCounted.h>
 #include <wtf/ThreadingPrimitives.h>
@@ -39 +39 @@
 
 class AudioBus;
-class MediaStreamSourceCapabilities;
+class RealtimeMediaSourceCapabilities;
 
-class MediaStreamAudioSource : public MediaStreamSource {
+class MediaStreamAudioSource : public RealtimeMediaSource {
 public:
     static RefPtr<MediaStreamAudioSource> create();
@@ -49 +49 @@
     virtual bool useIDForTrackID() const { return true; }
 
-    virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const;
-    virtual const MediaStreamSourceStates& states();
+    virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const;
+    virtual const RealtimeMediaSourceStates& states();
     
     const String& deviceId() const { return m_deviceId; }
@@ -68 +68 @@
     Mutex m_audioConsumersLock;
     Vector<RefPtr<AudioDestinationConsumer>> m_audioConsumers;
-    MediaStreamSourceStates m_currentStates;
+    RealtimeMediaSourceStates m_currentStates;
 };
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -73 +73 @@
                 070334D9145A006F008D8D45 /* TrackBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070334D8145A006F008D8D45 /* TrackBase.cpp */; };
                 070334E9145A1F36008D8D45 /* JSTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070334E8145A1F35008D8D45 /* JSTrackCustom.cpp */; };
-                070363D6181A146500C074A5 /* MediaStreamSourceStates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070363D4181A146500C074A5 /* MediaStreamSourceStates.cpp */; };
-                070363D7181A146500C074A5 /* MediaStreamSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363D5181A146500C074A5 /* MediaStreamSourceStates.h */; };
                 070363E0181A1CDC00C074A5 /* AVAudioCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363D8181A1CDC00C074A5 /* AVAudioCaptureSource.h */; };
                 070363E1181A1CDC00C074A5 /* AVAudioCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363D9181A1CDC00C074A5 /* AVAudioCaptureSource.mm */; };
@@ -83 +81 @@
                 070363E6181A1CDC00C074A5 /* AVVideoCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */; };
                 070363E7181A1CDC00C074A5 /* AVVideoCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */; };
-                070584FD17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 070584FB17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 070584FF17F9F05E005F2BCB /* CapabilityRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070584FE17F9F05E005F2BCB /* CapabilityRange.cpp */; };
                 0705850217FA10D0005F2BCB /* JSAllVideoCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705850017FA10D0005F2BCB /* JSAllVideoCapabilities.cpp */; };
@@ -260 +257 @@
                 078E093317D16B0600420AA1 /* MediaStreamCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */; };
                 078E093417D16B0B00420AA1 /* MediaStreamCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                078E093617D16B2100420AA1 /* MediaStreamSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */; };
                 078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                078E093817D16B2C00420AA1 /* MediaStreamSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9F17CF0AD400848E51 /* MediaStreamSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 078E093917D16B2C00420AA1 /* MediaStreamCreationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 078E093A17D16E1C00420AA1 /* MediaConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9917CF0AD400848E51 /* MediaConstraints.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1776 +1771 @@
                 4A4F48A916B0DFC000EDBB29 /* DocumentRuleSets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */; };
                 4A4F48AA16B0DFC000EDBB29 /* DocumentRuleSets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */; };
+                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 */; };
                 4A5A2ADB161E7E00005889DD /* WebSocketExtensionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5A2AD9161E7E00005889DD /* WebSocketExtensionParser.cpp */; };
                 4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */; };
@@ -7017 +7017 @@
                 070334D8145A006F008D8D45 /* TrackBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackBase.cpp; sourceTree = "<group>"; };
                 070334E8145A1F35008D8D45 /* JSTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackCustom.cpp; sourceTree = "<group>"; };
-                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>"; };
                 070363D8181A1CDC00C074A5 /* AVAudioCaptureSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVAudioCaptureSource.h; sourceTree = "<group>"; };
                 070363D9181A1CDC00C074A5 /* AVAudioCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVAudioCaptureSource.mm; sourceTree = "<group>"; };
@@ -7027 +7025 @@
                 070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVVideoCaptureSource.h; sourceTree = "<group>"; };
                 070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVVideoCaptureSource.mm; sourceTree = "<group>"; };
-                070584FB17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamSourceCapabilities.h; sourceTree = "<group>"; };
                 070584FE17F9F05E005F2BCB /* CapabilityRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CapabilityRange.cpp; sourceTree = "<group>"; };
                 0705850017FA10D0005F2BCB /* JSAllVideoCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAllVideoCapabilities.cpp; sourceTree = "<group>"; };
@@ -7152 +7149 @@
                 07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCenter.h; sourceTree = "<group>"; };
                 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamPrivate.h; sourceTree = "<group>"; };
-                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>"; };
                 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCreationClient.h; sourceTree = "<group>"; };
                 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandler.h; sourceTree = "<group>"; };
@@ -8899 +8894 @@
                 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentRuleSets.cpp; sourceTree = "<group>"; };
                 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentRuleSets.h; sourceTree = "<group>"; };
+                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>"; };
                 4A5A2AD9161E7E00005889DD /* WebSocketExtensionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketExtensionParser.cpp; sourceTree = "<group>"; };
                 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketExtensionParser.h; sourceTree = "<group>"; };
@@ -14569 +14569 @@
                         isa = PBXGroup;
                         children = (
+                                4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */,
+                                4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */,
+                                4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */,
+                                4A4F656E1AA997F100E38CDD /* RealtimeMediaSourceStates.cpp */,
+                                4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */,
                                 0729B14D17CFCCA0004F1D60 /* mac */,
                                 07221B9917CF0AD400848E51 /* MediaConstraints.h */,
@@ -14577 +14582 @@
                                 0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */,
                                 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */,
-                                07221B9E17CF0AD400848E51 /* MediaStreamSource.cpp */,
-                                07221B9F17CF0AD400848E51 /* MediaStreamSource.h */,
-                                070584FB17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h */,
-                                070363D4181A146500C074A5 /* MediaStreamSourceStates.cpp */,
-                                070363D5181A146500C074A5 /* MediaStreamSourceStates.h */,
                                 07FFDE66181AED420072D409 /* MediaStreamTrackPrivate.cpp */,
                                 07FFDE67181AED420072D409 /* MediaStreamTrackPrivate.h */,
@@ -23540 +23540 @@
                                 6C568CB119DAFEA000430CA2 /* MaskImageOperation.h in Headers */,
                                 0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
+                                4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */,
                                 93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
                                 1A8F6BBD0DB55CDC001DB794 /* ApplicationCache.h in Headers */,
@@ -24602 +24603 @@
                                 930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */,
                                 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */,
+                                4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */,
                                 BC3BC29C0E91AB0F00835588 /* HostWindow.h in Headers */,
                                 FD31609912B026F700C1A359 /* HRTFDatabase.h in Headers */,
@@ -25590 +25592 @@
                                 078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */,
                                 078E091717D14D1C00420AA1 /* MediaStreamRegistry.h in Headers */,
-                                078E093817D16B2C00420AA1 /* MediaStreamSource.h in Headers */,
-                                070584FD17F9D6DF005F2BCB /* MediaStreamSourceCapabilities.h in Headers */,
-                                070363D7181A146500C074A5 /* MediaStreamSourceStates.h in Headers */,
                                 078E091817D14D1C00420AA1 /* MediaStreamTrack.h in Headers */,
                                 078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */,
@@ -26348 +26347 @@
                                 62C1217D11AB9E77003C462C /* SuspendableTimer.h in Headers */,
                                 B22279740D00BF220071B782 /* SVGAElement.h in Headers */,
+                                4A4F65741AA997F100E38CDD /* RealtimeMediaSourceStates.h in Headers */,
                                 24D912B113CA9A1F00D21915 /* SVGAltGlyphDefElement.h in Headers */,
                                 65653F2E0D9727D200CA9723 /* SVGAltGlyphElement.h in Headers */,
@@ -27738 +27738 @@
                                 BC00F0080E0A185500FD04E3 /* DOMFileList.mm in Sources */,
                                 2ED609BC1145B07100C8684E /* DOMFormData.cpp in Sources */,
+                                4A4F65731AA997F100E38CDD /* RealtimeMediaSourceStates.cpp in Sources */,
                                 0F54DCE11880F901003EEDBB /* DOMGestureEvent.mm in Sources */,
                                 BC1A37B7097C715F0019F3D8 /* DOMHTML.mm in Sources */,
@@ -28596 +28597 @@
                                 511EF2C517F0FD3500E4FA16 /* JSIDBIndex.cpp in Sources */,
                                 511EF2C617F0FD3500E4FA16 /* JSIDBKeyRange.cpp in Sources */,
+                                4A4F65701AA997F100E38CDD /* RealtimeMediaSource.cpp in Sources */,
                                 511EF2C717F0FD3500E4FA16 /* JSIDBObjectStore.cpp in Sources */,
                                 511EF2D117F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp in Sources */,
@@ -29131 +29133 @@
                                 0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */,
                                 078E090117D14CEE00420AA1 /* MediaStreamRegistry.cpp in Sources */,
-                                078E093617D16B2100420AA1 /* MediaStreamSource.cpp in Sources */,
-                                070363D6181A146500C074A5 /* MediaStreamSourceStates.cpp in Sources */,
                                 078E090217D14CEE00420AA1 /* MediaStreamTrack.cpp in Sources */,
                                 078E090317D14CEE00420AA1 /* MediaStreamTrackEvent.cpp in Sources */,

trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h

@@ -35 +35 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -43 +43 @@
 class MediaConstraints;
 class MediaStreamCreationClient;
-class MediaStreamSourceStates;
+class RealtimeMediaSourceStates;
 class MediaStreamTrackSourcesRequestClient;
 

trunk/Source/WebCore/platform/mediastream/MediaStreamConstraintsValidationClient.h

@@ -29 +29 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>

trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h

@@ -29 +29 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp

@@ -44 +44 @@
 namespace WebCore {
 
-PassRefPtr<MediaStreamPrivate> MediaStreamPrivate::create(const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
+PassRefPtr<MediaStreamPrivate> MediaStreamPrivate::create(const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources)
 {
     return adoptRef(new MediaStreamPrivate(createCanonicalUUIDString(), audioSources, videoSources));
@@ -54 +54 @@
 }
 
-void MediaStreamPrivate::addSource(PassRefPtr<MediaStreamSource> prpSource)
-{
-    RefPtr<MediaStreamSource> source = prpSource;
+void MediaStreamPrivate::addSource(PassRefPtr<RealtimeMediaSource> prpSource)
+{
+    RefPtr<RealtimeMediaSource> source = prpSource;
     switch (source->type()) {
-    case MediaStreamSource::Audio:
+    case RealtimeMediaSource::Audio:
         if (m_audioStreamSources.find(source) == notFound)
             m_audioStreamSources.append(source);
         break;
-    case MediaStreamSource::Video:
+    case RealtimeMediaSource::Video:
         if (m_videoStreamSources.find(source) == notFound)
             m_videoStreamSources.append(source);
         break;
-    case MediaStreamSource::None:
+    case RealtimeMediaSource::None:
         ASSERT_NOT_REACHED();
         break;
@@ -72 +72 @@
 }
 
-void MediaStreamPrivate::removeSource(PassRefPtr<MediaStreamSource> source)
+void MediaStreamPrivate::removeSource(PassRefPtr<RealtimeMediaSource> source)
 {
     size_t pos = notFound;
     switch (source->type()) {
-    case MediaStreamSource::Audio:
+    case RealtimeMediaSource::Audio:
         pos = m_audioStreamSources.find(source);
         if (pos == notFound)
@@ -82 +82 @@
         m_audioStreamSources.remove(pos);
         break;
-    case MediaStreamSource::Video:
+    case RealtimeMediaSource::Video:
         pos = m_videoStreamSources.find(source);
         if (pos == notFound)
@@ -88 +88 @@
         m_videoStreamSources.remove(pos);
         break;
-    case MediaStreamSource::None:
+    case RealtimeMediaSource::None:
         ASSERT_NOT_REACHED();
         break;
@@ -94 +94 @@
 }
 
-void MediaStreamPrivate::addRemoteSource(MediaStreamSource* source)
+void MediaStreamPrivate::addRemoteSource(RealtimeMediaSource* source)
 {
     if (m_client)
@@ -102 +102 @@
 }
 
-void MediaStreamPrivate::removeRemoteSource(MediaStreamSource* source)
+void MediaStreamPrivate::removeRemoteSource(RealtimeMediaSource* source)
 {
     if (m_client)
@@ -126 +126 @@
 }
 
-MediaStreamPrivate::MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources)
+MediaStreamPrivate::MediaStreamPrivate(const String& id, const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources)
     : m_client(0)
     , m_id(id)
@@ -178 +178 @@
 {
     RefPtr<MediaStreamTrackPrivate> track = prpTrack;
-    Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == MediaStreamSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
+    Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == RealtimeMediaSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
 
     size_t pos = tracks.find(track);
@@ -191 +191 @@
 void MediaStreamPrivate::removeTrack(PassRefPtr<MediaStreamTrackPrivate> track)
 {
-    Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == MediaStreamSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
+    Vector<RefPtr<MediaStreamTrackPrivate>>& tracks = track->type() == RealtimeMediaSource::Audio ? m_audioPrivateTracks : m_videoPrivateTracks;
 
     size_t pos = tracks.find(track);

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h

@@ -36 +36 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSource.h"
 #include "MediaStreamTrack.h"
 #include "MediaStreamTrackPrivate.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
@@ -51 +51 @@
 
     virtual void setStreamIsActive(bool) = 0;
-    virtual void addRemoteSource(MediaStreamSource*) = 0;
-    virtual void removeRemoteSource(MediaStreamSource*) = 0;
+    virtual void addRemoteSource(RealtimeMediaSource*) = 0;
+    virtual void removeRemoteSource(RealtimeMediaSource*) = 0;
     virtual void addRemoteTrack(MediaStreamTrackPrivate*) = 0;
     virtual void removeRemoteTrack(MediaStreamTrackPrivate*) = 0;
@@ -59 +59 @@
 class MediaStreamPrivate : public RefCounted<MediaStreamPrivate> {
 public:
-    static PassRefPtr<MediaStreamPrivate> create(const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources);
+    static PassRefPtr<MediaStreamPrivate> create(const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources);
     static PassRefPtr<MediaStreamPrivate> create(const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks);
 
@@ -70 +70 @@
 
     unsigned numberOfAudioSources() const { return m_audioStreamSources.size(); }
-    MediaStreamSource* audioSources(unsigned index) const { return m_audioStreamSources[index].get(); }
+    RealtimeMediaSource* audioSources(unsigned index) const { return m_audioStreamSources[index].get(); }
 
     unsigned numberOfVideoSources() const { return m_videoStreamSources.size(); }
-    MediaStreamSource* videoSources(unsigned index) const { return m_videoStreamSources[index].get(); }
+    RealtimeMediaSource* videoSources(unsigned index) const { return m_videoStreamSources[index].get(); }
 
     unsigned numberOfAudioTracks() const { return m_audioPrivateTracks.size(); }
@@ -81 +81 @@
     MediaStreamTrackPrivate* videoTracks(unsigned index) const { return m_videoPrivateTracks[index].get(); }
 
-    void addSource(PassRefPtr<MediaStreamSource>);
-    void removeSource(PassRefPtr<MediaStreamSource>);
+    void addSource(PassRefPtr<RealtimeMediaSource>);
+    void removeSource(PassRefPtr<RealtimeMediaSource>);
 
-    void addRemoteSource(MediaStreamSource*);
-    void removeRemoteSource(MediaStreamSource*);
+    void addRemoteSource(RealtimeMediaSource*);
+    void removeRemoteSource(RealtimeMediaSource*);
 
     bool active() const { return m_isActive; }
@@ -97 +97 @@
 
 private:
-    MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamSource>>& audioSources, const Vector<RefPtr<MediaStreamSource>>& videoSources);
+    MediaStreamPrivate(const String& id, const Vector<RefPtr<RealtimeMediaSource>>& audioSources, const Vector<RefPtr<RealtimeMediaSource>>& videoSources);
     MediaStreamPrivate(const String& id, const Vector<RefPtr<MediaStreamTrackPrivate>>& audioPrivateTracks, const Vector<RefPtr<MediaStreamTrackPrivate>>& videoPrivateTracks);
 
     MediaStreamPrivateClient* m_client;
     String m_id;
-    Vector<RefPtr<MediaStreamSource>> m_audioStreamSources;
-    Vector<RefPtr<MediaStreamSource>> m_videoStreamSources;
+    Vector<RefPtr<RealtimeMediaSource>> m_audioStreamSources;
+    Vector<RefPtr<RealtimeMediaSource>> m_videoStreamSources;
 
     Vector<RefPtr<MediaStreamTrackPrivate>> m_audioPrivateTracks;

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp

@@ -37 +37 @@
 namespace WebCore {
 
-PassRefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(PassRefPtr<MediaStreamSource> source)
+PassRefPtr<MediaStreamTrackPrivate> MediaStreamTrackPrivate::create(PassRefPtr<RealtimeMediaSource> source)
 {
     return adoptRef(new MediaStreamTrackPrivate(source));
@@ -56 +56 @@
 }
 
-MediaStreamTrackPrivate::MediaStreamTrackPrivate(PassRefPtr<MediaStreamSource> source)
+MediaStreamTrackPrivate::MediaStreamTrackPrivate(PassRefPtr<RealtimeMediaSource> source)
     : m_source(nullptr)
     , m_client(nullptr)
-    , m_readyState(MediaStreamSource::New)
+    , m_readyState(RealtimeMediaSource::New)
     , m_muted(false)
     , m_enabled(true)
@@ -75 +75 @@
 }
 
-void MediaStreamTrackPrivate::setSource(PassRefPtr<MediaStreamSource> source)
+void MediaStreamTrackPrivate::setSource(PassRefPtr<RealtimeMediaSource> source)
 {
     if (m_source)
@@ -117 +117 @@
 bool MediaStreamTrackPrivate::ended() const
 {
-    return m_stopped || (m_source && m_source->readyState() == MediaStreamSource::Ended);
+    return m_stopped || (m_source && m_source->readyState() == RealtimeMediaSource::Ended);
 }
 
@@ -184 +184 @@
         m_source->stop();
 
-    setReadyState(MediaStreamSource::Ended);
+    setReadyState(RealtimeMediaSource::Ended);
     m_stopped = true;
 }
 
-MediaStreamSource::ReadyState MediaStreamTrackPrivate::readyState() const
+RealtimeMediaSource::ReadyState MediaStreamTrackPrivate::readyState() const
 {
     if (m_stopped)
-        return MediaStreamSource::Ended;
+        return RealtimeMediaSource::Ended;
 
     return m_readyState;
 }
 
-void MediaStreamTrackPrivate::setReadyState(MediaStreamSource::ReadyState state)
-{
-    if (m_readyState == MediaStreamSource::Ended || m_readyState == state)
-        return;
-
-    MediaStreamSource::ReadyState oldState = m_readyState;
+void MediaStreamTrackPrivate::setReadyState(RealtimeMediaSource::ReadyState state)
+{
+    if (m_readyState == RealtimeMediaSource::Ended || m_readyState == state)
+        return;
+
+    RealtimeMediaSource::ReadyState oldState = m_readyState;
     m_readyState = state;
 
@@ -207 +207 @@
         return;
 
-    if ((m_readyState == MediaStreamSource::Live && oldState == MediaStreamSource::New) || m_readyState == MediaStreamSource::Ended)
+    if ((m_readyState == RealtimeMediaSource::Live && oldState == RealtimeMediaSource::New) || m_readyState == RealtimeMediaSource::Ended)
         m_client->trackReadyStateChanged();
 }
@@ -222 +222 @@
 }
 
-const MediaStreamSourceStates& MediaStreamTrackPrivate::states() const
+const RealtimeMediaSourceStates& MediaStreamTrackPrivate::states() const
 {
     if (!m_source) {
-        DEPRECATED_DEFINE_STATIC_LOCAL(const MediaStreamSourceStates, noState, ());
+        DEPRECATED_DEFINE_STATIC_LOCAL(const RealtimeMediaSourceStates, noState, ());
         return noState;
     }
@@ -232 +232 @@
 }
 
-MediaStreamSource::Type MediaStreamTrackPrivate::type() const
-{
-    if (!m_source)
-        return MediaStreamSource::None;
+RealtimeMediaSource::Type MediaStreamTrackPrivate::type() const
+{
+    if (!m_source)
+        return RealtimeMediaSource::None;
 
     return m_source->type();
 }
 
-RefPtr<MediaStreamSourceCapabilities> MediaStreamTrackPrivate::capabilities() const
+RefPtr<RealtimeMediaSourceCapabilities> MediaStreamTrackPrivate::capabilities() const
 {
     if (!m_source)

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h

@@ -29 +29 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -37 +37 @@
 
 class MediaSourceStates;
-class MediaStreamSourceCapabilities;
+class RealtimeMediaSourceCapabilities;
 
 class MediaStreamTrackPrivateClient {
@@ -48 +48 @@
 };
 
-class MediaStreamTrackPrivate : public RefCounted<MediaStreamTrackPrivate>, public MediaStreamSource::Observer {
+class MediaStreamTrackPrivate : public RefCounted<MediaStreamTrackPrivate>, public RealtimeMediaSource::Observer {
 public:
-    static PassRefPtr<MediaStreamTrackPrivate> create(PassRefPtr<MediaStreamSource>);
+    static PassRefPtr<MediaStreamTrackPrivate> create(PassRefPtr<RealtimeMediaSource>);
 
     virtual ~MediaStreamTrackPrivate();
@@ -68 +68 @@
     void setEnabled(bool);
 
-    void setReadyState(MediaStreamSource::ReadyState);
-    MediaStreamSource::ReadyState readyState() const;
+    void setReadyState(RealtimeMediaSource::ReadyState);
+    RealtimeMediaSource::ReadyState readyState() const;
 
     RefPtr<MediaStreamTrackPrivate> clone();
 
-    MediaStreamSource* source() const { return m_source.get(); }
-    void setSource(PassRefPtr<MediaStreamSource>);
+    RealtimeMediaSource* source() const { return m_source.get(); }
+    void setSource(PassRefPtr<RealtimeMediaSource>);
 
     enum StopBehavior { StopTrackAndStopSource, StopTrackOnly };
@@ -82 +82 @@
     void setClient(MediaStreamTrackPrivateClient* client) { m_client = client; }
 
-    MediaStreamSource::Type type() const;
+    RealtimeMediaSource::Type type() const;
 
-    const MediaStreamSourceStates& states() const;
-    RefPtr<MediaStreamSourceCapabilities> capabilities() const;
+    const RealtimeMediaSourceStates& states() const;
+    RefPtr<RealtimeMediaSourceCapabilities> capabilities() const;
 
     RefPtr<MediaConstraints> constraints() const;
@@ -94 +94 @@
 protected:
     explicit MediaStreamTrackPrivate(const MediaStreamTrackPrivate&);
-    MediaStreamTrackPrivate(PassRefPtr<MediaStreamSource>);
+    MediaStreamTrackPrivate(PassRefPtr<RealtimeMediaSource>);
 
 private:
     MediaStreamTrackPrivateClient* client() const { return m_client; }
 
-    // MediaStreamSourceObserver
+    // RealtimeMediaSourceObserver
     virtual void sourceReadyStateChanged() override final;
     virtual void sourceMutedChanged() override final;
@@ -105 +105 @@
     virtual bool observerIsEnabled() override final;
     
-    RefPtr<MediaStreamSource> m_source;
+    RefPtr<RealtimeMediaSource> m_source;
     MediaStreamTrackPrivateClient* m_client;
     RefPtr<MediaConstraints> m_constraints;
-    MediaStreamSource::ReadyState m_readyState;
+    RealtimeMediaSource::ReadyState m_readyState;
     mutable String m_id;
 

trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h

@@ -40 +40 @@
 namespace WebCore {
 
-class MediaStreamSource;
+class RealtimeMediaSource;
 class RTCConfigurationPrivate;
 class RTCDTMFSenderHandler;
@@ -96 +96 @@
     virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;
     virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) = 0;
-    virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) = 0;
+    virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<RealtimeMediaSource>) = 0;
     virtual void stop() = 0;
 };

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

@@ -34 +34 @@
 
 #if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 
 #include "MediaStreamCenter.h"
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include "UUID.h"
 
 namespace WebCore {
 
-MediaStreamSource::MediaStreamSource(const String& id, Type type, const String& name)
+RealtimeMediaSource::RealtimeMediaSource(const String& id, Type type, const String& name)
     : m_id(id)
     , m_type(type)
@@ -59 +58 @@
 }
 
-void MediaStreamSource::reset()
+void RealtimeMediaSource::reset()
 {
     m_readyState = New;
@@ -68 +67 @@
 }
 
-void MediaStreamSource::setReadyState(ReadyState readyState)
+void RealtimeMediaSource::setReadyState(ReadyState readyState)
 {
     if (m_readyState == Ended || m_readyState == readyState)
@@ -87 +86 @@
 }
 
-void MediaStreamSource::addObserver(MediaStreamSource::Observer* observer)
+void RealtimeMediaSource::addObserver(RealtimeMediaSource::Observer* observer)
 {
     m_observers.append(observer);
 }
 
-void MediaStreamSource::removeObserver(MediaStreamSource::Observer* observer)
+void RealtimeMediaSource::removeObserver(RealtimeMediaSource::Observer* observer)
 {
     size_t pos = m_observers.find(observer);
@@ -102 +101 @@
 }
 
-void MediaStreamSource::setMuted(bool muted)
+void RealtimeMediaSource::setMuted(bool muted)
 {
     if (m_muted == muted)
@@ -116 +115 @@
 }
 
-void MediaStreamSource::setEnabled(bool enabled)
+void RealtimeMediaSource::setEnabled(bool enabled)
 {
     if (!enabled) {
@@ -143 +142 @@
 }
 
-bool MediaStreamSource::readonly() const
+bool RealtimeMediaSource::readonly() const
 {
     return m_readonly;
 }
 
-void MediaStreamSource::stop()
+void RealtimeMediaSource::stop()
 {
     // This is called from the track.stop() method, which should "Permanently stop the generation of data

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h

@@ -32 +32 @@
  */
 
-#ifndef MediaStreamSource_h
-#define MediaStreamSource_h
+#ifndef RealtimeMediaSource_h
+#define RealtimeMediaSource_h
 
 #if ENABLE(MEDIA_STREAM)
 
 #include "MediaConstraints.h"
-#include "MediaStreamSourceCapabilities.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
@@ -48 +48 @@
 class MediaConstraints;
 class MediaStreamPrivate;
-class MediaStreamSourceStates;
+class RealtimeMediaSourceStates;
 
-class MediaStreamSource : public RefCounted<MediaStreamSource> {
+class RealtimeMediaSource : public RefCounted<RealtimeMediaSource> {
 public:
     class Observer {
@@ -65 +65 @@
     };
 
-    virtual ~MediaStreamSource() { }
+    virtual ~RealtimeMediaSource() { }
 
     bool isAudioStreamSource() const { return type() == Audio; }
@@ -78 +78 @@
     virtual void setName(const String& name) { m_name = name; }
 
-    virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const = 0;
-    virtual const MediaStreamSourceStates& states() = 0;
+    virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const = 0;
+    virtual const RealtimeMediaSourceStates& states() = 0;
     
     enum ReadyState { New = 0, Live = 1, Ended = 2 };
@@ -108 +108 @@
 
 protected:
-    MediaStreamSource(const String& id, Type, const String& name);
+    RealtimeMediaSource(const String& id, Type, const String& name);
 
 private:
@@ -127 +127 @@
 #endif // ENABLE(MEDIA_STREAM)
 
-#endif // MediaStreamSource_h
+#endif // RealtimeMediaSource_h

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h

@@ -24 +24 @@
  */
 
-#ifndef MediaStreamSourceCapabilities_h
-#define MediaStreamSourceCapabilities_h
+#ifndef RealtimeMediaSourceCapabilities_h
+#define RealtimeMediaSourceCapabilities_h
 
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamSourceStates.h"
+#include "RealtimeMediaSourceStates.h"
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
@@ -36 +36 @@
 namespace WebCore {
 
-class MediaStreamSourceCapabilityRange {
+class RealtimeMediaSourceCapabilityRange {
 public:
     
-    MediaStreamSourceCapabilityRange(float min, float max, bool supported = true)
+    RealtimeMediaSourceCapabilityRange(float min, float max, bool supported = true)
         : m_type(Float)
     {
@@ -47 +47 @@
     }
     
-    MediaStreamSourceCapabilityRange(unsigned long min, unsigned long max, bool supported = true)
+    RealtimeMediaSourceCapabilityRange(unsigned long min, unsigned long max, bool supported = true)
         : m_type(ULong)
     {
@@ -55 +55 @@
     }
     
-    MediaStreamSourceCapabilityRange()
+    RealtimeMediaSourceCapabilityRange()
     {
         m_type = Undefined;
@@ -82 +82 @@
 };
 
-class MediaStreamSourceCapabilities : public RefCounted<MediaStreamSourceCapabilities> {
+class RealtimeMediaSourceCapabilities : public RefCounted<RealtimeMediaSourceCapabilities> {
 public:
-    static PassRefPtr<MediaStreamSourceCapabilities> create()
+    static PassRefPtr<RealtimeMediaSourceCapabilities> create()
     {
-        return adoptRef(new MediaStreamSourceCapabilities());
+        return adoptRef(new RealtimeMediaSourceCapabilities());
     }
 
-    ~MediaStreamSourceCapabilities() { }
+    ~RealtimeMediaSourceCapabilities() { }
 
-    const Vector<MediaStreamSourceStates::SourceType>& sourceTypes() { return m_sourceType; }
-    void setSourceType(MediaStreamSourceStates::SourceType sourceType) { m_sourceType.resizeToFit(1); addSourceType(sourceType); }
-    void addSourceType(MediaStreamSourceStates::SourceType sourceType)
+    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 == MediaStreamSourceStates::Camera)
+        if (sourceType == RealtimeMediaSourceStates::Camera)
             m_videoSource = true;
         m_sourceType.append(sourceType);
@@ -103 +103 @@
     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 Vector<RealtimeMediaSourceStates::VideoFacingMode>& facingModes() { return m_facingMode; }
+    void addFacingMode(RealtimeMediaSourceStates::VideoFacingMode mode) { m_facingMode.append(mode); }
 
-    const MediaStreamSourceCapabilityRange& width() { return m_width; }
-    void setWidthRange(const MediaStreamSourceCapabilityRange& width) { m_width = width; }
+    const RealtimeMediaSourceCapabilityRange& width() { return m_width; }
+    void setWidthRange(const RealtimeMediaSourceCapabilityRange& width) { m_width = width; }
 
-    const MediaStreamSourceCapabilityRange& height() { return m_height; }
-    void setHeightRange(const MediaStreamSourceCapabilityRange& height) { m_height = height; }
+    const RealtimeMediaSourceCapabilityRange& height() { return m_height; }
+    void setHeightRange(const RealtimeMediaSourceCapabilityRange& height) { m_height = height; }
 
-    const MediaStreamSourceCapabilityRange& frameRate() { return m_frameRate; }
-    void setFrameRateRange(const MediaStreamSourceCapabilityRange& frameRate) { m_frameRate = frameRate; }
+    const RealtimeMediaSourceCapabilityRange& frameRate() { return m_frameRate; }
+    void setFrameRateRange(const RealtimeMediaSourceCapabilityRange& frameRate) { m_frameRate = frameRate; }
 
-    const MediaStreamSourceCapabilityRange& aspectRatio() { return m_aspectRatio; }
-    void setAspectRatioRange(const MediaStreamSourceCapabilityRange& aspectRatio) { m_aspectRatio = aspectRatio; }
+    const RealtimeMediaSourceCapabilityRange& aspectRatio() { return m_aspectRatio; }
+    void setAspectRatioRange(const RealtimeMediaSourceCapabilityRange& aspectRatio) { m_aspectRatio = aspectRatio; }
 
-    const MediaStreamSourceCapabilityRange& volume() { return m_volume; }
-    void setVolumeRange(const MediaStreamSourceCapabilityRange& volume) { m_volume = volume; }
+    const RealtimeMediaSourceCapabilityRange& volume() { return m_volume; }
+    void setVolumeRange(const RealtimeMediaSourceCapabilityRange& volume) { m_volume = volume; }
 
     bool hasVideoSource() { return m_videoSource; }
@@ -125 +125 @@
 
 private:
-    MediaStreamSourceCapabilities()
+    RealtimeMediaSourceCapabilities()
         : m_videoSource(false)
     {
@@ -131 +131 @@
 
     Vector<AtomicString> m_sourceId;
-    Vector<MediaStreamSourceStates::SourceType> m_sourceType;
-    Vector<MediaStreamSourceStates::VideoFacingMode> m_facingMode;
+    Vector<RealtimeMediaSourceStates::SourceType> m_sourceType;
+    Vector<RealtimeMediaSourceStates::VideoFacingMode> m_facingMode;
 
-    MediaStreamSourceCapabilityRange m_width;
-    MediaStreamSourceCapabilityRange m_height;
-    MediaStreamSourceCapabilityRange m_frameRate;
-    MediaStreamSourceCapabilityRange m_aspectRatio;
-    MediaStreamSourceCapabilityRange m_volume;
+    RealtimeMediaSourceCapabilityRange m_width;
+    RealtimeMediaSourceCapabilityRange m_height;
+    RealtimeMediaSourceCapabilityRange m_frameRate;
+    RealtimeMediaSourceCapabilityRange m_aspectRatio;
+    RealtimeMediaSourceCapabilityRange m_volume;
 
     bool m_videoSource;
@@ -145 +145 @@
 } // namespace WebCore
 
-#endif // MediaStreamSourceCapabilities_h
+#endif // RealtimeMediaSourceCapabilities_h
 
 #endif

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.cpp

@@ -32 +32 @@
 
 #if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamSourceStates.h"
+#include "RealtimeMediaSourceStates.h"
 
 #include <wtf/NeverDestroyed.h>
@@ -39 +38 @@
 namespace WebCore {
 
-const AtomicString& MediaStreamSourceStates::facingMode(MediaStreamSourceStates::VideoFacingMode mode)
+const AtomicString& RealtimeMediaSourceStates::facingMode(RealtimeMediaSourceStates::VideoFacingMode mode)
 {
     static NeverDestroyed<AtomicString> userFacing("user", AtomicString::ConstructFromLiteral);
@@ -47 +46 @@
     
     switch (mode) {
-    case MediaStreamSourceStates::User:
+    case RealtimeMediaSourceStates::User:
         return userFacing;
-    case MediaStreamSourceStates::Environment:
+    case RealtimeMediaSourceStates::Environment:
         return environmentFacing;
-    case MediaStreamSourceStates::Left:
+    case RealtimeMediaSourceStates::Left:
         return leftFacing;
-    case MediaStreamSourceStates::Right:
+    case RealtimeMediaSourceStates::Right:
         return rightFacing;
-    case MediaStreamSourceStates::Unknown:
+    case RealtimeMediaSourceStates::Unknown:
         return emptyAtom;
     }
@@ -63 +62 @@
 }
 
-const AtomicString& MediaStreamSourceStates::sourceType(MediaStreamSourceStates::SourceType sourceType)
+const AtomicString& RealtimeMediaSourceStates::sourceType(RealtimeMediaSourceStates::SourceType sourceType)
 {
     static NeverDestroyed<AtomicString> none("none", AtomicString::ConstructFromLiteral);
@@ -70 +69 @@
     
     switch (sourceType) {
-    case MediaStreamSourceStates::None:
+    case RealtimeMediaSourceStates::None:
         return none;
-    case MediaStreamSourceStates::Camera:
+    case RealtimeMediaSourceStates::Camera:
         return camera;
-    case MediaStreamSourceStates::Microphone:
+    case RealtimeMediaSourceStates::Microphone:
         return microphone;
     }

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceStates.h

@@ -24 +24 @@
  */
 
-#ifndef MediaStreamSourceStates_h
-#define MediaStreamSourceStates_h
+#ifndef RealtimeMediaSourceStates_h
+#define RealtimeMediaSourceStates_h
 
 #if ENABLE(MEDIA_STREAM)
@@ -35 +35 @@
 namespace WebCore {
 
-class MediaStreamSourceStates {
+class RealtimeMediaSourceStates {
 public:
     enum SourceType { None, Camera, Microphone };
     enum VideoFacingMode { Unknown, User, Environment, Left, Right };
 
-    MediaStreamSourceStates()
+    RealtimeMediaSourceStates()
         : m_sourceType(None)
         , m_facingMode(Unknown)
@@ -51 +51 @@
     }
 
-    static const AtomicString& sourceType(MediaStreamSourceStates::SourceType);
-    static const AtomicString& facingMode(MediaStreamSourceStates::VideoFacingMode);
+    static const AtomicString& sourceType(RealtimeMediaSourceStates::SourceType);
+    static const AtomicString& facingMode(RealtimeMediaSourceStates::VideoFacingMode);
 
     SourceType sourceType() const { return m_sourceType; }
@@ -91 +91 @@
 } // namespace WebCore
 
-#endif // MediaStreamSourceStates_h
+#endif // RealtimeMediaSourceStates_h
 
 #endif

trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp

@@ -38 +38 @@
 #include "MediaStreamCreationClient.h"
 #include "MediaStreamPrivate.h"
-#include "MediaStreamSourceCapabilities.h"
 #include "MediaStreamTrackSourcesRequestClient.h"
 #include "NotImplemented.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include <wtf/MainThread.h>
 
@@ -74 +74 @@
     ASSERT(client);
 
-    Vector<RefPtr<MediaStreamSource>> audioSources;
-    Vector<RefPtr<MediaStreamSource>> videoSources;
+    Vector<RefPtr<RealtimeMediaSource>> audioSources;
+    Vector<RefPtr<RealtimeMediaSource>> videoSources;
     // FIXME: fill source vectors, see bug #110150.
     client->didCreateStream(MediaStreamPrivate::create(audioSources, videoSources));

trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h

@@ -43 +43 @@
 
 class MediaStreamPrivate;
-class MediaStreamSource;
+class RealtimeMediaSource;
 class MediaStreamSourcesQueryClient;
 

trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.h

@@ -43 +43 @@
     virtual ~AVAudioCaptureSource();
     
-    virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const override;
+    virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const override;
     virtual void captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutput*, CMSampleBufferRef, AVCaptureConnection*) override;
     

trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm

@@ -32 +32 @@
 #import "Logging.h"
 #import "MediaConstraints.h"
-#import "MediaStreamSourceStates.h"
 #import "NotImplemented.h"
+#import "RealtimeMediaSourceStates.h"
 #import "SoftLinking.h"
 #import <AVFoundation/AVFoundation.h>
@@ -64 +64 @@
     
 AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraints)
-    : AVMediaCaptureSource(device, id, MediaStreamSource::Audio, constraints)
+    : AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio, constraints)
 {
     currentStates()->setSourceId(id);
-    currentStates()->setSourceType(MediaStreamSourceStates::Microphone);
+    currentStates()->setSourceType(RealtimeMediaSourceStates::Microphone);
 }
     
@@ -74 +74 @@
 }
 
-RefPtr<MediaStreamSourceCapabilities> AVAudioCaptureSource::capabilities() const
+RefPtr<RealtimeMediaSourceCapabilities> AVAudioCaptureSource::capabilities() const
 {
     notImplemented();

trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h

@@ -30 +30 @@
 
 #include "MediaStreamCenter.h"
-#include "MediaStreamSource.h"
 #include "MediaStreamTrackSourcesRequestClient.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
@@ -50 +50 @@
 
     Vector<RefPtr<TrackSourceInfo>> getSourcesInfo(const String&);
-    bool verifyConstraintsForMediaType(MediaStreamSource::Type, MediaConstraints*, String&);
-    RefPtr<MediaStreamSource> bestSourceForTypeAndConstraints(MediaStreamSource::Type, PassRefPtr<MediaConstraints>);
+    bool verifyConstraintsForMediaType(RealtimeMediaSource::Type, MediaConstraints*, String&);
+    RefPtr<RealtimeMediaSource> bestSourceForTypeAndConstraints(RealtimeMediaSource::Type, PassRefPtr<MediaConstraints>);
 
     enum ValidConstraints { Width = 0, Height, FrameRate, FacingMode, Gain };
@@ -57 +57 @@
     static const Vector<AtomicString>& validFacingModes();
 
-    static bool deviceSupportsFacingMode(AVCaptureDevice*, MediaStreamSourceStates::VideoFacingMode);
-    static bool isValidConstraint(MediaStreamSource::Type, const String&);
+    static bool deviceSupportsFacingMode(AVCaptureDevice*, RealtimeMediaSourceStates::VideoFacingMode);
+    static bool isValidConstraint(RealtimeMediaSource::Type, const String&);
     static String bestSessionPresetForVideoSize(AVCaptureSession*, int width, int height);
 
@@ -69 +69 @@
     ~AVCaptureDeviceManager();
 
-    CaptureDevice* bestDeviceForFacingMode(MediaStreamSourceStates::VideoFacingMode);
-    bool sessionSupportsConstraint(AVCaptureSession*, MediaStreamSource::Type, const String& name, const String& value);
+    CaptureDevice* bestDeviceForFacingMode(RealtimeMediaSourceStates::VideoFacingMode);
+    bool sessionSupportsConstraint(AVCaptureSession*, RealtimeMediaSource::Type, const String& name, const String& value);
 
     RetainPtr<WebCoreAVCaptureDeviceManagerObserver> m_objcObserver;

trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm

@@ -35 +35 @@
 #import "Logging.h"
 #import "MediaConstraints.h"
-#import "MediaStreamSource.h"
-#import "MediaStreamSourceStates.h"
+#import "RealtimeMediaSource.h"
+#import "RealtimeMediaSourceStates.h"
 #import "SoftLinking.h"
 #import "UUID.h"
@@ -222 +222 @@
 }
 
-bool AVCaptureDeviceManager::deviceSupportsFacingMode(AVCaptureDeviceType *device, MediaStreamSourceStates::VideoFacingMode facingMode)
+bool AVCaptureDeviceManager::deviceSupportsFacingMode(AVCaptureDeviceType *device, RealtimeMediaSourceStates::VideoFacingMode facingMode)
 {
     if (![device hasMediaType:AVMediaTypeVideo])
@@ -228 +228 @@
     
     switch (facingMode) {
-    case MediaStreamSourceStates::User:
+    case RealtimeMediaSourceStates::User:
         if ([device position] == AVCaptureDevicePositionFront)
             return true;
         break;
-    case MediaStreamSourceStates::Environment:
+    case RealtimeMediaSourceStates::Environment:
         if ([device position] == AVCaptureDevicePositionBack)
             return true;
         break;
-    case MediaStreamSourceStates::Left:
-    case MediaStreamSourceStates::Right:
-    case MediaStreamSourceStates::Unknown:
+    case RealtimeMediaSourceStates::Left:
+    case RealtimeMediaSourceStates::Right:
+    case RealtimeMediaSourceStates::Unknown:
         return false;
     }
@@ -245 +245 @@
 }
 
-CaptureDevice* AVCaptureDeviceManager::bestDeviceForFacingMode(MediaStreamSourceStates::VideoFacingMode facingMode)
+CaptureDevice* AVCaptureDeviceManager::bestDeviceForFacingMode(RealtimeMediaSourceStates::VideoFacingMode facingMode)
 {
     Vector<CaptureDevice>& devices = captureDeviceList();
@@ -261 +261 @@
 }
 
-bool AVCaptureDeviceManager::sessionSupportsConstraint(AVCaptureSessionType *session, MediaStreamSource::Type type, const String& name, const String& value)
+bool AVCaptureDeviceManager::sessionSupportsConstraint(AVCaptureSessionType *session, RealtimeMediaSource::Type type, const String& name, const String& value)
 {
     size_t constraint = validConstraintNames().find(name);
@@ -269 +269 @@
     switch (constraint) {
     case Width:
-        if (type == MediaStreamSource::Audio)
+        if (type == RealtimeMediaSource::Audio)
             return false;
 
         return !bestSessionPresetForVideoSize(session, value.toInt(), 0).isEmpty();
     case Height:
-        if (type == MediaStreamSource::Audio)
+        if (type == RealtimeMediaSource::Audio)
             return false;
 
         return !bestSessionPresetForVideoSize(session, 0, value.toInt()).isEmpty();
     case FrameRate: {
-        if (type == MediaStreamSource::Audio)
+        if (type == RealtimeMediaSource::Audio)
             return false;
         
@@ -288 +288 @@
     }
     case Gain: {
-        if (type != MediaStreamSource::Audio)
+        if (type != RealtimeMediaSource::Audio)
             return false;
         
@@ -295 +295 @@
     }
     case FacingMode: {
-        if (type == MediaStreamSource::Audio)
+        if (type == RealtimeMediaSource::Audio)
             return false;
 
@@ -301 +301 @@
         if (facingMode != notFound)
             return false;
-        return bestDeviceForFacingMode(static_cast<MediaStreamSourceStates::VideoFacingMode>(facingMode));
+        return bestDeviceForFacingMode(static_cast<RealtimeMediaSourceStates::VideoFacingMode>(facingMode));
     }
     }
@@ -308 +308 @@
 }
 
-bool AVCaptureDeviceManager::isValidConstraint(MediaStreamSource::Type type, const String& name)
+bool AVCaptureDeviceManager::isValidConstraint(RealtimeMediaSource::Type type, const String& name)
 {
     size_t constraint = validConstraintNames().find(name);
@@ -315 +315 @@
 
     if (constraint == Gain)
-        return type == MediaStreamSource::Audio;
+        return type == RealtimeMediaSource::Audio;
 
     return true;
@@ -348 +348 @@
 }
 
-bool AVCaptureDeviceManager::verifyConstraintsForMediaType(MediaStreamSource::Type type, MediaConstraints* constraints, String& invalidConstraint)
+bool AVCaptureDeviceManager::verifyConstraintsForMediaType(RealtimeMediaSource::Type type, MediaConstraints* constraints, String& invalidConstraint)
 {
     if (!isAvailable())
@@ -385 +385 @@
 }
 
-RefPtr<MediaStreamSource> AVCaptureDeviceManager::bestSourceForTypeAndConstraints(MediaStreamSource::Type type, PassRefPtr<MediaConstraints> constraints)
+RefPtr<RealtimeMediaSource> AVCaptureDeviceManager::bestSourceForTypeAndConstraints(RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
 {
     if (!isAvailable())
@@ -398 +398 @@
         // FIXME: consider the constraints when choosing among multiple devices. For now just select the first available
         // device of the appropriate type.
-        if (type == MediaStreamSource::Audio && !devices[i].m_audioSourceId.isEmpty()) {
+        if (type == RealtimeMediaSource::Audio && !devices[i].m_audioSourceId.isEmpty()) {
             if (!devices[i].m_audioSource) {
                 AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:devices[i].m_captureDeviceID];
@@ -404 +404 @@
                 devices[i].m_audioSource = AVAudioCaptureSource::create(device, devices[i].m_audioSourceId, constraints);
             }
-            devices[i].m_audioSource->setReadyState(MediaStreamSource::Live);
+            devices[i].m_audioSource->setReadyState(RealtimeMediaSource::Live);
             return devices[i].m_audioSource;
         }
 
-        if (type == MediaStreamSource::Video && !devices[i].m_videoSourceId.isEmpty()) {
+        if (type == RealtimeMediaSource::Video && !devices[i].m_videoSourceId.isEmpty()) {
             if (!devices[i].m_videoSource) {
                 AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:devices[i].m_captureDeviceID];
@@ -414 +414 @@
                 devices[i].m_videoSource = AVVideoCaptureSource::create(device, devices[i].m_videoSourceId, constraints);
             }
-            devices[i].m_videoSource->setReadyState(MediaStreamSource::Live);
+            devices[i].m_videoSource->setReadyState(RealtimeMediaSource::Live);
             return devices[i].m_videoSource;
         }
@@ -479 +479 @@
     
     if (!modes.size()) {
-        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));
+        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));
     }
     

trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h

@@ -29 +29 @@
 #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
 
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/RetainPtr.h>
 
@@ -44 +44 @@
 namespace WebCore {
 
-class AVMediaCaptureSource : public MediaStreamSource {
+class AVMediaCaptureSource : public RealtimeMediaSource {
 public:
     virtual ~AVMediaCaptureSource();
@@ -53 +53 @@
 
 protected:
-    AVMediaCaptureSource(AVCaptureDevice*, const AtomicString&, MediaStreamSource::Type, PassRefPtr<MediaConstraints>);
+    AVMediaCaptureSource(AVCaptureDevice*, const AtomicString&, RealtimeMediaSource::Type, PassRefPtr<MediaConstraints>);
 
-    virtual const MediaStreamSourceStates& states() override;
+    virtual const RealtimeMediaSourceStates& states() override;
 
     virtual void startProducingData() override;
@@ -65 +65 @@
     AVCaptureSession *session() const { return m_session.get(); }
     AVCaptureDevice *device() const { return m_device.get(); }
-    MediaStreamSourceStates* currentStates() { return &m_currentStates; }
+    RealtimeMediaSourceStates* currentStates() { return &m_currentStates; }
     MediaConstraints* constraints() { return m_constraints.get(); }
 
@@ -76 +76 @@
     RetainPtr<WebCoreAVMediaCaptureSourceObserver> m_objcObserver;
     RefPtr<MediaConstraints> m_constraints;
-    MediaStreamSourceStates m_currentStates;
+    RealtimeMediaSourceStates m_currentStates;
     RetainPtr<AVCaptureSession> m_session;
     RetainPtr<AVCaptureDevice> m_device;

trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm

@@ -32 +32 @@
 #import "Logging.h"
 #import "MediaConstraints.h"
-#import "MediaStreamSourceStates.h"
+#import "RealtimeMediaSourceStates.h"
 #import "SoftLinking.h"
 #import "UUID.h"
@@ -122 +122 @@
 }
 
-AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, MediaStreamSource::Type type, PassRefPtr<MediaConstraints> constraints)
-    : MediaStreamSource(id, type, emptyString())
+AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
+    : RealtimeMediaSource(id, type, emptyString())
     , m_objcObserver(adoptNS([[WebCoreAVMediaCaptureSourceObserver alloc] initWithCallback:this]))
     , m_constraints(constraints)
@@ -130 +130 @@
 {
     setName([device localizedName]);
-    m_currentStates.setSourceType(type == MediaStreamSource::Video ? MediaStreamSourceStates::Camera : MediaStreamSourceStates::Microphone);
+    m_currentStates.setSourceType(type == RealtimeMediaSource::Video ? RealtimeMediaSourceStates::Camera : RealtimeMediaSourceStates::Microphone);
 }
 
@@ -165 +165 @@
 }
 
-const MediaStreamSourceStates& AVMediaCaptureSource::states()
+const RealtimeMediaSourceStates& AVMediaCaptureSource::states()
 {
     updateStates();

trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h

@@ -39 +39 @@
     static RefPtr<AVMediaCaptureSource> create(AVCaptureDevice*, const AtomicString&, PassRefPtr<MediaConstraints>);
 
-    virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const override;
+    virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const override;
     virtual void captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutput*, CMSampleBufferRef, AVCaptureConnection*) override;
 

trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

@@ -34 +34 @@
 #import "Logging.h"
 #import "MediaConstraints.h"
-#import "MediaStreamSourceStates.h"
 #import "NotImplemented.h"
+#import "RealtimeMediaSourceStates.h"
 #import <AVFoundation/AVFoundation.h>
 #import <objc/runtime.h>
@@ -82 +82 @@
 
 AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)
-    : AVMediaCaptureSource(device, id, MediaStreamSource::Video, constraint)
+    : AVMediaCaptureSource(device, id, RealtimeMediaSource::Video, constraint)
     , m_frameRate(0)
     , m_width(0)
@@ -88 +88 @@
 {
     currentStates()->setSourceId(id);
-    currentStates()->setSourceType(MediaStreamSourceStates::Camera);
+    currentStates()->setSourceType(RealtimeMediaSourceStates::Camera);
 }
 
@@ -95 +95 @@
 }
 
-RefPtr<MediaStreamSourceCapabilities> AVVideoCaptureSource::capabilities() const
+RefPtr<RealtimeMediaSourceCapabilities> AVVideoCaptureSource::capabilities() const
 {
     notImplemented();
@@ -103 +103 @@
 void AVVideoCaptureSource::updateStates()
 {
-    MediaStreamSourceStates* states = currentStates();
+    RealtimeMediaSourceStates* states = currentStates();
 
     if ([device() position] == AVCaptureDevicePositionFront)
-        states->setFacingMode(MediaStreamSourceStates::User);
+        states->setFacingMode(RealtimeMediaSourceStates::User);
     else if ([device() position] == AVCaptureDevicePositionBack)
-        states->setFacingMode(MediaStreamSourceStates::Environment);
+        states->setFacingMode(RealtimeMediaSourceStates::Environment);
     else
-        states->setFacingMode(MediaStreamSourceStates::Unknown);
+        states->setFacingMode(RealtimeMediaSourceStates::Unknown);
     
     states->setFrameRate(m_frameRate);

trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp

@@ -66 +66 @@
     if (audioConstraints) {
         String invalidConstraint;
-        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
+        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Audio, audioConstraints.get(), invalidConstraint);
         if (!invalidConstraint.isEmpty()) {
             client->constraintsInvalid(invalidConstraint);
@@ -75 +75 @@
     if (videoConstraints) {
         String invalidConstraint;
-        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
+        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Video, videoConstraints.get(), invalidConstraint);
         if (!invalidConstraint.isEmpty()) {
             client->constraintsInvalid(invalidConstraint);
@@ -91 +91 @@
     ASSERT(client);
     
-    Vector<RefPtr<MediaStreamSource>> audioSources;
-    Vector<RefPtr<MediaStreamSource>> videoSources;
+    Vector<RefPtr<RealtimeMediaSource>> audioSources;
+    Vector<RefPtr<RealtimeMediaSource>> videoSources;
     
     if (audioConstraints) {
         String invalidConstraint;
-        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Audio, audioConstraints.get(), invalidConstraint);
+        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Audio, audioConstraints.get(), invalidConstraint);
         if (!invalidConstraint.isEmpty()) {
             client->failedToCreateStreamWithConstraintsError(invalidConstraint);
@@ -102 +102 @@
         }
         
-        RefPtr<MediaStreamSource> audioSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(MediaStreamSource::Audio, audioConstraints.get());
+        RefPtr<RealtimeMediaSource> audioSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(RealtimeMediaSource::Audio, audioConstraints.get());
         ASSERT(audioSource);
         
@@ -110 +110 @@
     if (videoConstraints) {
         String invalidConstraint;
-        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(MediaStreamSource::Video, videoConstraints.get(), invalidConstraint);
+        AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(RealtimeMediaSource::Video, videoConstraints.get(), invalidConstraint);
         if (!invalidConstraint.isEmpty()) {
             client->failedToCreateStreamWithConstraintsError(invalidConstraint);
@@ -116 +116 @@
         }
         
-        RefPtr<MediaStreamSource> videoSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(MediaStreamSource::Video, videoConstraints.get());
+        RefPtr<RealtimeMediaSource> videoSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(RealtimeMediaSource::Video, videoConstraints.get());
         ASSERT(videoSource);
         

trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h

@@ -36 +36 @@
 #include "MediaStreamCenter.h"
 
-#include "MediaStreamSource.h"
+#include "RealtimeMediaSource.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>

trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.cpp

@@ -36 +36 @@
 #include "MediaStreamCreationClient.h"
 #include "MediaStreamPrivate.h"
-#include "MediaStreamSource.h"
-#include "MediaStreamSourceCapabilities.h"
 #include "MediaStreamTrack.h"
 #include "MediaStreamTrackSourcesRequestClient.h"
+#include "RealtimeMediaSource.h"
+#include "RealtimeMediaSourceCapabilities.h"
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 
-class MockSource : public MediaStreamSource {
+class MockSource : public RealtimeMediaSource {
 public:
-    MockSource(const AtomicString& id, const AtomicString& name, MediaStreamSource::Type type)
-        : MediaStreamSource(id, type, name)
+    MockSource(const AtomicString& id, const AtomicString& name, RealtimeMediaSource::Type type)
+        : RealtimeMediaSource(id, type, name)
     {
     }
@@ -53 +53 @@
     virtual ~MockSource() { }
 
-    virtual RefPtr<MediaStreamSourceCapabilities> capabilities() const { return m_capabilities; }
-    virtual const MediaStreamSourceStates& states() { return m_currentStates; }
-
-    RefPtr<MediaStreamSourceCapabilities> m_capabilities;
-    MediaStreamSourceStates m_currentStates;
+    virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() const { return m_capabilities; }
+    virtual const RealtimeMediaSourceStates& states() { return m_currentStates; }
+
+    RefPtr<RealtimeMediaSourceCapabilities> m_capabilities;
+    RealtimeMediaSourceStates m_currentStates;
 };
     
@@ -82 +82 @@
 static void initializeMockSources()
 {
-    RefPtr<MockSource> mockSource1 = adoptRef(new MockSource(mockVideoSourceID(), "Mock video device", MediaStreamSource::Video));
-    mockSource1->m_capabilities = MediaStreamSourceCapabilities::create();
+    RefPtr<MockSource> mockSource1 = adoptRef(new MockSource(mockVideoSourceID(), "Mock video device", RealtimeMediaSource::Video));
+    mockSource1->m_capabilities = RealtimeMediaSourceCapabilities::create();
     mockSource1->m_capabilities->setSourceId(mockSource1->id());
-    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));
-
-    mockSource1->m_currentStates.setSourceType(MediaStreamSourceStates::Camera);
+    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));
+
+    mockSource1->m_currentStates.setSourceType(RealtimeMediaSourceStates::Camera);
     mockSource1->m_currentStates.setSourceId(mockSource1->id());
-    mockSource1->m_currentStates.setFacingMode(MediaStreamSourceStates::User);
+    mockSource1->m_currentStates.setFacingMode(RealtimeMediaSourceStates::User);
     mockSource1->m_currentStates.setWidth(1920);
     mockSource1->m_currentStates.setHeight(1080);
@@ -106 +106 @@
     mockSourceMap().add(mockSource1id, mockSource1.release());
 
-    RefPtr<MockSource> mockSource2 = adoptRef(new MockSource(mockAudioSourceID(), "Mock audio device", MediaStreamSource::Audio));
-    mockSource2->m_capabilities = MediaStreamSourceCapabilities::create();
+    RefPtr<MockSource> mockSource2 = adoptRef(new MockSource(mockAudioSourceID(), "Mock audio device", RealtimeMediaSource::Audio));
+    mockSource2->m_capabilities = RealtimeMediaSourceCapabilities::create();
     mockSource2->m_capabilities->setSourceId(mockSource2->id());
-    mockSource2->m_capabilities->setVolumeRange(MediaStreamSourceCapabilityRange(0UL, 100UL, true));
-
-    mockSource2->m_currentStates.setSourceType(MediaStreamSourceStates::Microphone);
+    mockSource2->m_capabilities->setVolumeRange(RealtimeMediaSourceCapabilityRange(0UL, 100UL, true));
+
+    mockSource2->m_currentStates.setSourceType(RealtimeMediaSourceStates::Microphone);
     mockSource2->m_currentStates.setSourceId(mockSource2->id());
     mockSource2->m_currentStates.setVolume(50);
@@ -160 +160 @@
     ASSERT(client);
     
-    Vector<RefPtr<MediaStreamSource>> audioSources;
-    Vector<RefPtr<MediaStreamSource>> videoSources;
+    Vector<RefPtr<RealtimeMediaSource>> audioSources;
+    Vector<RefPtr<RealtimeMediaSource>> videoSources;
     MockSourceMap& map = mockSourceMap();
 
@@ -174 +174 @@
         ASSERT(it != map.end());
 
-        RefPtr<MediaStreamSource> audioSource = it->value;
+        RefPtr<RealtimeMediaSource> audioSource = it->value;
         audioSource->reset();
-        audioSource->setReadyState(MediaStreamSource::Live);
+        audioSource->setReadyState(RealtimeMediaSource::Live);
         audioSources.append(audioSource.release());
     }
@@ -190 +190 @@
         ASSERT(it != map.end());
 
-        RefPtr<MediaStreamSource> videoSource = it->value;
+        RefPtr<RealtimeMediaSource> videoSource = it->value;
         videoSource->reset();
-        videoSource->setReadyState(MediaStreamSource::Live);
+        videoSource->setReadyState(RealtimeMediaSource::Live);
         videoSources.append(videoSource.release());
     }
@@ -209 +209 @@
         MockSource* source = it->value.get();
 
-        sources.append(TrackSourceInfo::create(source->id(), source->type() == MediaStreamSource::Video ? TrackSourceInfo::Video : TrackSourceInfo::Audio, source->name()));
+        sources.append(TrackSourceInfo::create(source->id(), source->type() == RealtimeMediaSource::Video ? TrackSourceInfo::Video : TrackSourceInfo::Audio, source->name()));
     }
 

trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp

@@ -167 +167 @@
 }
 
-std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<MediaStreamSource>)
+std::unique_ptr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerMock::createDTMFSender(PassRefPtr<RealtimeMediaSource>)
 {
     return std::make_unique<RTCDTMFSenderHandlerMock>();

trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h

@@ -56 +56 @@
     virtual void getStats(PassRefPtr<RTCStatsRequest>) override;
     virtual std::unique_ptr<RTCDataChannelHandler> createDataChannel(const String& label, const RTCDataChannelInit&) override;
-    virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamSource>) override;
+    virtual std::unique_ptr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<RealtimeMediaSource>) override;
     virtual void stop() override;