WebKit Bugzilla
Attachment 348195 Details for
Bug 189000
: Mock video devices should only support discrete sizes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-189000-20180827141930.patch (text/plain), 71.05 KB, created by
Eric Carlson
on 2018-08-27 14:19:31 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Eric Carlson
Created:
2018-08-27 14:19:31 PDT
Size:
71.05 KB
patch
obsolete
>Subversion Revision: 235110 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 67ce640d4aef7339fddccf59205b71a98300fcdd..dd2ce9b67cdd898c4ada8b21b98013016763d5d4 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,106 @@ >+2018-08-27 Eric Carlson <eric.carlson@apple.com> >+ >+ Mock video devices should only support discrete sizes >+ https://bugs.webkit.org/show_bug.cgi?id=189000 >+ <rdar://problem/43766551> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ While many/most video capture devices only support a finite number of discrete width/height >+ paris, our mock video capture devices supported arbitrary width and height combinations which >+ made it difficult to write realistic tests using them. Change the mock devices to support >+ finite "presets" like those supported by AVFoundation. Create a RealtimeVideoSource base >+ class with support for these presets, so the same code will eventually be used by the mock >+ and real capture devices. >+ >+ No new tests, existing tests updated for these changes. >+ >+ * Sources.txt: Add RealtimeVideoSource.cpp. >+ >+ * WebCore.xcodeproj/project.pbxproj: Ditto. >+ >+ * platform/mediastream/RealtimeMediaSource.cpp: >+ (WebCore::RealtimeMediaSource::selectSettings): Use supportsSizeAndFrameRate for widths, >+ heights, and framerates in advanced constraints so a width and height that are supported but >+ in the same preset are filtered out. >+ (WebCore::RealtimeMediaSource::setSize): New. >+ * platform/mediastream/RealtimeMediaSource.h: >+ >+ * platform/mediastream/RealtimeMediaSourceSettings.h: Remove an unneeded include. >+ >+ * platform/mediastream/RealtimeVideoSource.cpp: Added. >+ (WebCore::RealtimeVideoSource::RealtimeVideoSource): >+ (WebCore::RealtimeVideoSource::~RealtimeVideoSource): >+ (WebCore::RealtimeVideoSource::startProducingData): >+ (WebCore::RealtimeVideoSource::setSupportedFrameRates): >+ (WebCore::RealtimeVideoSource::addSupportedCapabilities const): >+ (WebCore::RealtimeVideoSource::supportsSizeAndFrameRate): >+ (WebCore::RealtimeVideoSource::bestSupportedCaptureSizeForWidthAndHeight): >+ (WebCore::RealtimeVideoSource::applySize): >+ (WebCore::RealtimeVideoSource::applySizeAndFrameRate): >+ (WebCore::RealtimeVideoSource::videoSampleAvailable): >+ (WebCore::RealtimeVideoSource::applyFrameRate): >+ (WebCore::RealtimeVideoSource::supportsFrameRate): >+ >+ * platform/mediastream/RealtimeVideoSource.h: Copied from Source/WebCore/platform/mock/MockRealtimeAudioSource.h. >+ (WebCore::RealtimeVideoSource::setSupportedCaptureSizes): >+ (WebCore::RealtimeVideoSource::setDefaultSize): >+ (WebCore::RealtimeVideoSource::observedFrameRate const): >+ >+ * platform/mediastream/mac/AVMediaCaptureSource.mm: >+ (WebCore::AVMediaCaptureSource::initializeSettings): Don't set label, it isn't used. >+ >+ * platform/mediastream/mac/MockRealtimeVideoSourceMac.mm: >+ (WebCore::MockRealtimeVideoSourceMac::applySize): Call the base class. >+ >+ * platform/mock/MockMediaDevice.h: >+ (WebCore::MockCameraProperties::encode const): Add frame rates, sizes, and facing mode. >+ (WebCore::MockCameraProperties::decode): Ditto. >+ >+ * platform/mock/MockRealtimeAudioSource.cpp: >+ (WebCore::MockRealtimeAudioSource::MockRealtimeAudioSource): >+ (WebCore::MockRealtimeAudioSource::settings const): Clean up. >+ (WebCore::MockRealtimeAudioSource::capabilities const): Ditto. >+ (WebCore::MockRealtimeAudioSource::settingsDidChange): Ditto. >+ (WebCore::MockRealtimeAudioSource::stopProducingData): m_elapsedTime isn't used, delete it. >+ (WebCore::MockRealtimeAudioSource::updateSettings): Deleted. >+ (WebCore::MockRealtimeAudioSource::initializeCapabilities): Deleted. >+ (WebCore::MockRealtimeAudioSource::initializeSupportedConstraints): Deleted. >+ (WebCore::MockRealtimeAudioSource::elapsedTime): Deleted. >+ * platform/mock/MockRealtimeAudioSource.h: >+ >+ * platform/mock/MockRealtimeMediaSource.cpp: >+ (WebCore::defaultDevices): Update video devices with presets. >+ (WebCore::MockRealtimeMediaSource::audioDevices): >+ (WebCore::MockRealtimeMediaSource::videoDevices): >+ (WebCore::MockRealtimeMediaSource::MockRealtimeMediaSource): >+ (WebCore::MockRealtimeMediaSource::initializeCapabilities): Deleted. >+ (WebCore::MockRealtimeMediaSource::capabilities const): Deleted. >+ (WebCore::MockRealtimeMediaSource::initializeSettings): Deleted. >+ (WebCore::MockRealtimeMediaSource::settings const): Deleted. >+ (WebCore::MockRealtimeMediaSource::supportedConstraints): Deleted. >+ * platform/mock/MockRealtimeMediaSource.h: >+ >+ * platform/mock/MockRealtimeVideoSource.cpp: >+ (WebCore::MockRealtimeVideoSource::MockRealtimeVideoSource): Use RealtimeVideoSource. >+ (WebCore::MockRealtimeVideoSource::capabilities const): Ditti, cleanup. >+ (WebCore::MockRealtimeVideoSource::settings const): Ditto. >+ (WebCore::MockRealtimeVideoSource::settingsDidChange): Ditto. >+ (WebCore::MockRealtimeVideoSource::startCaptureTimer): Ditto. >+ (WebCore::MockRealtimeVideoSource::startProducingData): Ditto. >+ (WebCore::MockRealtimeVideoSource::stopProducingData): Ditto. >+ (WebCore::MockRealtimeVideoSource::elapsedTime): Ditto. >+ (WebCore::MockRealtimeVideoSource::applySize): Ditto. >+ (WebCore::MockRealtimeVideoSource::drawText): Render the actual frame rate. >+ (WebCore::MockRealtimeVideoSource::generateFrame): Use m_fillColor. >+ (WebCore::MockRealtimeVideoSource::~MockRealtimeVideoSource): Deleted. >+ (WebCore::MockRealtimeVideoSource::updateSettings): Deleted. >+ (WebCore::MockRealtimeVideoSource::initializeCapabilities): Deleted. >+ (WebCore::MockRealtimeVideoSource::initializeSupportedConstraints): Deleted. >+ (WebCore::MockRealtimeVideoSource::applyFrameRate): Deleted. >+ * platform/mock/MockRealtimeVideoSource.h: >+ (WebCore::MockRealtimeVideoSource::updateSampleBuffer): Deleted. >+ > 2018-08-21 Philippe Normand <philn@igalia.com> > > [GStreamer][MSE] Generic main thread notification support >diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt >index f0ef78610dd046b367272c05aac6744585c938a2..122f761d3cb36f72173d15d7d7387c306f95963a 100644 >--- a/Source/WebCore/Sources.txt >+++ b/Source/WebCore/Sources.txt >@@ -1742,6 +1742,7 @@ platform/mediastream/RealtimeMediaSourceCenter.cpp > platform/mediastream/RealtimeMediaSourceSettings.cpp > platform/mediastream/RealtimeOutgoingAudioSource.cpp > platform/mediastream/RealtimeOutgoingVideoSource.cpp >+platform/mediastream/RealtimeVideoSource.cpp > > platform/mediastream/libwebrtc/LibWebRTCProvider.cpp > >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index b39dab551141f3219ddf8db21318ea6406a62db7..02e02f74dcbf449f4732ca882ddbbb00d8361dd2 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -105,6 +105,7 @@ > 07277E5117D018CC0015534D /* JSMediaStreamEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4517D018CC0015534D /* JSMediaStreamEvent.h */; }; > 07277E5317D018CC0015534D /* JSMediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4717D018CC0015534D /* JSMediaStreamTrack.h */; }; > 07277E5517D018CC0015534D /* JSMediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */; }; >+ 072880D12010F1F60071B255 /* RealtimeVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 072880D02010EED70071B255 /* RealtimeVideoSource.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 072A70401D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */; }; > 072AE1E5183C0741000A5988 /* PluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 072AE1DF183C0741000A5988 /* PluginReplacement.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 072AE1E2183C0741000A5988 /* QuickTimePluginReplacement.h */; }; >@@ -5292,6 +5293,8 @@ > 07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackEvent.cpp; sourceTree = "<group>"; }; > 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackEvent.h; sourceTree = "<group>"; }; > 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrack.h; sourceTree = "<group>"; }; >+ 072880CE2010EED60071B255 /* RealtimeVideoSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeVideoSource.cpp; sourceTree = "<group>"; }; >+ 072880D02010EED70071B255 /* RealtimeVideoSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeVideoSource.h; sourceTree = "<group>"; }; > 072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverconstrainedErrorEvent.h; sourceTree = "<group>"; }; > 072A703F1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OverconstrainedErrorEvent.idl; sourceTree = "<group>"; }; > 072AE1DF183C0741000A5988 /* PluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginReplacement.h; sourceTree = "<group>"; }; >@@ -15273,6 +15276,8 @@ > 41103AA81E39790A00769F03 /* RealtimeOutgoingAudioSource.h */, > 5CDD833B1E4324BB00621E92 /* RealtimeOutgoingVideoSource.cpp */, > 5CDD833C1E4324BB00621E92 /* RealtimeOutgoingVideoSource.h */, >+ 072880CE2010EED60071B255 /* RealtimeVideoSource.cpp */, >+ 072880D02010EED70071B255 /* RealtimeVideoSource.h */, > 3135910C1E7DDCB600F30630 /* RTCBundlePolicy.h */, > 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */, > 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */, >@@ -29899,6 +29904,7 @@ > 07C1C0E51BFB60ED00BD2256 /* RealtimeMediaSourceSupportedConstraints.h in Headers */, > 41103AAC1E39791000769F03 /* RealtimeOutgoingAudioSource.h in Headers */, > 41103AAC1E39791000769F14 /* RealtimeOutgoingAudioSourceCocoa.h in Headers */, >+ 072880D12010F1F60071B255 /* RealtimeVideoSource.h in Headers */, > 91B952241F58A58F00931DC2 /* RecordingSwizzleTypes.h in Headers */, > BC4368E80C226E32005EFB5F /* Rect.h in Headers */, > FD45A958175D414C00C21EC8 /* RectangleShape.h in Headers */, >diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp b/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp >index 8a4609a2d2647410689bf402a2c1d634612c7fd1..1bf18f8a39a60f21ada5b051febc2adbd84b180d 100644 >--- a/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp >+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp >@@ -645,7 +645,19 @@ bool RealtimeMediaSource::selectSettings(const MediaConstraints& constraints, Fl > double constraintDistance = 0; > bool supported = false; > >+ if (advancedConstraint.width() || advancedConstraint.height() || advancedConstraint.frameRate()) { >+ String dummy; >+ if (!supportsSizeAndFrameRate(advancedConstraint.width(), advancedConstraint.height(), advancedConstraint.frameRate(), dummy, constraintDistance)) >+ continue; >+ >+ supported = true; >+ } >+ > advancedConstraint.forEach([&](const MediaConstraint& constraint) { >+ >+ if (constraint.constraintType() == MediaConstraintType::Width || constraint.constraintType() == MediaConstraintType::Height || constraint.constraintType() == MediaConstraintType::FrameRate) >+ return; >+ > distance = fitnessDistance(constraint); > constraintDistance += distance; > if (!std::isinf(distance)) >@@ -842,6 +854,18 @@ void RealtimeMediaSource::applyConstraints(const MediaConstraints& constraints, > failureHandler(result.value().first, result.value().second); > } > >+void RealtimeMediaSource::setSize(const IntSize& size) >+{ >+ if (size == m_size) >+ return; >+ >+ if (!applySize(size)) >+ return; >+ >+ m_size = size; >+ settingsDidChange(); >+} >+ > void RealtimeMediaSource::setWidth(int width) > { > if (width == m_size.width()) >diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSource.h b/Source/WebCore/platform/mediastream/RealtimeMediaSource.h >index c29ab19c16df3b1fd01a0040b92fa5a723b48b0a..2793fac08accf6256a3181364322923f66db20a0 100644 >--- a/Source/WebCore/platform/mediastream/RealtimeMediaSource.h >+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSource.h >@@ -167,6 +167,7 @@ public: > > void setWidth(int); > void setHeight(int); >+ void setSize(const IntSize&); > const IntSize& size() const { return m_size; } > virtual bool applySize(const IntSize&) { return false; } > >@@ -247,7 +248,7 @@ protected: > void initializeSampleRate(int sampleRate) { m_sampleRate = sampleRate; } > void initializeEchoCancellation(bool echoCancellation) { m_echoCancellation = echoCancellation; } > >- void videoSampleAvailable(MediaSample&); >+ virtual void videoSampleAvailable(MediaSample&); > void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t); > > private: >diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h >index 01c1523b820eb9460892130d96fdbbcad653db32..b9f73419d5744b83e6d8982a1e0dd9b27024d255 100644 >--- a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h >+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h >@@ -30,6 +30,7 @@ > > #include "RealtimeMediaSourceSupportedConstraints.h" > #include <wtf/EnumTraits.h> >+#include <wtf/Optional.h> > #include <wtf/RefCounted.h> > #include <wtf/Vector.h> > #include <wtf/text/AtomicString.h> >diff --git a/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp b/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..0c90dcc1f3e523d0a80377a96489d7ea6c5cfcc6 >--- /dev/null >+++ b/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp >@@ -0,0 +1,202 @@ >+/* >+ * Copyright (C) 2018 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer >+ * in the documentation and/or other materials provided with the >+ * distribution. >+ * 3. Neither the name of Google Inc. nor the names of its contributors >+ * may be used to endorse or promote products derived from this >+ * software without specific prior written permission. >+ * >+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS >+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR >+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT >+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, >+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT >+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, >+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY >+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+#include "RealtimeVideoSource.h" >+ >+#if ENABLE(MEDIA_STREAM) >+#include "CaptureDevice.h" >+#include "Logging.h" >+#include "RealtimeMediaSourceCenter.h" >+#include "RealtimeMediaSourceSettings.h" >+ >+namespace WebCore { >+ >+RealtimeVideoSource::RealtimeVideoSource(const String& id, const String& name) >+ : RealtimeMediaSource(id, Type::Video, name) >+{ >+} >+ >+RealtimeVideoSource::~RealtimeVideoSource() >+{ >+#if PLATFORM(IOS) >+ RealtimeMediaSourceCenter::singleton().videoFactory().unsetActiveSource(*this); >+#endif >+} >+ >+void RealtimeVideoSource::startProducingData() >+{ >+ ASSERT(frameRate()); >+ >+#if PLATFORM(IOS) >+ RealtimeMediaSourceCenter::singleton().videoFactory().setActiveSource(*this); >+#endif >+ >+ if (size().isEmpty() && !m_defaultSize.isEmpty()) >+ setSize(m_defaultSize); >+} >+ >+void RealtimeVideoSource::setSupportedFrameRates(const Vector<double>& rates) >+{ >+ m_supportedFrameRates = rates; >+ std::sort(m_supportedFrameRates.begin(), m_supportedFrameRates.end()); >+} >+ >+void RealtimeVideoSource::addSupportedCapabilities(RealtimeMediaSourceCapabilities& capabilities) const >+{ >+ if (!m_supportedFrameRates.size()) >+ capabilities.setFrameRate({ 0, 0 }); >+ else >+ capabilities.setFrameRate({ m_supportedFrameRates[0], m_supportedFrameRates[m_supportedFrameRates.size() - 1] }); >+ >+ if (!m_supportedCaptureSizes.size()) { >+ capabilities.setWidth({ 0, 0 }); >+ capabilities.setHeight({ 0, 0 }); >+ capabilities.setAspectRatio({ 0, 0 }); >+ >+ return; >+ } >+ >+ int minimumWidth = std::numeric_limits<int>::max(); >+ int maximumWidth = 0; >+ int minimumHeight = std::numeric_limits<int>::max(); >+ int maximumHeight = 0; >+ float minimumAspectRatio = std::numeric_limits<float>::max(); >+ float maximumAspectRatio = 0; >+ for (auto size : m_supportedCaptureSizes) { >+ minimumWidth = std::min(minimumWidth, size.width()); >+ maximumWidth = std::max(maximumWidth, size.width()); >+ >+ minimumHeight = std::min(minimumHeight, size.height()); >+ maximumHeight = std::max(maximumHeight, size.height()); >+ >+ minimumAspectRatio = std::min(minimumAspectRatio, size.aspectRatio()); >+ maximumAspectRatio = std::max(maximumAspectRatio, size.aspectRatio()); >+ } >+ >+ capabilities.setWidth({ minimumWidth, maximumWidth }); >+ capabilities.setHeight({ minimumHeight, maximumHeight }); >+ capabilities.setAspectRatio({ minimumAspectRatio, maximumAspectRatio }); >+} >+ >+bool RealtimeVideoSource::supportsSizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double> frameRate) >+{ >+ if (!height && !width && !frameRate) >+ return true; >+ >+ if (height || width) { >+ if (!m_supportedCaptureSizes.size()) >+ return false; >+ >+ IntSize supportedSize = bestSupportedCaptureSizeForWidthAndHeight(width, height); >+ if (supportedSize.isEmpty()) >+ return false; >+ } >+ >+ if (!frameRate) >+ return true; >+ >+ return supportsFrameRate(frameRate.value()); >+} >+ >+IntSize RealtimeVideoSource::bestSupportedCaptureSizeForWidthAndHeight(std::optional<int> width, std::optional<int> height) >+{ >+ if (!width && !height) >+ return { }; >+ >+ for (auto size : m_supportedCaptureSizes) { >+ if ((!width || width.value() == size.width()) && (!height || height.value() == size.height())) >+ return size; >+ } >+ >+ return { }; >+} >+ >+bool RealtimeVideoSource::applySize(const IntSize& size) >+{ >+ IntSize supportedSize = bestSupportedCaptureSizeForWidthAndHeight(size.width(), size.height()); >+ if (supportedSize.isEmpty()) { >+ LOG(Media, "RealtimeVideoSource::applySize(%p), unable find or set preset for width: %i, height: %i", this, size.width(), size.height()); >+ return false; >+ } >+ >+ return true; >+} >+ >+void RealtimeVideoSource::applySizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double> frameRate) >+{ >+ if (width || height) { >+ IntSize supportedSize = bestSupportedCaptureSizeForWidthAndHeight(WTFMove(width), WTFMove(height)); >+ ASSERT(!supportedSize.isEmpty()); >+ if (!supportedSize.isEmpty()) >+ setSize(supportedSize); >+ } >+ >+ if (frameRate) >+ setFrameRate(frameRate.value()); >+} >+ >+void RealtimeVideoSource::videoSampleAvailable(MediaSample& sample) >+{ >+ MediaTime sampleTime = sample.outputPresentationTime(); >+ if (!sampleTime || !sampleTime.isValid()) >+ sampleTime = sample.presentationTime(); >+ >+ auto frameTime = sampleTime.toDouble(); >+ m_observedFrameTimeStamps.append(frameTime); >+ m_observedFrameTimeStamps.removeAllMatching([&](auto time) { >+ return time <= frameTime - 2; >+ }); >+ >+ auto interval = m_observedFrameTimeStamps.last() - m_observedFrameTimeStamps.first(); >+ if (interval > 1) >+ m_observedFrameRate = (m_observedFrameTimeStamps.size() / interval); >+ >+ RealtimeMediaSource::videoSampleAvailable(sample); >+} >+ >+bool RealtimeVideoSource::applyFrameRate(double rate) >+{ >+ return supportsFrameRate(rate); >+} >+ >+bool RealtimeVideoSource::supportsFrameRate(double frameRate) >+{ >+ double epsilon = 0.001; >+ for (auto rate : m_supportedFrameRates) { >+ if (frameRate + epsilon >= rate && frameRate - epsilon <= rate) >+ return true; >+ } >+ return false; >+} >+ >+} // namespace WebCore >+ >+#endif // ENABLE(MEDIA_STREAM) >diff --git a/Source/WebCore/platform/mediastream/RealtimeVideoSource.h b/Source/WebCore/platform/mediastream/RealtimeVideoSource.h >new file mode 100644 >index 0000000000000000000000000000000000000000..4258041c9a66ae68f342461271b414944209ed9c >--- /dev/null >+++ b/Source/WebCore/platform/mediastream/RealtimeVideoSource.h >@@ -0,0 +1,82 @@ >+/* >+ * Copyright (C) 2018 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer >+ * in the documentation and/or other materials provided with the >+ * distribution. >+ * 3. Neither the name of Ericsson nor the names of its contributors >+ * may be used to endorse or promote products derived from this >+ * software without specific prior written permission. >+ * >+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS >+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR >+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT >+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, >+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT >+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, >+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY >+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#pragma once >+ >+#if ENABLE(MEDIA_STREAM) >+ >+#include "FontCascade.h" >+#include "ImageBuffer.h" >+#include "MediaSample.h" >+#include "RealtimeMediaSource.h" >+#include <wtf/Lock.h> >+#include <wtf/RunLoop.h> >+ >+namespace WebCore { >+ >+class RealtimeVideoSource : public RealtimeMediaSource { >+public: >+ >+ virtual ~RealtimeVideoSource(); >+ >+protected: >+ RealtimeVideoSource(const String& id, const String& name); >+ >+ void startProducingData() override; >+ void videoSampleAvailable(MediaSample&) override; >+ bool supportsSizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double>) override; >+ void applySizeAndFrameRate(std::optional<int> width, std::optional<int> height, std::optional<double>) override; >+ bool applySize(const IntSize&) override; >+ bool applyFrameRate(double) override; >+ >+ void setSupportedFrameRates(const Vector<double>&); >+ void setSupportedCaptureSizes(const Vector<IntSize>& sizes) { m_supportedCaptureSizes = sizes; } >+ IntSize bestSupportedCaptureSizeForWidthAndHeight(std::optional<int> width, std::optional<int> height); >+ >+ void addSupportedCapabilities(RealtimeMediaSourceCapabilities&) const; >+ >+ void setDefaultSize(const IntSize& size) { m_defaultSize = size; } >+ >+ double observedFrameRate() const { return m_observedFrameRate; } >+ >+private: >+ bool supportsFrameRate(double); >+ >+ Vector<IntSize> m_supportedCaptureSizes; >+ Vector<double> m_supportedFrameRates; >+ Deque<double> m_observedFrameTimeStamps; >+ double m_observedFrameRate { 0 }; >+ IntSize m_defaultSize; >+}; >+ >+} // namespace WebCore >+ >+#endif // ENABLE(MEDIA_STREAM) >+ >diff --git a/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm b/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm >index 9824aa754b2139b545e787c3b5211bc3e0382b28..2c114eb9bedbfd2c118915b251add623ba4e1c45 100644 >--- a/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm >+++ b/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm >@@ -213,7 +213,6 @@ void AVMediaCaptureSource::initializeSettings() > m_currentSettings.setSupportedConstraints(supportedConstraints()); > > m_currentSettings.setDeviceId(id()); >- m_currentSettings.setLabel(name()); > updateSettings(m_currentSettings); > } > >diff --git a/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm b/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm >index 2ad4d0133e96752b1137cadeeb811356dcb337ac..5113ccc6ca1c2ee11b80e3055fce5a359563e888 100644 >--- a/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm >+++ b/Source/WebCore/platform/mediastream/mac/MockRealtimeVideoSourceMac.mm >@@ -156,10 +156,11 @@ void MockRealtimeVideoSourceMac::updateSampleBuffer() > > bool MockRealtimeVideoSourceMac::applySize(const IntSize& newSize) > { >- if (size() != newSize) >- m_bufferPool = nullptr; >+ if (!MockRealtimeVideoSource::applySize(newSize)) >+ return false; > >- return MockRealtimeVideoSource::applySize(newSize); >+ m_bufferPool = nullptr; >+ return true; > } > > void MockRealtimeVideoSourceMac::orientationChanged(int orientation) >diff --git a/Source/WebCore/platform/mock/MockMediaDevice.h b/Source/WebCore/platform/mock/MockMediaDevice.h >index 882dbaf10e7d6ada06656ce1871cd20ea5b84e4a..8e777cff2e2d6d0544a375dbbd186132f0f70bcf 100644 >--- a/Source/WebCore/platform/mock/MockMediaDevice.h >+++ b/Source/WebCore/platform/mock/MockMediaDevice.h >@@ -60,7 +60,9 @@ struct MockCameraProperties { > void encode(Encoder& encoder) const > { > encoder << defaultFrameRate; >- encoder << facingModeCapability; >+ encoder << facingMode; >+ encoder << frameRates; >+ encoder << frameSizes; > } > > template <class Decoder> >@@ -71,16 +73,28 @@ struct MockCameraProperties { > if (!defaultFrameRate) > return std::nullopt; > >- std::optional<RealtimeMediaSourceSettings::VideoFacingMode> facingModeCapability; >- decoder >> facingModeCapability; >- if (!facingModeCapability) >+ std::optional<RealtimeMediaSourceSettings::VideoFacingMode> facingMode; >+ decoder >> facingMode; >+ if (!facingMode) > return std::nullopt; > >- return MockCameraProperties { *defaultFrameRate, *facingModeCapability, Color::black }; >+ std::optional<Vector<double>> frameRates; >+ decoder >> frameRates; >+ if (!frameRates) >+ return std::nullopt; >+ >+ std::optional<Vector<IntSize>> frameSizes; >+ decoder >> frameSizes; >+ if (!frameSizes) >+ return std::nullopt; >+ >+ return MockCameraProperties { *defaultFrameRate, *facingMode, *frameRates, *frameSizes, Color::black }; > } > > double defaultFrameRate { 30 }; >- RealtimeMediaSourceSettings::VideoFacingMode facingModeCapability { RealtimeMediaSourceSettings::VideoFacingMode::User }; >+ RealtimeMediaSourceSettings::VideoFacingMode facingMode { RealtimeMediaSourceSettings::VideoFacingMode::User }; >+ Vector<double> frameRates { 30, 15 }; >+ Vector<IntSize> frameSizes { { 640, 480 }, { 352, 288 }, { 320, 240 } }; > Color fillColor { Color::black }; > }; > >diff --git a/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp b/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp >index 002caf31236ecb646bf82441182cb1508746c002..3c5b80876f0ab911b9d2b3c6546020ce018fad64 100644 >--- a/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp >+++ b/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2015-2017 Apple Inc. All rights reserved. >+ * Copyright (C) 2015-2018 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -78,7 +78,8 @@ RealtimeMediaSource::AudioCaptureFactory& MockRealtimeAudioSource::factory() > } > > MockRealtimeAudioSource::MockRealtimeAudioSource(const String& deviceID, const String& name) >- : MockRealtimeMediaSource(deviceID, RealtimeMediaSource::Type::Audio, name) >+ : RealtimeMediaSource(deviceID, RealtimeMediaSource::Type::Audio, name) >+ , MockRealtimeMediaSource(deviceID) > , m_timer(RunLoop::current(), this, &MockRealtimeAudioSource::tick) > { > } >@@ -90,27 +91,49 @@ MockRealtimeAudioSource::~MockRealtimeAudioSource() > #endif > } > >-void MockRealtimeAudioSource::updateSettings(RealtimeMediaSourceSettings& settings) >+const RealtimeMediaSourceSettings& MockRealtimeAudioSource::settings() const > { >- settings.setVolume(volume()); >- settings.setEchoCancellation(echoCancellation()); >- settings.setSampleRate(sampleRate()); >+ if (!m_currentSettings) { >+ RealtimeMediaSourceSettings settings; >+ settings.setDeviceId(id()); >+ settings.setVolume(volume()); >+ settings.setEchoCancellation(echoCancellation()); >+ settings.setSampleRate(sampleRate()); >+ >+ RealtimeMediaSourceSupportedConstraints supportedConstraints; >+ supportedConstraints.setSupportsDeviceId(true); >+ supportedConstraints.setSupportsVolume(true); >+ supportedConstraints.setSupportsEchoCancellation(true); >+ supportedConstraints.setSupportsSampleRate(true); >+ settings.setSupportedConstraints(supportedConstraints); >+ >+ m_currentSettings = WTFMove(settings); >+ } >+ return m_currentSettings.value(); > } > >-void MockRealtimeAudioSource::initializeCapabilities(RealtimeMediaSourceCapabilities& capabilities) >+const RealtimeMediaSourceCapabilities& MockRealtimeAudioSource::capabilities() const > { >- capabilities.setVolume(CapabilityValueOrRange(0.0, 1.0)); >- capabilities.setEchoCancellation(RealtimeMediaSourceCapabilities::EchoCancellation::ReadWrite); >- capabilities.setSampleRate(CapabilityValueOrRange(44100, 48000)); >+ if (!m_capabilities) { >+ RealtimeMediaSourceCapabilities capabilities(settings().supportedConstraints()); >+ >+ capabilities.setDeviceId(id()); >+ capabilities.setVolume(CapabilityValueOrRange(0.0, 1.0)); >+ capabilities.setEchoCancellation(RealtimeMediaSourceCapabilities::EchoCancellation::ReadWrite); >+ capabilities.setSampleRate(CapabilityValueOrRange(44100, 48000)); >+ >+ m_capabilities = WTFMove(capabilities); >+ } >+ return m_capabilities.value(); > } > >-void MockRealtimeAudioSource::initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints& supportedConstraints) >+void MockRealtimeAudioSource::settingsDidChange() > { >- supportedConstraints.setSupportsVolume(true); >- supportedConstraints.setSupportsEchoCancellation(true); >- supportedConstraints.setSupportsSampleRate(true); >+ m_currentSettings = std::nullopt; >+ RealtimeMediaSource::settingsDidChange(); > } > >+ > void MockRealtimeAudioSource::startProducingData() > { > #if PLATFORM(IOS) >@@ -127,18 +150,9 @@ void MockRealtimeAudioSource::startProducingData() > void MockRealtimeAudioSource::stopProducingData() > { > m_timer.stop(); >- m_elapsedTime += MonotonicTime::now() - m_startTime; > m_startTime = MonotonicTime::nan(); > } > >-Seconds MockRealtimeAudioSource::elapsedTime() >-{ >- if (std::isnan(m_startTime)) >- return m_elapsedTime; >- >- return m_elapsedTime + (MonotonicTime::now() - m_startTime); >-} >- > void MockRealtimeAudioSource::tick() > { > if (std::isnan(m_lastRenderTime)) >diff --git a/Source/WebCore/platform/mock/MockRealtimeAudioSource.h b/Source/WebCore/platform/mock/MockRealtimeAudioSource.h >index 381a444cef604a9d3022ea0ef800e6fea463c8b0..9a2c042b3f48a0802eaeaa9d613d01254777c626 100644 >--- a/Source/WebCore/platform/mock/MockRealtimeAudioSource.h >+++ b/Source/WebCore/platform/mock/MockRealtimeAudioSource.h >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2015-2017 Apple Inc. All rights reserved. >+ * Copyright (C) 2015-2018 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -38,7 +38,7 @@ > > namespace WebCore { > >-class MockRealtimeAudioSource : public MockRealtimeMediaSource { >+class MockRealtimeAudioSource : public RealtimeMediaSource, public MockRealtimeMediaSource { > public: > > static CaptureSourceOrError create(const String& deviceID, const String& name, const MediaConstraints*); >@@ -55,7 +55,6 @@ protected: > > virtual void render(Seconds) { } > >- Seconds elapsedTime(); > static Seconds renderInterval() { return 60_ms; } > > private: >@@ -65,9 +64,9 @@ private: > bool applySampleSize(int) override { return true; } > bool applyEchoCancellation(bool) override { return true; } > >- void updateSettings(RealtimeMediaSourceSettings&) override; >- void initializeCapabilities(RealtimeMediaSourceCapabilities&) override; >- void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) override; >+ const RealtimeMediaSourceCapabilities& capabilities() const final; >+ const RealtimeMediaSourceSettings& settings() const final; >+ void settingsDidChange() final; > > void tick(); > >@@ -75,6 +74,10 @@ private: > > void delaySamples(Seconds) final; > >+ mutable std::optional<RealtimeMediaSourceCapabilities> m_capabilities; >+ mutable std::optional<RealtimeMediaSourceSettings> m_currentSettings; >+ RealtimeMediaSourceSupportedConstraints m_supportedConstraints; >+ > RunLoop::Timer<MockRealtimeAudioSource> m_timer; > MonotonicTime m_startTime { MonotonicTime::nan() }; > MonotonicTime m_lastRenderTime { MonotonicTime::nan() }; >diff --git a/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp b/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp >index ec441efd75e9387676655bd025d937b5387737a3..76ffbec3dfc0bef509f2a1c3cee0ffeab390f09f 100644 >--- a/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp >+++ b/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp >@@ -50,8 +50,23 @@ static inline Vector<MockMediaDevice> defaultDevices() > MockMediaDevice { "239c24b0-2b15-11e3-8224-0800200c9a66"_s, "Mock audio device 1"_s, MockMicrophoneProperties { 44100 } }, > MockMediaDevice { "239c24b1-2b15-11e3-8224-0800200c9a66"_s, "Mock audio device 2"_s, MockMicrophoneProperties { 48000 } }, > >- MockMediaDevice { "239c24b2-2b15-11e3-8224-0800200c9a66"_s, "Mock video device 1"_s, MockCameraProperties { 30, RealtimeMediaSourceSettings::VideoFacingMode::User, Color::black } }, >- MockMediaDevice { "239c24b3-2b15-11e3-8224-0800200c9a66"_s, "Mock video device 2"_s, MockCameraProperties { 15, RealtimeMediaSourceSettings::VideoFacingMode::Environment, Color::darkGray } }, >+ MockMediaDevice { "239c24b2-2b15-11e3-8224-0800200c9a66"_s, "Mock video device 1"_s, >+ MockCameraProperties { >+ 30, >+ RealtimeMediaSourceSettings::VideoFacingMode::User, >+ { 30.00, 27.50, 25.00, 22.50, 20.00, 17.50, 15.00, 12.50, 10.00, 7.50, 5.00 }, >+ { { 3840, 2160 }, { 1920, 1080 }, { 1280, 720 }, { 960, 540 }, { 640, 480 }, { 352, 288 }, { 320, 240 } }, >+ Color::black, >+ } }, >+ >+ MockMediaDevice { "239c24b3-2b15-11e3-8224-0800200c9a66"_s, "Mock video device 2"_s, >+ MockCameraProperties { >+ 15, >+ RealtimeMediaSourceSettings::VideoFacingMode::Environment, >+ { 25.00, 22.50, 20.00, 17.50, 15.00, 12.50, 10.00, 7.50, 5.00 }, >+ { { 1280, 720 }, { 960, 540 }, { 640, 480 }, { 352, 288 }, { 320, 240 }, { 160, 120 } }, >+ Color::darkGray, >+ } }, > > MockMediaDevice { "SCREEN-1"_s, "Mock screen device 1"_s, MockDisplayProperties { 30, Color::lightGray } }, > MockMediaDevice { "SCREEN-2"_s, "Mock screen device 2"_s, MockDisplayProperties { 10, Color::yellow } } >@@ -170,6 +185,7 @@ Vector<CaptureDevice>& MockRealtimeMediaSource::audioDevices() > } > return audioDevices; > }()); >+ > return audioDevices; > } > >@@ -183,6 +199,7 @@ Vector<CaptureDevice>& MockRealtimeMediaSource::videoDevices() > } > return videoDevices; > }()); >+ > return videoDevices; > } > >@@ -200,54 +217,10 @@ Vector<CaptureDevice>& MockRealtimeMediaSource::displayDevices() > return displayDevices; > } > >-MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id, RealtimeMediaSource::Type type, const String& name) >- : RealtimeMediaSource(id, type, name) >- , m_device(deviceMap().get(id)) >-{ >- ASSERT(type != RealtimeMediaSource::Type::None); >- setPersistentID(String(id)); >-} >- >-void MockRealtimeMediaSource::initializeCapabilities() >-{ >- m_capabilities = std::make_unique<RealtimeMediaSourceCapabilities>(supportedConstraints()); >- m_capabilities->setDeviceId(id()); >- initializeCapabilities(*m_capabilities.get()); >-} >- >-const RealtimeMediaSourceCapabilities& MockRealtimeMediaSource::capabilities() const >-{ >- if (!m_capabilities) >- const_cast<MockRealtimeMediaSource&>(*this).initializeCapabilities(); >- return *m_capabilities; >-} >- >-void MockRealtimeMediaSource::initializeSettings() >+MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id) >+ : m_device(deviceMap().get(id)) > { >- if (m_currentSettings.deviceId().isEmpty()) { >- m_currentSettings.setSupportedConstraints(supportedConstraints()); >- m_currentSettings.setDeviceId(id()); >- m_currentSettings.setLabel(name()); >- } >- >- updateSettings(m_currentSettings); >-} >- >-const RealtimeMediaSourceSettings& MockRealtimeMediaSource::settings() const >-{ >- const_cast<MockRealtimeMediaSource&>(*this).initializeSettings(); >- return m_currentSettings; >-} >- >-RealtimeMediaSourceSupportedConstraints& MockRealtimeMediaSource::supportedConstraints() >-{ >- if (m_supportedConstraints.supportsDeviceId()) >- return m_supportedConstraints; >- >- m_supportedConstraints.setSupportsDeviceId(true); >- initializeSupportedConstraints(m_supportedConstraints); >- >- return m_supportedConstraints; >+ ASSERT(deviceMap().find(id) != deviceMap().end()); > } > > } // namespace WebCore >diff --git a/Source/WebCore/platform/mock/MockRealtimeMediaSource.h b/Source/WebCore/platform/mock/MockRealtimeMediaSource.h >index 3355da661ec60e9df1a251c000ab56971cf8cb1c..2c8635ac753dbca9f27a1bec327b7d31abba8d4b 100644 >--- a/Source/WebCore/platform/mock/MockRealtimeMediaSource.h >+++ b/Source/WebCore/platform/mock/MockRealtimeMediaSource.h >@@ -38,7 +38,9 @@ > > namespace WebCore { > >-class MockRealtimeMediaSource : public RealtimeMediaSource { >+class CaptureDevice; >+ >+class MockRealtimeMediaSource { > public: > virtual ~MockRealtimeMediaSource() = default; > >@@ -54,25 +56,16 @@ public: > static std::optional<CaptureDevice> captureDeviceWithPersistentID(CaptureDevice::DeviceType, const String&); > > protected: >- MockRealtimeMediaSource(const String& id, Type, const String& name); >+ MockRealtimeMediaSource(const String&); > > static void createCaptureDevice(const MockMediaDevice&); > >- virtual void updateSettings(RealtimeMediaSourceSettings&) = 0; >- virtual void initializeCapabilities(RealtimeMediaSourceCapabilities&) = 0; >- virtual void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) = 0; >- >- const RealtimeMediaSourceCapabilities& capabilities() const override; >- const RealtimeMediaSourceSettings& settings() const override; >- > RealtimeMediaSourceSupportedConstraints& supportedConstraints(); > > const MockMediaDevice& device() const { return m_device; } > MockMediaDevice m_device; > > private: >- void initializeCapabilities(); >- void initializeSettings(); > > RealtimeMediaSourceSettings m_currentSettings; > RealtimeMediaSourceSupportedConstraints m_supportedConstraints; >diff --git a/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp b/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp >index 9c41e1c4727ee416643227ab0e4a53c9bcc9b200..88b399cc1327f71d00edbf89829f02fae7196dd5 100644 >--- a/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp >+++ b/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp >@@ -105,62 +105,56 @@ RealtimeMediaSource::VideoCaptureFactory& MockRealtimeVideoSource::factory() > } > > MockRealtimeVideoSource::MockRealtimeVideoSource(const String& deviceID, const String& name) >- : MockRealtimeMediaSource(deviceID, RealtimeMediaSource::Type::Video, name) >- , m_timer(RunLoop::current(), this, &MockRealtimeVideoSource::generateFrame) >+ : MockRealtimeMediaSource(deviceID) >+ , RealtimeVideoSource(deviceID, name) >+ , m_emitFrameTimer(RunLoop::current(), this, &MockRealtimeVideoSource::generateFrame) > { > m_dashWidths.reserveInitialCapacity(2); > m_dashWidths.uncheckedAppend(6); > m_dashWidths.uncheckedAppend(6); > > if (mockScreen()) { >- setFrameRate(WTF::get<MockDisplayProperties>(device().properties).defaultFrameRate); >+ auto& properties = WTF::get<MockDisplayProperties>(device().properties); >+ setFrameRate(properties.defaultFrameRate); >+ m_fillColor = properties.fillColor; > return; > } > > auto& properties = WTF::get<MockCameraProperties>(device().properties); > setFrameRate(properties.defaultFrameRate); >- setFacingMode(properties.facingModeCapability); >+ setFacingMode(properties.facingMode); >+ setSupportedFrameRates(properties.frameRates); >+ setSupportedCaptureSizes(properties.frameSizes); >+ m_fillColor = properties.fillColor; > } > >-MockRealtimeVideoSource::~MockRealtimeVideoSource() >+const RealtimeMediaSourceCapabilities& MockRealtimeVideoSource::capabilities() const > { >-#if PLATFORM(IOS) >- MockRealtimeMediaSourceCenter::videoCaptureSourceFactory().unsetActiveSource(*this); >-#endif >-} >- >-void MockRealtimeVideoSource::startProducingData() >-{ >-#if PLATFORM(IOS) >- MockRealtimeMediaSourceCenter::videoCaptureSourceFactory().setActiveSource(*this); >-#endif >+ if (!m_capabilities) { >+ RealtimeMediaSourceCapabilities capabilities(settings().supportedConstraints()); >+ >+ capabilities.setDeviceId(id()); >+ if (mockCamera()) { >+ capabilities.addFacingMode(WTF::get<MockCameraProperties>(device().properties).facingMode); >+ addSupportedCapabilities(capabilities); >+ } else { >+ capabilities.setWidth(CapabilityValueOrRange(72, 2880)); >+ capabilities.setHeight(CapabilityValueOrRange(45, 1800)); >+ capabilities.setFrameRate(CapabilityValueOrRange(.01, 60.0)); >+ } > >- if (size().isEmpty()) { >- setWidth(640); >- setHeight(480); >+ m_capabilities = WTFMove(capabilities); > } >- >- m_startTime = MonotonicTime::now(); >- m_timer.startRepeating(1_ms * lround(1000 / frameRate())); >+ return m_capabilities.value(); > } > >-void MockRealtimeVideoSource::stopProducingData() >+const RealtimeMediaSourceSettings& MockRealtimeVideoSource::settings() const > { >- m_timer.stop(); >- m_elapsedTime += MonotonicTime::now() - m_startTime; >- m_startTime = MonotonicTime::nan(); >-} >+ if (m_currentSettings) >+ return m_currentSettings.value(); > >-Seconds MockRealtimeVideoSource::elapsedTime() >-{ >- if (std::isnan(m_startTime)) >- return m_elapsedTime; >- >- return m_elapsedTime + (MonotonicTime::now() - m_startTime); >-} > >-void MockRealtimeVideoSource::updateSettings(RealtimeMediaSourceSettings& settings) >-{ >+ RealtimeMediaSourceSettings settings; > if (mockCamera()) > settings.setFacingMode(facingMode()); > else { >@@ -173,49 +167,74 @@ void MockRealtimeVideoSource::updateSettings(RealtimeMediaSourceSettings& settin > settings.setHeight(size.height()); > if (aspectRatio()) > settings.setAspectRatio(aspectRatio()); >+ settings.setDeviceId(id()); >+ >+ RealtimeMediaSourceSupportedConstraints supportedConstraints; >+ supportedConstraints.setSupportsDeviceId(true); >+ supportedConstraints.setSupportsFrameRate(true); >+ supportedConstraints.setSupportsWidth(true); >+ supportedConstraints.setSupportsHeight(true); >+ supportedConstraints.setSupportsAspectRatio(true); >+ if (mockCamera()) >+ supportedConstraints.setSupportsFacingMode(true); >+ settings.setSupportedConstraints(supportedConstraints); >+ >+ m_currentSettings = WTFMove(settings); >+ >+ return m_currentSettings.value(); > } > >-void MockRealtimeVideoSource::initializeCapabilities(RealtimeMediaSourceCapabilities& capabilities) >+void MockRealtimeVideoSource::settingsDidChange() > { >- if (mockCamera()) { >- capabilities.addFacingMode(WTF::get<MockCameraProperties>(device().properties).facingModeCapability); >+ m_currentSettings = std::nullopt; >+ RealtimeVideoSource::settingsDidChange(); > >- capabilities.setWidth(CapabilityValueOrRange(320, 1920)); >- capabilities.setHeight(CapabilityValueOrRange(240, 1080)); >- capabilities.setFrameRate(CapabilityValueOrRange(15.0, 60.0)); >- capabilities.setAspectRatio(CapabilityValueOrRange(4 / 3.0, 16 / 9.0)); >- } else { >- capabilities.setWidth(CapabilityValueOrRange(72, 2880)); >- capabilities.setHeight(CapabilityValueOrRange(45, 1800)); >- capabilities.setFrameRate(CapabilityValueOrRange(.01, 60.0)); >+ if (m_haveProducedData) { >+ startCaptureTimer(); >+ generateFrame(); > } > } > >-void MockRealtimeVideoSource::initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints& supportedConstraints) >+void MockRealtimeVideoSource::startCaptureTimer() > { >- supportedConstraints.setSupportsWidth(true); >- supportedConstraints.setSupportsHeight(true); >- supportedConstraints.setSupportsAspectRatio(true); >- supportedConstraints.setSupportsFrameRate(true); >- if (mockCamera()) >- supportedConstraints.setSupportsFacingMode(true); >+ m_emitFrameTimer.startRepeating(1_ms * lround(1000 / frameRate())); > } > >-bool MockRealtimeVideoSource::applyFrameRate(double rate) >+void MockRealtimeVideoSource::startProducingData() > { >- if (m_timer.isActive()) >- m_timer.startRepeating(1_ms * lround(1000 / rate)); >+ RealtimeVideoSource::startProducingData(); > >- updateSampleBuffer(); >- return true; >+ startCaptureTimer(); >+ >+ m_startTime = MonotonicTime::now(); >+ m_haveProducedData = true; >+} >+ >+void MockRealtimeVideoSource::stopProducingData() >+{ >+ m_emitFrameTimer.stop(); >+ m_elapsedTime += MonotonicTime::now() - m_startTime; >+ m_startTime = MonotonicTime::nan(); >+} >+ >+Seconds MockRealtimeVideoSource::elapsedTime() >+{ >+ if (std::isnan(m_startTime)) >+ return m_elapsedTime; >+ >+ return m_elapsedTime + (MonotonicTime::now() - m_startTime); > } > > bool MockRealtimeVideoSource::applySize(const IntSize& size) > { >+ if (!RealtimeVideoSource::applySize(size)) >+ return false; >+ > m_baseFontSize = size.height() * .08; > m_bipBopFontSize = m_baseFontSize * 2.5; > m_statsFontSize = m_baseFontSize * .5; > m_imageBuffer = nullptr; >+ > return true; > } > >@@ -344,12 +363,16 @@ void MockRealtimeVideoSource::drawText(GraphicsContext& context) > timeLocation.move(0, m_baseFontSize); > context.drawText(timeFont, TextRun((StringView(string))), timeLocation); > >- FloatPoint statsLocation(size.width() * .65, size.height() * .75); >- string = String::format("Frame rate: %ffps", frameRate()); >+ FloatPoint statsLocation(size.width() * .45, size.height() * .75); >+ string = String::format("Requested frame rate: %.1f fps", frameRate()); > context.drawText(statsFont, TextRun((StringView(string))), statsLocation); > >- string = String::format("Size: %u x %u", size.width(), size.height()); > statsLocation.move(0, m_statsFontSize); >+ string = String::format("Observed frame rate: %.1f fps", observedFrameRate()); >+ context.drawText(statsFont, TextRun((StringView(string))), statsLocation); >+ >+ statsLocation.move(0, m_statsFontSize); >+ string = String::format("Size: %u x %u", size.width(), size.height()); > context.drawText(statsFont, TextRun((StringView(string))), statsLocation); > > if (mockCamera()) { >@@ -415,8 +438,7 @@ void MockRealtimeVideoSource::generateFrame() > auto& size = this->size(); > FloatRect frameRect(FloatPoint(), size); > >- auto fillColor = mockCamera() ? WTF::get<MockCameraProperties>(device().properties).fillColor : WTF::get<MockDisplayProperties>(device().properties).fillColor; >- context.fillRect(FloatRect(FloatPoint(), size), fillColor); >+ context.fillRect(FloatRect(FloatPoint(), size), m_fillColor); > > if (!muted()) { > drawText(context); >diff --git a/Source/WebCore/platform/mock/MockRealtimeVideoSource.h b/Source/WebCore/platform/mock/MockRealtimeVideoSource.h >index a6589b875487704e8b4887a452ee37d97710a60d..185e9fce1d9ecbf35a6ad3233145eeec11a8822b 100644 >--- a/Source/WebCore/platform/mock/MockRealtimeVideoSource.h >+++ b/Source/WebCore/platform/mock/MockRealtimeVideoSource.h >@@ -36,6 +36,7 @@ > #include "FontCascade.h" > #include "ImageBuffer.h" > #include "MockRealtimeMediaSource.h" >+#include "RealtimeVideoSource.h" > #include <wtf/RunLoop.h> > > namespace WebCore { >@@ -43,28 +44,28 @@ namespace WebCore { > class FloatRect; > class GraphicsContext; > >-class MockRealtimeVideoSource : public MockRealtimeMediaSource { >+class MockRealtimeVideoSource : public MockRealtimeMediaSource, public RealtimeVideoSource { > public: > > static CaptureSourceOrError create(const String& deviceID, const String& name, const MediaConstraints*); > > static VideoCaptureFactory& factory(); > >- virtual ~MockRealtimeVideoSource(); >- > protected: > MockRealtimeVideoSource(const String& deviceID, const String& name); >- virtual void updateSampleBuffer() { } > >+ virtual void updateSampleBuffer() = 0; >+ >+ void setCurrentFrame(MediaSample&); > ImageBuffer* imageBuffer() const; > > Seconds elapsedTime(); > bool applySize(const IntSize&) override; > > private: >- void updateSettings(RealtimeMediaSourceSettings&) override; >- void initializeCapabilities(RealtimeMediaSourceCapabilities&) override; >- void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) override; >+ const RealtimeMediaSourceCapabilities& capabilities() const final; >+ const RealtimeMediaSourceSettings& settings() const final; >+ void settingsDidChange() final; > > void startProducingData() final; > void stopProducingData() final; >@@ -73,13 +74,13 @@ private: > void drawText(GraphicsContext&); > void drawBoxes(GraphicsContext&); > >- bool applyFrameRate(double) override; > bool applyFacingMode(RealtimeMediaSourceSettings::VideoFacingMode) override { return true; } > bool applyAspectRatio(double) override { return true; } > > bool isCaptureSource() const final { return true; } > > void generateFrame(); >+ void startCaptureTimer(); > > void delaySamples(Seconds) override; > >@@ -100,8 +101,13 @@ private: > MonotonicTime m_delayUntil; > > unsigned m_frameNumber { 0 }; >+ RunLoop::Timer<MockRealtimeVideoSource> m_emitFrameTimer; >+ mutable std::optional<RealtimeMediaSourceCapabilities> m_capabilities; >+ mutable std::optional<RealtimeMediaSourceSettings> m_currentSettings; >+ RealtimeMediaSourceSupportedConstraints m_supportedConstraints; >+ Color m_fillColor { Color::black }; > >- RunLoop::Timer<MockRealtimeVideoSource> m_timer; >+ bool m_haveProducedData { false }; > }; > > } // namespace WebCore >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index ddbe2a91605bebfdd8f2828f8e37bcf901509227..4bf79b37cdd46f7b0dd468c861548b45cc2e2d00 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,20 @@ >+2018-08-27 Eric Carlson <eric.carlson@apple.com> >+ >+ Mock video devices should only support discrete sizes >+ https://bugs.webkit.org/show_bug.cgi?id=189000 >+ <rdar://problem/43766551> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * fast/mediastream/MediaDevices-getUserMedia.html: >+ * fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt: >+ * fast/mediastream/apply-constraints-advanced-expected.txt: >+ * fast/mediastream/apply-constraints-advanced.html: >+ * fast/mediastream/apply-constraints-video-expected.txt: >+ * fast/mediastream/apply-constraints-video.html: >+ * fast/mediastream/getUserMedia-default-expected.txt: >+ * fast/mediastream/getUserMedia-default.html: >+ > 2018-08-20 Fujii Hironori <Hironori.Fujii@sony.com> > > Unreviewed WinCairo port test gardening >diff --git a/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html b/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html >index 591a7d6e6deca8eb443aad86a588ec6c417c06ee..3c934d5c7b573d0b3562f1514cdaeec408e6fff4 100644 >--- a/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html >+++ b/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html >@@ -100,9 +100,8 @@ > > videoConstraints = { > width: { >- min: 400, >- exact: 400, >- max: 400, >+ min: 160, >+ max: 960, > ideal: 320 > }, > height: 240, >diff --git a/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt b/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt >index 41da2be124fa4dc4eb06f341f7741ce5d0a41606..431f1f01a5aa31ef4a6cd80f961c05a51e2d3984 100644 >--- a/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt >+++ b/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt >@@ -4,12 +4,12 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE > > > video track capabilities: >- capabilities.aspectRatio = { max: 1.778, min: 1.333 } >+ capabilities.aspectRatio = { max: 1.778, min: 1.222 } > capabilities.deviceId = <UUID> > capabilities.facingMode = [ user ] >- capabilities.frameRate = { max: 60, min: 15 } >- capabilities.height = { max: 1080, min: 240 } >- capabilities.width = { max: 1920, min: 320 } >+ capabilities.frameRate = { max: 30, min: 5 } >+ capabilities.height = { max: 2160, min: 240 } >+ capabilities.width = { max: 3840, min: 320 } > > audio track capabilities: > capabilities.deviceId = <UUID> >diff --git a/LayoutTests/fast/mediastream/apply-constraints-advanced-expected.txt b/LayoutTests/fast/mediastream/apply-constraints-advanced-expected.txt >index d509a555c966cb13cf95c5ca24ba84e34c56aba6..75d0bdc6634a323c3284e802b2459bc5d8222e16 100644 >--- a/LayoutTests/fast/mediastream/apply-constraints-advanced-expected.txt >+++ b/LayoutTests/fast/mediastream/apply-constraints-advanced-expected.txt >@@ -12,19 +12,19 @@ PASS video.audioTracks.length is 0 > PASS settings['width'] is 640 > PASS settings['height'] is 480 > >-** Constraint: {"width":{"min":320},"height":{"min":240},"advanced":[{"width":1920,"height":1280}]} - advanced width and height are too big, minimums are less than current, nothing is changed. >+** Constraint: {"width":{"min":320},"height":{"min":240},"advanced":[{"width":1920,"height":1280}]} - advanced width and height are not supported, minimums are less than current, nothing is changed. > PASS settings['width'] is 640 > PASS settings['height'] is 480 > >-** Constraint: {"width":{"min":640},"height":{"min":480},"advanced":[{"width":1920,"height":1280},{"width":960,"height":720}]} - first width and height in advanced are too big, second is used. >-PASS settings['width'] is 960 >-PASS settings['height'] is 720 >+** Constraint: {"width":{"min":640},"height":{"min":480},"advanced":[{"width":6000,"height":6000},{"width":1920,"height":1080}]} - first width and height in advanced are too big, second is used. >+PASS settings['width'] is 1920 >+PASS settings['height'] is 1080 > > ** Constraint: {"width":320,"height":240} - reset width and height. > PASS settings['width'] is 320 > PASS settings['height'] is 240 > >-** Constraint: {"width":{"min":640},"height":{"min":480},"advanced":[{"width":1920,"height":1280}]} - advanced width and height are too big, fall back to required minimums. >+** Constraint: {"width":{"min":640},"height":{"min":480},"advanced":[{"width":7680,"height":4320}]} - advanced width and height are too big, fall back to required minimums. > PASS settings['width'] is 640 > PASS settings['height'] is 480 > >@@ -32,16 +32,9 @@ PASS settings['height'] is 480 > PASS settings['width'] is 320 > PASS settings['height'] is 240 > >-** Constraint: {"width":{"min":640},"height":{"min":480},"advanced":[{"width":1920,"height":1280},{"aspectRatio":1.777777}]} - advanced width and height are too big, aspectRatio is used. >-PASS settings['width'] is 640 >-PASS settings['height'] is 360 >- > ** Constraint: {"advanced":[{"facingMode":"left"},{"facingMode":"right"},{"facingMode":"environment"},{"facingMode":"user"}]} - no required constraints, advanced constraints are ignored. > PASS settings['facingMode'] is "user" > >-** Constraint: {"width":{"min":640},"advanced":[{"facingMode":"left"},{"facingMode":"right"},{"facingMode":"user"}]} - first two advanced facingModes are not supported, third is used. >-PASS settings['facingMode'] is "user" >- > PASS successfullyParsed is true > > TEST COMPLETE >diff --git a/LayoutTests/fast/mediastream/apply-constraints-advanced.html b/LayoutTests/fast/mediastream/apply-constraints-advanced.html >index ca65117cbfc997c900fe1677a25887deebee4943..922e1350ccf9a3f9ab2b834c55af81e6cca0db6b 100644 >--- a/LayoutTests/fast/mediastream/apply-constraints-advanced.html >+++ b/LayoutTests/fast/mediastream/apply-constraints-advanced.html >@@ -12,7 +12,7 @@ > expected: { width: 640, height: 480 }, > }, > { >- message: "advanced width and height are too big, minimums are less than current, nothing is changed.", >+ message: "advanced width and height are not supported, minimums are less than current, nothing is changed.", > constraint: { > width: { min: 320 }, > height: { min: 240 }, >@@ -28,11 +28,11 @@ > width: { min: 640 }, > height: { min: 480 }, > advanced: [ >- { width: 1920, height: 1280 }, >- { width: 960, height: 720 }, >+ { width: 6000, height: 6000 }, >+ { width: 1920, height: 1080 }, > ] > }, >- expected: { width: 960, height: 720 }, >+ expected: { width: 1920, height: 1080 }, > }, > { > message: "reset width and height.", >@@ -45,7 +45,7 @@ > width: { min: 640 }, > height: { min: 480 }, > advanced: [ >- { width: 1920, height: 1280 }, >+ { width: 7680, height: 4320 }, > ] > }, > expected: { width: 640, height: 480 }, >@@ -55,18 +55,6 @@ > constraint: { width: 320, height: 240 }, > expected: { width: 320, height: 240 }, > }, >- { >- message: "advanced width and height are too big, aspectRatio is used.", >- constraint: { >- width: { min: 640 }, >- height: { min: 480 }, >- advanced: [ >- { width: 1920, height: 1280 }, >- { aspectRatio: 1.777777 } >- ] >- }, >- expected: { width: 640, height: 360 }, >- }, > { > message: "no required constraints, advanced constraints are ignored.", > constraint: { >@@ -79,18 +67,6 @@ > }, > expected: { facingMode: "user" }, > }, >- { >- message: "first two advanced facingModes are not supported, third is used.", >- constraint: { >- width: { min: 640 }, >- advanced: [ >- { facingMode: "left" }, >- { facingMode: "right" }, >- { facingMode: "user" }, >- ] >- }, >- expected: { facingMode: "user" }, >- }, > ]; > > let tester = new ConstraintsTest({ video: true }, tests, "Tests applyConstraints on a video stream track.") >diff --git a/LayoutTests/fast/mediastream/apply-constraints-video-expected.txt b/LayoutTests/fast/mediastream/apply-constraints-video-expected.txt >index 3aa71af90f74c252d8a4fe1ccab0400f87879ab2..d890d367b6c784840d00c293b4eba5626bf6f3b4 100644 >--- a/LayoutTests/fast/mediastream/apply-constraints-video-expected.txt >+++ b/LayoutTests/fast/mediastream/apply-constraints-video-expected.txt >@@ -37,56 +37,40 @@ PASS Promise was rejected > PASS error.constraint is "frameRate" > PASS settings['frameRate'] is 30 > >-** Constraint: {"width":{"exact":400}} - the 'exact' constraint can be satisfied. >-PASS settings['width'] is 400 >-PASS settings['height'] is 240 >+** Constraint: {"width":{"exact":960}} - the 'exact' constraint can be satisfied. >+PASS settings['width'] is 960 >+PASS settings['height'] is 540 > >-** Constraint: {"width":{"min":300,"ideal":5000}} - the 'ideal' constraint can't be satisfied but the 'min' can, max should be chosen. >-PASS settings['width'] is 1920 >-PASS settings['height'] is 240 >+** Constraint: {"width":{"min":300,"ideal":5000}} - the 'ideal' constraint can't be satisfied but the 'min' can, maximum value should be chosen. >+PASS settings['width'] is 3840 >+PASS settings['height'] is 2160 > > ** Constraint: {"width":{"min":320,"ideal":1280},"height":{"min":480,"ideal":720}} - 'ideal' and 'min' constraints can be satisfied, 'ideal' should be chosen. > PASS settings['width'] is 1280 > PASS settings['height'] is 720 > >-** Constraint: {"width":3000} - ideal width is greater than track capability, should be clamped to the maximum value. >-PASS settings['width'] is 1920 >+** Constraint: {"width":5000} - ideal width is greater than track capability, should be clamped to the maximum value. >+PASS settings['width'] is 3840 > >-** Constraint: {"width":160,"height":120,"frameRate":10} - all values are less than track capabilities, should be clamped to the minimum values. >+** Constraint: {"width":160,"height":120,"frameRate":4} - all values are less than track capabilities, should be clamped to the minimum values. > PASS settings['width'] is 320 > PASS settings['height'] is 240 >-PASS settings['frameRate'] is 15 >+PASS settings['frameRate'] is 5 > > ** Constraint: {"frameRate":20} - set frame rate, width and height should remain unchanged > PASS settings['width'] is 320 > PASS settings['height'] is 240 > PASS settings['frameRate'] is 20 > >-** Constraint: {"facingMode":"environment","height":400} - illegal facing mode value should be ignored, height should change. >+** Constraint: {"facingMode":"xnvironment","height":720} - illegal facing mode value should be ignored, height should change. > PASS settings['facingMode'] is "user" >-PASS settings['width'] is 320 >-PASS settings['height'] is 400 >+PASS settings['width'] is 1280 >+PASS settings['height'] is 720 > > ** Constraint: {"WITDH":400,"frameRate":30} - unknown constraint should be ignored, frame rate should change. >-PASS settings['width'] is 320 >+PASS settings['width'] is 1280 > PASS settings['frameRate'] is 30 > >-** Constraint: {"aspectRatio":"1.3333"} - aspect ratio should change width and height. >-PASS settings['width'] is 320 >-PASS settings['height'] is 240 >- >-** Constraint: {"aspectRatio":"1.7778"} - new aspect ratio should again change width and height. >-PASS settings['width'] is 320 >-PASS settings['height'] is 180 >- >-** Constraint: {"width":1920} - when aspect ratio has been set, changing width should change height. >-PASS settings['width'] is 1920 >-PASS settings['height'] is 1080 >- >-** Constraint: {"height":576} - when aspect ratio has been set, changing height should change width. >-PASS settings['width'] is 1024 >-PASS settings['height'] is 576 >- > PASS successfullyParsed is true > > TEST COMPLETE >diff --git a/LayoutTests/fast/mediastream/apply-constraints-video.html b/LayoutTests/fast/mediastream/apply-constraints-video.html >index 3d6917a28a1cab52b3579471c519611bae8eba1d..7765c4810598c903e2178f6bcc245cfd1cce0c12 100644 >--- a/LayoutTests/fast/mediastream/apply-constraints-video.html >+++ b/LayoutTests/fast/mediastream/apply-constraints-video.html >@@ -36,13 +36,13 @@ > }, > { > message: "the 'exact' constraint can be satisfied.", >- constraint: { width: { exact: 400 } }, >- expected: { width: 400, height: 240 }, >+ constraint: { width: { exact: 960 } }, >+ expected: { width: 960, height: 540 }, > }, > { >- message: "the 'ideal' constraint can't be satisfied but the 'min' can, max should be chosen.", >+ message: "the 'ideal' constraint can't be satisfied but the 'min' can, maximum value should be chosen.", > constraint: { width: {min: 300, ideal: 5000} }, >- expected: { width: 1920, height: 240 }, >+ expected: { width: 3840, height: 2160 }, > }, > { > message: "'ideal' and 'min' constraints can be satisfied, 'ideal' should be chosen.", >@@ -51,13 +51,13 @@ > }, > { > message: "ideal width is greater than track capability, should be clamped to the maximum value.", >- constraint: { width: 3000 }, >- expected: { width: 1920}, >+ constraint: { width: 5000 }, >+ expected: { width: 3840}, > }, > { > message: "all values are less than track capabilities, should be clamped to the minimum values.", >- constraint: { width: 160, height: 120, frameRate: 10 }, >- expected: { width: 320, height: 240, frameRate: 15 }, >+ constraint: { width: 160, height: 120, frameRate: 4 }, >+ expected: { width: 320, height: 240, frameRate: 5 }, > }, > { > message: "set frame rate, width and height should remain unchanged", >@@ -66,33 +66,13 @@ > }, > { > message: "illegal facing mode value should be ignored, height should change.", >- constraint: { facingMode: "environment", height: 400 }, >- expected: { facingMode: "user", width: 320, height: 400 }, >+ constraint: { facingMode: "xnvironment", height: 720 }, >+ expected: { facingMode: "user", width: 1280, height: 720 }, > }, > { > message: "unknown constraint should be ignored, frame rate should change.", > constraint: { WITDH: 400, frameRate: 30 }, >- expected: { width: 320, frameRate: 30 }, >- }, >- { >- message: "aspect ratio should change width and height.", >- constraint: { aspectRatio: (4/3).toFixed(4) }, >- expected: { width: 320, height: 240 }, >- }, >- { >- message: "new aspect ratio should again change width and height.", >- constraint: { aspectRatio: (16/9).toFixed(4) }, >- expected: { width: 320, height: 180 }, >- }, >- { >- message: "when aspect ratio has been set, changing width should change height.", >- constraint: { width: 1920 }, >- expected: { width: 1920, height: 1080}, >- }, >- { >- message: "when aspect ratio has been set, changing height should change width.", >- constraint: { height: 576 }, >- expected: { width: 1024, height: 576}, >+ expected: { width: 1280, frameRate: 30 }, > }, > ]; > >diff --git a/LayoutTests/fast/mediastream/getUserMedia-default-expected.txt b/LayoutTests/fast/mediastream/getUserMedia-default-expected.txt >index ab4bc8f1129a10a42a20020e85ea0cf0e9b8ed1d..a020da14c673d882804c0feefd3f81a18e682016 100644 >--- a/LayoutTests/fast/mediastream/getUserMedia-default-expected.txt >+++ b/LayoutTests/fast/mediastream/getUserMedia-default-expected.txt >@@ -2,6 +2,6 @@ > PASS Checking default video tracks settings > PASS Checking only audio capture > PASS Checking default video tracks settings except width and height >-FAIL Checking default video tracks settings except height assert_equals: frame height expected 240 but got 480 >+PASS Checking default video tracks settings except height > PASS Checking default video tracks settings except frameRate > >diff --git a/LayoutTests/fast/mediastream/getUserMedia-default.html b/LayoutTests/fast/mediastream/getUserMedia-default.html >index 91883cc10d8aaebcdbec633180ca0125de391ac9..b1440960a92c35a98229d4e1f0518b500e995c4a 100644 >--- a/LayoutTests/fast/mediastream/getUserMedia-default.html >+++ b/LayoutTests/fast/mediastream/getUserMedia-default.html >@@ -46,7 +46,7 @@ promise_test((test) => { > promise_test((test) => { > return navigator.mediaDevices.getUserMedia({ audio: true, video: { frameRate: {ideal: 60 } } }).then((stream) => { > let settings = stream.getVideoTracks()[0].getSettings(); >- assert_equals(settings.frameRate, 60, "frame rate"); >+ assert_equals(settings.frameRate, 30, "frame rate"); > assert_equals(settings.width, settings.height == 640 ? 480 : 640, "frame width"); > assert_equals(settings.height, settings.width = 640 ? 480 : 640, "frame height"); > });
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=348195">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 189000
:
348195
|
348232
|
348260
|
348418
|
348420
|
348462
|
348517