<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213884] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213884">213884</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 22:58:27 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make RealtimeMediaSource::type an enum class
https://bugs.webkit.org/show_bug.cgi?id=169491
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-13
Reviewed by Sam Weinig.
No change of behavior.
* Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
(WebCore::CanvasCaptureMediaStreamTrack::Source::Source):
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::getAudioTracks):
(WebCore::MediaStream::getVideoTracks):
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::kind):
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
(WebCore::LibWebRTCMediaEndpoint::addTrack):
* Modules/webaudio/MediaStreamAudioSource.cpp:
(WebCore::MediaStreamAudioSource::MediaStreamAudioSource):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
* platform/mediastream/CaptureDeviceManager.cpp:
(CaptureDeviceManager::bestSourcesForTypeAndConstraints):
(CaptureDeviceManager::sourceWithUID):
* platform/mediastream/MediaEndpoint.cpp:
* platform/mediastream/RealtimeMediaSource.h:
* platform/mediastream/mac/AVAudioCaptureSource.mm:
(WebCore::AVAudioCaptureSource::AVAudioCaptureSource):
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
* platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
(WebCore::RealtimeMediaSourceCenterMac::createMediaStream):
* platform/mock/MockMediaEndpoint.cpp:
(WebCore::MockMediaEndpoint::createMutedRemoteSource):
* platform/mock/MockRealtimeAudioSource.cpp:
(WebCore::MockRealtimeAudioSource::MockRealtimeAudioSource):
* platform/mock/MockRealtimeMediaSource.cpp:
(WebCore::MockRealtimeMediaSource::MockRealtimeMediaSource):
* platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::MockRealtimeVideoSource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamCanvasCaptureMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourcecpp">trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamCaptureDeviceManagercpp">trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointcpp">trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockMediaEndpointcpp">trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeAudioSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2017-03-13 Youenn Fablet <youenn@apple.com>
+
+ Make RealtimeMediaSource::type an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=169491
+
+ Reviewed by Sam Weinig.
+
+ No change of behavior.
+
+ * Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
+ (WebCore::CanvasCaptureMediaStreamTrack::Source::Source):
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::getAudioTracks):
+ (WebCore::MediaStream::getVideoTracks):
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::kind):
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+ (WebCore::LibWebRTCMediaEndpoint::addTrack):
+ * Modules/webaudio/MediaStreamAudioSource.cpp:
+ (WebCore::MediaStreamAudioSource::MediaStreamAudioSource):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated):
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
+ * platform/mediastream/CaptureDeviceManager.cpp:
+ (CaptureDeviceManager::bestSourcesForTypeAndConstraints):
+ (CaptureDeviceManager::sourceWithUID):
+ * platform/mediastream/MediaEndpoint.cpp:
+ * platform/mediastream/RealtimeMediaSource.h:
+ * platform/mediastream/mac/AVAudioCaptureSource.mm:
+ (WebCore::AVAudioCaptureSource::AVAudioCaptureSource):
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
+ * platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
+ (WebCore::RealtimeMediaSourceCenterMac::createMediaStream):
+ * platform/mock/MockMediaEndpoint.cpp:
+ (WebCore::MockMediaEndpoint::createMutedRemoteSource):
+ * platform/mock/MockRealtimeAudioSource.cpp:
+ (WebCore::MockRealtimeAudioSource::MockRealtimeAudioSource):
+ * platform/mock/MockRealtimeMediaSource.cpp:
+ (WebCore::MockRealtimeMediaSource::MockRealtimeMediaSource):
+ * platform/mock/MockRealtimeVideoSource.cpp:
+ (WebCore::MockRealtimeVideoSource::MockRealtimeVideoSource):
+
</ins><span class="cx"> 2017-03-13 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Move paintCurrentFrameInContext from RealtimeMediaSources to MediaPlayer
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamCanvasCaptureMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Give source id and name
</span><span class="cx"> CanvasCaptureMediaStreamTrack::Source::Source(HTMLCanvasElement& canvas, std::optional<double>&& frameRequestRate)
</span><del>- : RealtimeMediaSource(String(), RealtimeMediaSource::Video, String())
</del><ins>+ : RealtimeMediaSource(String(), Type::Video, String())
</ins><span class="cx"> , m_frameRequestRate(WTFMove(frameRequestRate))
</span><span class="cx"> , m_requestFrameTimer(*this, &Source::requestFrameTimerFired)
</span><span class="cx"> , m_canvas(&canvas)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -158,12 +158,12 @@
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackVector MediaStream::getAudioTracks() const
</span><span class="cx"> {
</span><del>- return trackVectorForType(RealtimeMediaSource::Audio);
</del><ins>+ return trackVectorForType(RealtimeMediaSource::Type::Audio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackVector MediaStream::getVideoTracks() const
</span><span class="cx"> {
</span><del>- return trackVectorForType(RealtimeMediaSource::Video);
</del><ins>+ return trackVectorForType(RealtimeMediaSource::Type::Video);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamTrackVector MediaStream::getTracks() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> static NeverDestroyed<AtomicString> audioKind("audio", AtomicString::ConstructFromLiteral);
</span><span class="cx"> static NeverDestroyed<AtomicString> videoKind("video", AtomicString::ConstructFromLiteral);
</span><span class="cx">
</span><del>- if (m_private->type() == RealtimeMediaSource::Audio)
</del><ins>+ if (m_private->type() == RealtimeMediaSource::Type::Audio)
</ins><span class="cx"> return audioKind;
</span><span class="cx"> return videoKind;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -172,20 +172,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& source = track.source();
</span><del>- ASSERT(source.type() != RealtimeMediaSource::None);
-
- if (source.type() == RealtimeMediaSource::Audio) {
</del><ins>+ switch (source.type()) {
+ case RealtimeMediaSource::Type::Audio: {
</ins><span class="cx"> auto trackSource = RealtimeOutgoingAudioSource::create(source);
</span><span class="cx"> auto audioTrack = LibWebRTCProvider::factory()->CreateAudioTrack(track.id().utf8().data(), trackSource.ptr());
</span><span class="cx"> trackSource->setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>(audioTrack));
</span><span class="cx"> m_peerConnectionBackend.addAudioSource(WTFMove(trackSource));
</span><span class="cx"> m_backend->AddTrack(audioTrack.get(), WTFMove(mediaStreams));
</span><del>- } else {
</del><ins>+ return;
+ }
+ case RealtimeMediaSource::Type::Video: {
</ins><span class="cx"> auto videoSource = RealtimeOutgoingVideoSource::create(source);
</span><span class="cx"> auto videoTrack = LibWebRTCProvider::factory()->CreateVideoTrack(track.id().utf8().data(), videoSource.ptr());
</span><span class="cx"> m_peerConnectionBackend.addVideoSource(WTFMove(videoSource));
</span><span class="cx"> m_backend->AddTrack(videoTrack.get(), WTFMove(mediaStreams));
</span><ins>+ return;
</ins><span class="cx"> }
</span><ins>+ case RealtimeMediaSource::Type::None:
+ ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LibWebRTCMediaEndpoint::doCreateOffer()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioMediaStreamAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaStreamAudioSource::MediaStreamAudioSource()
</span><del>- : RealtimeMediaSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), RealtimeMediaSource::Audio, "MediaStreamAudioDestinationNode")
</del><ins>+ : RealtimeMediaSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), RealtimeMediaSource::Type::Audio, "MediaStreamAudioDestinationNode")
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -722,12 +722,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> switch (track.type()) {
</span><del>- case RealtimeMediaSource::None:
</del><ins>+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> // Do nothing.
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::Audio:
</del><ins>+ case RealtimeMediaSource::Type::Audio:
</ins><span class="cx"> break;
</span><del>- case RealtimeMediaSource::Video:
</del><ins>+ case RealtimeMediaSource::Type::Video:
</ins><span class="cx"> if (&track == m_activeVideoTrack.get())
</span><span class="cx"> enqueueVideoSample(track, mediaSample);
</span><span class="cx"> break;
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Audio, currentTracks, &AudioTrackPrivateMediaStreamCocoa::create, setAudioTrackState);
</del><ins>+ updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Type::Audio, currentTracks, &AudioTrackPrivateMediaStreamCocoa::create, setAudioTrackState);
</ins><span class="cx">
</span><span class="cx"> Function<void(RefPtr<VideoTrackPrivateMediaStream>, int, TrackState)> setVideoTrackState = [&](auto track, int index, TrackState state)
</span><span class="cx"> {
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- updateTracksOfType(m_videoTrackMap, RealtimeMediaSource::Video, currentTracks, &VideoTrackPrivateMediaStream::create, setVideoTrackState);
</del><ins>+ updateTracksOfType(m_videoTrackMap, RealtimeMediaSource::Type::Video, currentTracks, &VideoTrackPrivateMediaStream::create, setVideoTrackState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PlatformTimeRanges> MediaPlayerPrivateMediaStreamAVFObjC::seekable() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> // TODO: Support for multiple tracks of the same type.
</span><span class="cx">
</span><span class="cx"> switch (track->type()) {
</span><del>- case RealtimeMediaSource::Audio:
</del><ins>+ case RealtimeMediaSource::Type::Audio:
</ins><span class="cx"> if (!m_audioTrack) {
</span><span class="cx"> String preSelectedDevice = getenv("WEBKIT_AUDIO_DEVICE");
</span><span class="cx"> if (!preSelectedDevice || (preSelectedDevice == track->label())) {
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::Video:
</del><ins>+ case RealtimeMediaSource::Type::Video:
</ins><span class="cx"> if (!m_videoTrack) {
</span><span class="cx"> String preSelectedDevice = getenv("WEBKIT_VIDEO_DEVICE");
</span><span class="cx"> if (!preSelectedDevice || (preSelectedDevice == track->label())) {
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::None:
</del><ins>+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> GST_WARNING("Loading a track with None type");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -382,9 +382,9 @@
</span><span class="cx"> auto& realTimeMediaSource = static_cast<RealtimeMediaSourceOwr&>(track.source());
</span><span class="cx"> auto mediaSource = OWR_MEDIA_SOURCE(realTimeMediaSource.mediaSource());
</span><span class="cx">
</span><del>- GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", realTimeMediaSource.muted() ? "muted":"un-muted");
</del><ins>+ GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Type::Audio ? "audio":"video", realTimeMediaSource.muted() ? "muted":"un-muted");
</ins><span class="cx"> switch (track.type()) {
</span><del>- case RealtimeMediaSource::Audio:
</del><ins>+ case RealtimeMediaSource::Type::Audio:
</ins><span class="cx"> if (!realTimeMediaSource.muted()) {
</span><span class="cx"> g_object_set(m_audioRenderer.get(), "disabled", false, nullptr);
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_audioRenderer.get()), mediaSource);
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> if (mediaSource)
</span><span class="cx"> g_object_set(mediaSource, "mute", !track.enabled(), nullptr);
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::Video:
</del><ins>+ case RealtimeMediaSource::Type::Video:
</ins><span class="cx"> if (!realTimeMediaSource.muted()) {
</span><span class="cx"> g_object_set(m_videoRenderer.get(), "disabled", false, nullptr);
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), mediaSource);
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), nullptr);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::None:
</del><ins>+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> GST_WARNING("Trying to change mute state of a track with None type");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -416,16 +416,16 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamerOwr::trackEnabledChanged(MediaStreamTrackPrivate& track)
</span><span class="cx"> {
</span><del>- GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", track.enabled() ? "enabled":"disabled");
</del><ins>+ GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Type::Audio ? "audio":"video", track.enabled() ? "enabled":"disabled");
</ins><span class="cx">
</span><span class="cx"> switch (track.type()) {
</span><del>- case RealtimeMediaSource::Audio:
</del><ins>+ case RealtimeMediaSource::Type::Audio:
</ins><span class="cx"> g_object_set(m_audioRenderer.get(), "disabled", !track.enabled(), nullptr);
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::Video:
</del><ins>+ case RealtimeMediaSource::Type::Video:
</ins><span class="cx"> g_object_set(m_videoRenderer.get(), "disabled", !track.enabled(), nullptr);
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::None:
</del><ins>+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> GST_WARNING("Trying to change enabled state of a track with None type");
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamCaptureDeviceManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -80,7 +80,8 @@
</span><span class="cx"> }
</span><span class="cx"> } sortBasedOnFitnessScore;
</span><span class="cx">
</span><del>- CaptureDevice::DeviceType deviceType = type == RealtimeMediaSource::Video ? CaptureDevice::DeviceType::Video : CaptureDevice::DeviceType::Audio;
</del><ins>+ ASSERT(type != RealtimeMediaSource::Type::None);
+ CaptureDevice::DeviceType deviceType = type == RealtimeMediaSource::Type::Video ? CaptureDevice::DeviceType::Video : CaptureDevice::DeviceType::Audio;
</ins><span class="cx"> for (auto& captureDevice : captureDevices()) {
</span><span class="cx"> if (!captureDevice.enabled() || captureDevice.type() != deviceType)
</span><span class="cx"> continue;
</span><span class="lines">@@ -104,10 +105,19 @@
</span><span class="cx"> RefPtr<RealtimeMediaSource> CaptureDeviceManager::sourceWithUID(const String& deviceUID, RealtimeMediaSource::Type type, const MediaConstraints* constraints, String& invalidConstraint)
</span><span class="cx"> {
</span><span class="cx"> for (auto& captureDevice : captureDevices()) {
</span><del>- if (type == RealtimeMediaSource::None)
</del><ins>+ CaptureDevice::DeviceType deviceType;
+
+ switch (type) {
+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> continue;
</span><ins>+ case RealtimeMediaSource::Type::Audio:
+ deviceType = CaptureDevice::DeviceType::Audio;
+ break;
+ case RealtimeMediaSource::Type::Video:
+ deviceType = CaptureDevice::DeviceType::Video;
+ break;
+ }
</ins><span class="cx">
</span><del>- CaptureDevice::DeviceType deviceType = type == RealtimeMediaSource::Video ? CaptureDevice::DeviceType::Video : CaptureDevice::DeviceType::Audio;
</del><span class="cx"> if (captureDevice.persistentId() != deviceUID || captureDevice.type() != deviceType)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> static Ref<EmptyRealtimeMediaSource> create() { return adoptRef(*new EmptyRealtimeMediaSource()); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- EmptyRealtimeMediaSource() : RealtimeMediaSource(emptyString(), RealtimeMediaSource::None, emptyString()) { }
</del><ins>+ EmptyRealtimeMediaSource() : RealtimeMediaSource(emptyString(), Type::None, emptyString()) { }
</ins><span class="cx">
</span><span class="cx"> RefPtr<RealtimeMediaSourceCapabilities> capabilities() const final { return nullptr; }
</span><span class="cx"> const RealtimeMediaSourceSettings& settings() const final { return m_sourceSettings; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> const String& persistentID() const { return m_persistentID; }
</span><span class="cx"> virtual void setPersistentID(const String& persistentID) { m_persistentID = persistentID; }
</span><span class="cx">
</span><del>- enum Type { None, Audio, Video };
</del><ins>+ enum class Type { None, Audio, Video };
</ins><span class="cx"> Type type() const { return m_type; }
</span><span class="cx">
</span><span class="cx"> virtual const String& name() const { return m_name; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id)
</span><del>- : AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio)
</del><ins>+ : AVMediaCaptureSource(device, id, Type::Audio)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id)
</span><del>- : AVMediaCaptureSource(device, id, RealtimeMediaSource::Video)
</del><ins>+ : AVMediaCaptureSource(device, id, Type::Video)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> String invalidConstraint;
</span><span class="cx">
</span><span class="cx"> if (!audioDeviceID.isEmpty()) {
</span><del>- auto audioSource = AVCaptureDeviceManager::singleton().sourceWithUID(audioDeviceID, RealtimeMediaSource::Audio, audioConstraints, invalidConstraint);
</del><ins>+ auto audioSource = AVCaptureDeviceManager::singleton().sourceWithUID(audioDeviceID, RealtimeMediaSource::Type::Audio, audioConstraints, invalidConstraint);
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> if (!invalidConstraint.isEmpty())
</span><span class="cx"> LOG(Media, "RealtimeMediaSourceCenterMac::createMediaStream(%p), audio constraints failed to apply: %s", this, invalidConstraint.utf8().data());
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> audioSources.append(audioSource.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx"> if (!videoDeviceID.isEmpty()) {
</span><del>- auto videoSource = AVCaptureDeviceManager::singleton().sourceWithUID(videoDeviceID, RealtimeMediaSource::Video, videoConstraints, invalidConstraint);
</del><ins>+ auto videoSource = AVCaptureDeviceManager::singleton().sourceWithUID(videoDeviceID, RealtimeMediaSource::Type::Video, videoConstraints, invalidConstraint);
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> if (!invalidConstraint.isEmpty())
</span><span class="cx"> LOG(Media, "RealtimeMediaSourceCenterMac::createMediaStream(%p), video constraints failed to apply: %s", this, invalidConstraint.utf8().data());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcMediaEndpointOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -354,15 +354,15 @@
</span><span class="cx"> RefPtr<RealtimeMediaSourceOwr> source;
</span><span class="cx">
</span><span class="cx"> switch (type) {
</span><del>- case RealtimeMediaSource::Audio:
</del><ins>+ case RealtimeMediaSource::Type::Audio:
</ins><span class="cx"> name = "remote audio";
</span><span class="cx"> source = adoptRef(new RealtimeAudioSourceOwr(nullptr, id, type, name));
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::Video:
</del><ins>+ case RealtimeMediaSource::Type::Video:
</ins><span class="cx"> name = "remote video";
</span><span class="cx"> source = adoptRef(new RealtimeVideoSourceOwr(nullptr, id, type, name));
</span><span class="cx"> break;
</span><del>- case RealtimeMediaSource::None:
</del><ins>+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -143,16 +143,16 @@
</span><span class="cx">
</span><span class="cx"> RealtimeMediaSource::Type mediaSourceType;
</span><span class="cx"> if (mediaType & OWR_MEDIA_TYPE_AUDIO)
</span><del>- mediaSourceType = RealtimeMediaSource::Audio;
</del><ins>+ mediaSourceType = RealtimeMediaSource::Type::Audio;
</ins><span class="cx"> else if (mediaType & OWR_MEDIA_TYPE_VIDEO)
</span><del>- mediaSourceType = RealtimeMediaSource::Video;
</del><ins>+ mediaSourceType = RealtimeMediaSource::Type::Video;
</ins><span class="cx"> else {
</span><del>- mediaSourceType = RealtimeMediaSource::None;
</del><ins>+ mediaSourceType = RealtimeMediaSource::Type::None;
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RealtimeMediaSourceOwr> mediaSource;
</span><del>- if (mediaSourceType == RealtimeMediaSource::Audio)
</del><ins>+ if (mediaSourceType == RealtimeMediaSource::Type::Audio)
</ins><span class="cx"> mediaSource = adoptRef(new RealtimeAudioSourceOwr(source, id, mediaSourceType, sourceName));
</span><span class="cx"> else
</span><span class="cx"> mediaSource = adoptRef(new RealtimeVideoSourceOwr(source, id, mediaSourceType, sourceName));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -196,9 +196,13 @@
</span><span class="cx"> RefPtr<RealtimeMediaSource> source;
</span><span class="cx">
</span><span class="cx"> switch (type) {
</span><del>- case RealtimeMediaSource::Audio: source = MockRealtimeAudioSource::createMuted("remote audio"); break;
- case RealtimeMediaSource::Video: source = MockRealtimeVideoSource::createMuted("remote video"); break;
- case RealtimeMediaSource::None:
</del><ins>+ case RealtimeMediaSource::Type::Audio:
+ source = MockRealtimeAudioSource::createMuted("remote audio");
+ break;
+ case RealtimeMediaSource::Type::Video:
+ source = MockRealtimeVideoSource::createMuted("remote video");
+ break;
+ case RealtimeMediaSource::Type::None:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> MockRealtimeAudioSource::MockRealtimeAudioSource(const String& name)
</span><del>- : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Audio, name)
</del><ins>+ : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Type::Audio, name)
</ins><span class="cx"> , m_timer(RunLoop::current(), this, &MockRealtimeAudioSource::tick)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -84,10 +84,16 @@
</span><span class="cx"> MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id, RealtimeMediaSource::Type type, const String& name)
</span><span class="cx"> : BaseRealtimeMediaSourceClass(id, type, name)
</span><span class="cx"> {
</span><del>- if (type == RealtimeMediaSource::Audio)
</del><ins>+ switch (type) {
+ case RealtimeMediaSource::Type::Audio:
</ins><span class="cx"> setPersistentID(mockAudioSourcePersistentID());
</span><del>- else
</del><ins>+ return;
+ case RealtimeMediaSource::Type::Video:
</ins><span class="cx"> setPersistentID(mockVideoSourcePersistentID());
</span><ins>+ return;
+ case RealtimeMediaSource::Type::None:
+ ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MockRealtimeMediaSource::initializeCapabilities()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (213883 => 213884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2017-03-14 00:39:24 UTC (rev 213883)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2017-03-14 05:58:27 UTC (rev 213884)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> MockRealtimeVideoSource::MockRealtimeVideoSource(const String& name)
</span><del>- : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Video, name)
</del><ins>+ : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Type::Video, name)
</ins><span class="cx"> , m_timer(RunLoop::current(), this, &MockRealtimeVideoSource::generateFrame)
</span><span class="cx"> {
</span><span class="cx"> setFrameRate(30);
</span></span></pre>
</div>
</div>
</body>
</html>