Simplify CapabilityRange #24747

youennf · 2024-02-19T16:11:43Z

`be6d1fe`

Simplify CapabilityRange
rdar://123239032
https://bugs.webkit.org/show_bug.cgi?id=269711

Reviewed by Eric Carlson.

CapabilityRange could handle double and integer values inside the same structure as two optionals.
But CapabilityRange values are typically typed (a width CapabilityRange is in integers).
It is therefore best to use a typed value directly.
We make CapabilityRange a template and have LongCapabilityRange and DoubleCapabilityRange.
We make them classes instead of templated classes so that they work well with generated serializers.

* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::capabilityDoubleRange):
(WebCore::capabilityLongRange):
(WebCore::toMediaTrackCapabilities):
(WebCore::capabilityIntRange): Deleted.
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::NumericConstraint::fitnessDistance const):
(WebCore::NumericConstraint::valueForCapabilityRange const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::hasInvalidSizeFrameRateAndZoomConstraints):
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::extractVideoFrameSizeConstraints):
(WebCore::RealtimeMediaSource::applyConstraints):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::CapabilityRange::CapabilityRange):
(WebCore::CapabilityRange::min const):
(WebCore::CapabilityRange::max const):
(WebCore::LongCapabilityRange::LongCapabilityRange):
(WebCore::DoubleCapabilityRange::DoubleCapabilityRange):
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::width const):
(WebCore::RealtimeMediaSourceCapabilities::setWidth):
(WebCore::RealtimeMediaSourceCapabilities::height const):
(WebCore::RealtimeMediaSourceCapabilities::setHeight):
(WebCore::RealtimeMediaSourceCapabilities::frameRate const):
(WebCore::RealtimeMediaSourceCapabilities::setFrameRate):
(WebCore::RealtimeMediaSourceCapabilities::aspectRatio const):
(WebCore::RealtimeMediaSourceCapabilities::setAspectRatio):
(WebCore::RealtimeMediaSourceCapabilities::volume const):
(WebCore::RealtimeMediaSourceCapabilities::setVolume):
(WebCore::RealtimeMediaSourceCapabilities::sampleRate const):
(WebCore::RealtimeMediaSourceCapabilities::setSampleRate):
(WebCore::RealtimeMediaSourceCapabilities::sampleSize const):
(WebCore::RealtimeMediaSourceCapabilities::setSampleSize):
(WebCore::RealtimeMediaSourceCapabilities::focusDistance const):
(WebCore::RealtimeMediaSourceCapabilities::setFocusDistance):
(WebCore::RealtimeMediaSourceCapabilities::zoom const):
(WebCore::RealtimeMediaSourceCapabilities::setZoom):
(WebCore::CapabilityRange::LongRange::LongRange): Deleted.
(WebCore::CapabilityRange::DoubleRange::DoubleRange): Deleted.
(WebCore::CapabilityRange::type const): Deleted.
(WebCore::CapabilityRange::doubleRange const): Deleted.
(WebCore::CapabilityRange::longRange const): Deleted.
* Source/WebCore/platform/mediastream/cocoa/DisplayCaptureSourceCocoa.cpp:
(WebCore::DisplayCaptureSourceCocoa::capabilities):
* Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp:
(WebCore::defaultVolumeCapability):
(WebCore::GStreamerAudioCaptureSource::capabilities):
* Source/WebCore/platform/mediastream/gstreamer/MockDisplayCaptureSourceGStreamer.cpp:
(WebCore::MockDisplayCaptureSourceGStreamer::capabilities):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::getPhotoCapabilities):
* Source/WebCore/platform/mediastream/mac/BaseAudioSharedUnit.h:
* Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp:
(WebCore::CoreAudioCaptureSource::capabilities):
* Source/WebCore/platform/mediastream/mac/CoreAudioSharedUnit.h:
* Source/WebCore/platform/mediastream/mac/MockAudioSharedUnit.mm:
(WebCore::MockAudioSharedUnit::singleton):
* Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp:
(WebCore::MockRealtimeAudioSource::capabilities):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::getPhotoCapabilities):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:

Canonical link: https://commits.webkit.org/275046@main

d7ca49c

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	~~🛠 ios-sim~~	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-02-19T16:14:19Z

EWS run on previous version of this PR (hash a2bfa29)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	❌ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	❌ 🛠 gtk
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	❌ 🧪 gtk-wk2
	~~🛠 tv~~	~~🧪 mac-AS-debug-wk2~~	❌ 🧪 api-gtk
	✅ 🛠 tv-sim
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-02-19T16:43:05Z

EWS run on previous version of this PR (hash 317ee61)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	❌ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	✅ 🛠 gtk
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-02-19T17:36:56Z

EWS run on previous version of this PR (hash 26c76d7)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	❌ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	❌ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🧪 gtk-wk2
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

eric-carlson · 2024-02-19T19:20:04Z

Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

@@ -510,15 +510,15 @@ std::optional<MediaConstraintType> RealtimeMediaSource::hasInvalidSizeFrameRateA
        if (std::isinf(constraintDistance)) {
 #if !RELEASE_LOG_DISABLED
            auto range = capabilities.frameRate();
-            ERROR_LOG_IF(m_logger, LOGIDENTIFIER, "RealtimeMediaSource::supportsSizeFrameRateAndZoom failed frame rate constraint, capabilities are [%d, %d]", range.longRange().min, range.longRange().max);
+            ERROR_LOG_IF(m_logger, LOGIDENTIFIER, "RealtimeMediaSource::supportsSizeFrameRateAndZoom failed frame rate constraint, capabilities are [%d, %d]", range.min(), range.max());


Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

webkit-early-warning-system · 2024-02-20T14:20:58Z

EWS run on current version of this PR (hash d7ca49c)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	~~🛠 ios-sim~~	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

rdar://123239032 https://bugs.webkit.org/show_bug.cgi?id=269711 Reviewed by Eric Carlson. CapabilityRange could handle double and integer values inside the same structure as two optionals. But CapabilityRange values are typically typed (a width CapabilityRange is in integers). It is therefore best to use a typed value directly. We make CapabilityRange a template and have LongCapabilityRange and DoubleCapabilityRange. We make them classes instead of templated classes so that they work well with generated serializers. * Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp: (WebCore::capabilityDoubleRange): (WebCore::capabilityLongRange): (WebCore::toMediaTrackCapabilities): (WebCore::capabilityIntRange): Deleted. * Source/WebCore/platform/mediastream/MediaConstraints.h: (WebCore::NumericConstraint::fitnessDistance const): (WebCore::NumericConstraint::valueForCapabilityRange const): * Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp: (WebCore::RealtimeMediaSource::hasInvalidSizeFrameRateAndZoomConstraints): (WebCore::RealtimeMediaSource::fitnessDistance): (WebCore::RealtimeMediaSource::applyConstraint): (WebCore::RealtimeMediaSource::extractVideoFrameSizeConstraints): (WebCore::RealtimeMediaSource::applyConstraints): * Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h: (WebCore::CapabilityRange::CapabilityRange): (WebCore::CapabilityRange::min const): (WebCore::CapabilityRange::max const): (WebCore::LongCapabilityRange::LongCapabilityRange): (WebCore::DoubleCapabilityRange::DoubleCapabilityRange): (WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities): (WebCore::RealtimeMediaSourceCapabilities::width const): (WebCore::RealtimeMediaSourceCapabilities::setWidth): (WebCore::RealtimeMediaSourceCapabilities::height const): (WebCore::RealtimeMediaSourceCapabilities::setHeight): (WebCore::RealtimeMediaSourceCapabilities::frameRate const): (WebCore::RealtimeMediaSourceCapabilities::setFrameRate): (WebCore::RealtimeMediaSourceCapabilities::aspectRatio const): (WebCore::RealtimeMediaSourceCapabilities::setAspectRatio): (WebCore::RealtimeMediaSourceCapabilities::volume const): (WebCore::RealtimeMediaSourceCapabilities::setVolume): (WebCore::RealtimeMediaSourceCapabilities::sampleRate const): (WebCore::RealtimeMediaSourceCapabilities::setSampleRate): (WebCore::RealtimeMediaSourceCapabilities::sampleSize const): (WebCore::RealtimeMediaSourceCapabilities::setSampleSize): (WebCore::RealtimeMediaSourceCapabilities::focusDistance const): (WebCore::RealtimeMediaSourceCapabilities::setFocusDistance): (WebCore::RealtimeMediaSourceCapabilities::zoom const): (WebCore::RealtimeMediaSourceCapabilities::setZoom): (WebCore::CapabilityRange::LongRange::LongRange): Deleted. (WebCore::CapabilityRange::DoubleRange::DoubleRange): Deleted. (WebCore::CapabilityRange::type const): Deleted. (WebCore::CapabilityRange::doubleRange const): Deleted. (WebCore::CapabilityRange::longRange const): Deleted. * Source/WebCore/platform/mediastream/cocoa/DisplayCaptureSourceCocoa.cpp: (WebCore::DisplayCaptureSourceCocoa::capabilities): * Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp: (WebCore::defaultVolumeCapability): (WebCore::GStreamerAudioCaptureSource::capabilities): * Source/WebCore/platform/mediastream/gstreamer/MockDisplayCaptureSourceGStreamer.cpp: (WebCore::MockDisplayCaptureSourceGStreamer::capabilities): * Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm: (WebCore::AVVideoCaptureSource::getPhotoCapabilities): * Source/WebCore/platform/mediastream/mac/BaseAudioSharedUnit.h: * Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp: (WebCore::CoreAudioCaptureSource::capabilities): * Source/WebCore/platform/mediastream/mac/CoreAudioSharedUnit.h: * Source/WebCore/platform/mediastream/mac/MockAudioSharedUnit.mm: (WebCore::MockAudioSharedUnit::singleton): * Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp: (WebCore::MockRealtimeAudioSource::capabilities): * Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp: (WebCore::MockRealtimeVideoSource::capabilities): (WebCore::MockRealtimeVideoSource::getPhotoCapabilities): * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: Canonical link: https://commits.webkit.org/275046@main

webkit-commit-queue · 2024-02-20T16:46:29Z

Committed 275046@main (be6d1fe): https://commits.webkit.org/275046@main

Reviewed commits have been landed. Closing PR #24747 and removing active labels.

youennf self-assigned this Feb 19, 2024

youennf added the WebRTC For bugs in WebRTC label Feb 19, 2024

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 19, 2024

youennf force-pushed the eng/Simplify-CapabilityRange branch from a2bfa29 to 317ee61 Compare February 19, 2024 16:42

youennf requested a review from philn as a code owner February 19, 2024 16:42

youennf force-pushed the eng/Simplify-CapabilityRange branch from 317ee61 to 26c76d7 Compare February 19, 2024 17:36

eric-carlson approved these changes Feb 19, 2024

View reviewed changes

youennf force-pushed the eng/Simplify-CapabilityRange branch from 26c76d7 to d7ca49c Compare February 20, 2024 14:20

youennf added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Feb 20, 2024

webkit-commit-queue force-pushed the eng/Simplify-CapabilityRange branch from d7ca49c to be6d1fe Compare February 20, 2024 16:46

webkit-commit-queue merged commit be6d1fe into WebKit:main Feb 20, 2024

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify CapabilityRange #24747

Simplify CapabilityRange #24747

youennf commented Feb 19, 2024 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Feb 19, 2024 •

edited

webkit-early-warning-system commented Feb 19, 2024 •

edited

webkit-early-warning-system commented Feb 19, 2024 •

edited

eric-carlson Feb 19, 2024

webkit-early-warning-system commented Feb 20, 2024 •

edited

webkit-commit-queue commented Feb 20, 2024

Simplify CapabilityRange #24747

Simplify CapabilityRange #24747

Conversation

youennf commented Feb 19, 2024 • edited by webkit-early-warning-system

be6d1fe

webkit-early-warning-system commented Feb 19, 2024 • edited

webkit-early-warning-system commented Feb 19, 2024 • edited

webkit-early-warning-system commented Feb 19, 2024 • edited

eric-carlson Feb 19, 2024

Choose a reason for hiding this comment

webkit-early-warning-system commented Feb 20, 2024 • edited

webkit-commit-queue commented Feb 20, 2024

youennf commented Feb 19, 2024 •

edited by webkit-early-warning-system

`be6d1fe`

webkit-early-warning-system commented Feb 19, 2024 •

edited

webkit-early-warning-system commented Feb 19, 2024 •

edited

webkit-early-warning-system commented Feb 19, 2024 •

edited

webkit-early-warning-system commented Feb 20, 2024 •

edited