Diff
Modified: trunk/Source/WebCore/ChangeLog (213883 => 213884)
--- 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)
@@ -1,3 +1,46 @@
+2017-03-13 Youenn Fablet <[email protected]>
+
+ 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):
+
2017-03-13 Eric Carlson <[email protected]>
[MediaStream] Move paintCurrentFrameInContext from RealtimeMediaSources to MediaPlayer
Modified: trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp (213883 => 213884)
--- 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)
@@ -59,7 +59,7 @@
// FIXME: Give source id and name
CanvasCaptureMediaStreamTrack::Source::Source(HTMLCanvasElement& canvas, std::optional<double>&& frameRequestRate)
- : RealtimeMediaSource(String(), RealtimeMediaSource::Video, String())
+ : RealtimeMediaSource(String(), Type::Video, String())
, m_frameRequestRate(WTFMove(frameRequestRate))
, m_requestFrameTimer(*this, &Source::requestFrameTimerFired)
, m_canvas(&canvas)
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (213883 => 213884)
--- 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)
@@ -158,12 +158,12 @@
MediaStreamTrackVector MediaStream::getAudioTracks() const
{
- return trackVectorForType(RealtimeMediaSource::Audio);
+ return trackVectorForType(RealtimeMediaSource::Type::Audio);
}
MediaStreamTrackVector MediaStream::getVideoTracks() const
{
- return trackVectorForType(RealtimeMediaSource::Video);
+ return trackVectorForType(RealtimeMediaSource::Type::Video);
}
MediaStreamTrackVector MediaStream::getTracks() const
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (213883 => 213884)
--- 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)
@@ -68,7 +68,7 @@
static NeverDestroyed<AtomicString> audioKind("audio", AtomicString::ConstructFromLiteral);
static NeverDestroyed<AtomicString> videoKind("video", AtomicString::ConstructFromLiteral);
- if (m_private->type() == RealtimeMediaSource::Audio)
+ if (m_private->type() == RealtimeMediaSource::Type::Audio)
return audioKind;
return videoKind;
}
Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (213883 => 213884)
--- 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)
@@ -172,20 +172,25 @@
}
auto& source = track.source();
- ASSERT(source.type() != RealtimeMediaSource::None);
-
- if (source.type() == RealtimeMediaSource::Audio) {
+ switch (source.type()) {
+ case RealtimeMediaSource::Type::Audio: {
auto trackSource = RealtimeOutgoingAudioSource::create(source);
auto audioTrack = LibWebRTCProvider::factory()->CreateAudioTrack(track.id().utf8().data(), trackSource.ptr());
trackSource->setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>(audioTrack));
m_peerConnectionBackend.addAudioSource(WTFMove(trackSource));
m_backend->AddTrack(audioTrack.get(), WTFMove(mediaStreams));
- } else {
+ return;
+ }
+ case RealtimeMediaSource::Type::Video: {
auto videoSource = RealtimeOutgoingVideoSource::create(source);
auto videoTrack = LibWebRTCProvider::factory()->CreateVideoTrack(track.id().utf8().data(), videoSource.ptr());
m_peerConnectionBackend.addVideoSource(WTFMove(videoSource));
m_backend->AddTrack(videoTrack.get(), WTFMove(mediaStreams));
+ return;
}
+ case RealtimeMediaSource::Type::None:
+ ASSERT_NOT_REACHED();
+ }
}
void LibWebRTCMediaEndpoint::doCreateOffer()
Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp (213883 => 213884)
--- 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)
@@ -40,7 +40,7 @@
}
MediaStreamAudioSource::MediaStreamAudioSource()
- : RealtimeMediaSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), RealtimeMediaSource::Audio, "MediaStreamAudioDestinationNode")
+ : RealtimeMediaSource(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), RealtimeMediaSource::Type::Audio, "MediaStreamAudioDestinationNode")
{
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (213883 => 213884)
--- 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)
@@ -722,12 +722,12 @@
return;
switch (track.type()) {
- case RealtimeMediaSource::None:
+ case RealtimeMediaSource::Type::None:
// Do nothing.
break;
- case RealtimeMediaSource::Audio:
+ case RealtimeMediaSource::Type::Audio:
break;
- case RealtimeMediaSource::Video:
+ case RealtimeMediaSource::Type::Video:
if (&track == m_activeVideoTrack.get())
enqueueVideoSample(track, mediaSample);
break;
@@ -853,7 +853,7 @@
break;
}
};
- updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Audio, currentTracks, &AudioTrackPrivateMediaStreamCocoa::create, setAudioTrackState);
+ updateTracksOfType(m_audioTrackMap, RealtimeMediaSource::Type::Audio, currentTracks, &AudioTrackPrivateMediaStreamCocoa::create, setAudioTrackState);
Function<void(RefPtr<VideoTrackPrivateMediaStream>, int, TrackState)> setVideoTrackState = [&](auto track, int index, TrackState state)
{
@@ -875,7 +875,7 @@
break;
}
};
- updateTracksOfType(m_videoTrackMap, RealtimeMediaSource::Video, currentTracks, &VideoTrackPrivateMediaStream::create, setVideoTrackState);
+ updateTracksOfType(m_videoTrackMap, RealtimeMediaSource::Type::Video, currentTracks, &VideoTrackPrivateMediaStream::create, setVideoTrackState);
}
std::unique_ptr<PlatformTimeRanges> MediaPlayerPrivateMediaStreamAVFObjC::seekable() const
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (213883 => 213884)
--- 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)
@@ -200,7 +200,7 @@
// TODO: Support for multiple tracks of the same type.
switch (track->type()) {
- case RealtimeMediaSource::Audio:
+ case RealtimeMediaSource::Type::Audio:
if (!m_audioTrack) {
String preSelectedDevice = getenv("WEBKIT_AUDIO_DEVICE");
if (!preSelectedDevice || (preSelectedDevice == track->label())) {
@@ -212,7 +212,7 @@
}
}
break;
- case RealtimeMediaSource::Video:
+ case RealtimeMediaSource::Type::Video:
if (!m_videoTrack) {
String preSelectedDevice = getenv("WEBKIT_VIDEO_DEVICE");
if (!preSelectedDevice || (preSelectedDevice == track->label())) {
@@ -225,7 +225,7 @@
}
}
break;
- case RealtimeMediaSource::None:
+ case RealtimeMediaSource::Type::None:
GST_WARNING("Loading a track with None type");
}
@@ -382,9 +382,9 @@
auto& realTimeMediaSource = static_cast<RealtimeMediaSourceOwr&>(track.source());
auto mediaSource = OWR_MEDIA_SOURCE(realTimeMediaSource.mediaSource());
- GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", realTimeMediaSource.muted() ? "muted":"un-muted");
+ GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Type::Audio ? "audio":"video", realTimeMediaSource.muted() ? "muted":"un-muted");
switch (track.type()) {
- case RealtimeMediaSource::Audio:
+ case RealtimeMediaSource::Type::Audio:
if (!realTimeMediaSource.muted()) {
g_object_set(m_audioRenderer.get(), "disabled", false, nullptr);
owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_audioRenderer.get()), mediaSource);
@@ -395,7 +395,7 @@
if (mediaSource)
g_object_set(mediaSource, "mute", !track.enabled(), nullptr);
break;
- case RealtimeMediaSource::Video:
+ case RealtimeMediaSource::Type::Video:
if (!realTimeMediaSource.muted()) {
g_object_set(m_videoRenderer.get(), "disabled", false, nullptr);
owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), mediaSource);
@@ -404,7 +404,7 @@
owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), nullptr);
}
break;
- case RealtimeMediaSource::None:
+ case RealtimeMediaSource::Type::None:
GST_WARNING("Trying to change mute state of a track with None type");
}
}
@@ -416,16 +416,16 @@
void MediaPlayerPrivateGStreamerOwr::trackEnabledChanged(MediaStreamTrackPrivate& track)
{
- GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Audio ? "audio":"video", track.enabled() ? "enabled":"disabled");
+ GST_DEBUG("%s track now %s", track.type() == RealtimeMediaSource::Type::Audio ? "audio":"video", track.enabled() ? "enabled":"disabled");
switch (track.type()) {
- case RealtimeMediaSource::Audio:
+ case RealtimeMediaSource::Type::Audio:
g_object_set(m_audioRenderer.get(), "disabled", !track.enabled(), nullptr);
break;
- case RealtimeMediaSource::Video:
+ case RealtimeMediaSource::Type::Video:
g_object_set(m_videoRenderer.get(), "disabled", !track.enabled(), nullptr);
break;
- case RealtimeMediaSource::None:
+ case RealtimeMediaSource::Type::None:
GST_WARNING("Trying to change enabled state of a track with None type");
}
}
Modified: trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp (213883 => 213884)
--- 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)
@@ -80,7 +80,8 @@
}
} sortBasedOnFitnessScore;
- CaptureDevice::DeviceType deviceType = type == RealtimeMediaSource::Video ? CaptureDevice::DeviceType::Video : CaptureDevice::DeviceType::Audio;
+ ASSERT(type != RealtimeMediaSource::Type::None);
+ CaptureDevice::DeviceType deviceType = type == RealtimeMediaSource::Type::Video ? CaptureDevice::DeviceType::Video : CaptureDevice::DeviceType::Audio;
for (auto& captureDevice : captureDevices()) {
if (!captureDevice.enabled() || captureDevice.type() != deviceType)
continue;
@@ -104,10 +105,19 @@
RefPtr<RealtimeMediaSource> CaptureDeviceManager::sourceWithUID(const String& deviceUID, RealtimeMediaSource::Type type, const MediaConstraints* constraints, String& invalidConstraint)
{
for (auto& captureDevice : captureDevices()) {
- if (type == RealtimeMediaSource::None)
+ CaptureDevice::DeviceType deviceType;
+
+ switch (type) {
+ case RealtimeMediaSource::Type::None:
continue;
+ case RealtimeMediaSource::Type::Audio:
+ deviceType = CaptureDevice::DeviceType::Audio;
+ break;
+ case RealtimeMediaSource::Type::Video:
+ deviceType = CaptureDevice::DeviceType::Video;
+ break;
+ }
- CaptureDevice::DeviceType deviceType = type == RealtimeMediaSource::Video ? CaptureDevice::DeviceType::Video : CaptureDevice::DeviceType::Audio;
if (captureDevice.persistentId() != deviceUID || captureDevice.type() != deviceType)
continue;
Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.cpp (213883 => 213884)
--- 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)
@@ -44,7 +44,7 @@
static Ref<EmptyRealtimeMediaSource> create() { return adoptRef(*new EmptyRealtimeMediaSource()); }
private:
- EmptyRealtimeMediaSource() : RealtimeMediaSource(emptyString(), RealtimeMediaSource::None, emptyString()) { }
+ EmptyRealtimeMediaSource() : RealtimeMediaSource(emptyString(), Type::None, emptyString()) { }
RefPtr<RealtimeMediaSourceCapabilities> capabilities() const final { return nullptr; }
const RealtimeMediaSourceSettings& settings() const final { return m_sourceSettings; }
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (213883 => 213884)
--- 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)
@@ -89,7 +89,7 @@
const String& persistentID() const { return m_persistentID; }
virtual void setPersistentID(const String& persistentID) { m_persistentID = persistentID; }
- enum Type { None, Audio, Video };
+ enum class Type { None, Audio, Video };
Type type() const { return m_type; }
virtual const String& name() const { return m_name; }
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm (213883 => 213884)
--- 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)
@@ -90,7 +90,7 @@
}
AVAudioCaptureSource::AVAudioCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id)
- : AVMediaCaptureSource(device, id, RealtimeMediaSource::Audio)
+ : AVMediaCaptureSource(device, id, Type::Audio)
{
}
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (213883 => 213884)
--- 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)
@@ -124,7 +124,7 @@
}
AVVideoCaptureSource::AVVideoCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id)
- : AVMediaCaptureSource(device, id, RealtimeMediaSource::Video)
+ : AVMediaCaptureSource(device, id, Type::Video)
{
}
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (213883 => 213884)
--- 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)
@@ -98,7 +98,7 @@
String invalidConstraint;
if (!audioDeviceID.isEmpty()) {
- auto audioSource = AVCaptureDeviceManager::singleton().sourceWithUID(audioDeviceID, RealtimeMediaSource::Audio, audioConstraints, invalidConstraint);
+ auto audioSource = AVCaptureDeviceManager::singleton().sourceWithUID(audioDeviceID, RealtimeMediaSource::Type::Audio, audioConstraints, invalidConstraint);
#if !LOG_DISABLED
if (!invalidConstraint.isEmpty())
LOG(Media, "RealtimeMediaSourceCenterMac::createMediaStream(%p), audio constraints failed to apply: %s", this, invalidConstraint.utf8().data());
@@ -108,7 +108,7 @@
audioSources.append(audioSource.releaseNonNull());
}
if (!videoDeviceID.isEmpty()) {
- auto videoSource = AVCaptureDeviceManager::singleton().sourceWithUID(videoDeviceID, RealtimeMediaSource::Video, videoConstraints, invalidConstraint);
+ auto videoSource = AVCaptureDeviceManager::singleton().sourceWithUID(videoDeviceID, RealtimeMediaSource::Type::Video, videoConstraints, invalidConstraint);
#if !LOG_DISABLED
if (!invalidConstraint.isEmpty())
LOG(Media, "RealtimeMediaSourceCenterMac::createMediaStream(%p), video constraints failed to apply: %s", this, invalidConstraint.utf8().data());
Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/MediaEndpointOwr.cpp (213883 => 213884)
--- 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)
@@ -354,15 +354,15 @@
RefPtr<RealtimeMediaSourceOwr> source;
switch (type) {
- case RealtimeMediaSource::Audio:
+ case RealtimeMediaSource::Type::Audio:
name = "remote audio";
source = adoptRef(new RealtimeAudioSourceOwr(nullptr, id, type, name));
break;
- case RealtimeMediaSource::Video:
+ case RealtimeMediaSource::Type::Video:
name = "remote video";
source = adoptRef(new RealtimeVideoSourceOwr(nullptr, id, type, name));
break;
- case RealtimeMediaSource::None:
+ case RealtimeMediaSource::Type::None:
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp (213883 => 213884)
--- 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)
@@ -143,16 +143,16 @@
RealtimeMediaSource::Type mediaSourceType;
if (mediaType & OWR_MEDIA_TYPE_AUDIO)
- mediaSourceType = RealtimeMediaSource::Audio;
+ mediaSourceType = RealtimeMediaSource::Type::Audio;
else if (mediaType & OWR_MEDIA_TYPE_VIDEO)
- mediaSourceType = RealtimeMediaSource::Video;
+ mediaSourceType = RealtimeMediaSource::Type::Video;
else {
- mediaSourceType = RealtimeMediaSource::None;
+ mediaSourceType = RealtimeMediaSource::Type::None;
ASSERT_NOT_REACHED();
}
RefPtr<RealtimeMediaSourceOwr> mediaSource;
- if (mediaSourceType == RealtimeMediaSource::Audio)
+ if (mediaSourceType == RealtimeMediaSource::Type::Audio)
mediaSource = adoptRef(new RealtimeAudioSourceOwr(source, id, mediaSourceType, sourceName));
else
mediaSource = adoptRef(new RealtimeVideoSourceOwr(source, id, mediaSourceType, sourceName));
Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.cpp (213883 => 213884)
--- 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)
@@ -196,9 +196,13 @@
RefPtr<RealtimeMediaSource> source;
switch (type) {
- case RealtimeMediaSource::Audio: source = MockRealtimeAudioSource::createMuted("remote audio"); break;
- case RealtimeMediaSource::Video: source = MockRealtimeVideoSource::createMuted("remote video"); break;
- case RealtimeMediaSource::None:
+ case RealtimeMediaSource::Type::Audio:
+ source = MockRealtimeAudioSource::createMuted("remote audio");
+ break;
+ case RealtimeMediaSource::Type::Video:
+ source = MockRealtimeVideoSource::createMuted("remote video");
+ break;
+ case RealtimeMediaSource::Type::None:
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp (213883 => 213884)
--- 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)
@@ -59,7 +59,7 @@
#endif
MockRealtimeAudioSource::MockRealtimeAudioSource(const String& name)
- : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Audio, name)
+ : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Type::Audio, name)
, m_timer(RunLoop::current(), this, &MockRealtimeAudioSource::tick)
{
}
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (213883 => 213884)
--- 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)
@@ -84,10 +84,16 @@
MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id, RealtimeMediaSource::Type type, const String& name)
: BaseRealtimeMediaSourceClass(id, type, name)
{
- if (type == RealtimeMediaSource::Audio)
+ switch (type) {
+ case RealtimeMediaSource::Type::Audio:
setPersistentID(mockAudioSourcePersistentID());
- else
+ return;
+ case RealtimeMediaSource::Type::Video:
setPersistentID(mockVideoSourcePersistentID());
+ return;
+ case RealtimeMediaSource::Type::None:
+ ASSERT_NOT_REACHED();
+ }
}
void MockRealtimeMediaSource::initializeCapabilities()
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (213883 => 213884)
--- 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)
@@ -66,7 +66,7 @@
#endif
MockRealtimeVideoSource::MockRealtimeVideoSource(const String& name)
- : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Video, name)
+ : MockRealtimeMediaSource(createCanonicalUUIDString(), RealtimeMediaSource::Type::Video, name)
, m_timer(RunLoop::current(), this, &MockRealtimeVideoSource::generateFrame)
{
setFrameRate(30);
