[MediaStream] Add support for torch - #18249

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
eric-carlson:torch-constraint
Oct 4, 2023
Merged

[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
eric-carlson:torch-constraint

Conversation

@eric-carlson

@eric-carlsoneric-carlson commented Sep 26, 2023•
edited by webkit-early-warning-system
Loading

Copy link
Copy Markdown
Contributor

9c0b105

[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main

2aecfba

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim

@eric-carlsoneric-carlson self-assigned this Sep 26, 2023
@eric-carlsoneric-carlson added the WebRTC For bugs in WebRTC label Sep 26, 2023
@webkit-early-warning-system

webkit-early-warning-system commented Sep 26, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on previous version of this PR (hash 0a34a0f)

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim

@webkit-ews-buildbotwebkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 27, 2023
youennf
youennf approved these changes Sep 27, 2023
View reviewed changes

@youennfyouennf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.

Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl Outdated
Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp Outdated
Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h Outdated
Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm Outdated
Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm Outdated
Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp Outdated
@eric-carlsoneric-carlson removed the merging-blocked Applied to prevent a change from being merged label Sep 27, 2023
@webkit-early-warning-system

webkit-early-warning-system commented Sep 27, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on previous version of this PR (hash 9afe9f0)

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbotwebkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 27, 2023
@eric-carlsoneric-carlson removed the merging-blocked Applied to prevent a change from being merged label Sep 29, 2023
@webkit-early-warning-system

webkit-early-warning-system commented Sep 29, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

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

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim

@webkit-early-warning-system

webkit-early-warning-system commented Sep 29, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on previous version of this PR (hash 73667cc)

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests

@webkit-ews-buildbotwebkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 29, 2023
@eric-carlsoneric-carlson removed the merging-blocked Applied to prevent a change from being merged label Sep 30, 2023
@webkit-early-warning-system

webkit-early-warning-system commented Sep 30, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on previous version of this PR (hash 8d87c04)

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbotwebkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 30, 2023
@philn

philn commented Sep 30, 2023

Copy link
Copy Markdown
Member

Let me know if you need help with CMake here too :)

@eric-carlsoneric-carlson removed the merging-blocked Applied to prevent a change from being merged label Oct 1, 2023
@eric-carlson
eric-carlson requested review from a team and rniwa as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system

webkit-early-warning-system commented Oct 1, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

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

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests

@webkit-ews-buildbotwebkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 2, 2023
@eric-carlsoneric-carlson removed the merging-blocked Applied to prevent a change from being merged label Oct 4, 2023
@webkit-early-warning-system

webkit-early-warning-system commented Oct 4, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on previous version of this PR (hash 3fdbc3e)

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests

@webkit-ews-buildbotwebkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 4, 2023
@eric-carlsoneric-carlson removed the merging-blocked Applied to prevent a change from being merged label Oct 4, 2023
@webkit-early-warning-system

webkit-early-warning-system commented Oct 4, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on current version of this PR (hash 2aecfba)

Details

MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim

@eric-carlsoneric-carlson added the merge-queue Applied to send a pull request to merge-queue label Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue merged commit 9c0b105 into WebKit:mainOct 4, 2023
@webkit-commit-queue

webkit-commit-queue commented Oct 4, 2023

Copy link
Copy Markdown
Collaborator

Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main

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

@webkit-commit-queuewebkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Oct 4, 2023
@c4b4d4

c4b4d4 commented Dec 15, 2023•
edited
Loading

Copy link
Copy Markdown

In which Safari version is torch expected to go live?

@turbomaster95turbomaster95 mentioned this pull request Apr 6, 2024
Open
@coderabbitaicoderabbitaiBot mentioned this pull request Jul 23, 2026
Open
6 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[MediaStream] Add support for torch - #18249
Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Oct 4, 2023
Merged
[MediaStream] Add support for torch#18249
webkit-commit-queue merged 1 commit into
WebKit:mainfrom 
eric-carlson:torch-constraint
Conversation
@eric-carlson
@eric-carlsoneric-carlson
commented
Sep 26, 2023•

edited by webkit-early-warning-system

Loading

Copy link


Copy Markdown

Contributor
9c0b105
[MediaStream] Add support for torch
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
2aecfba
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
self-assigned this
Sep 26, 2023
@eric-carlsoneric-carlson
added
the 
WebRTC
For bugs in WebRTC
label
Sep 26, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 26, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 0a34a0f)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
❌ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
youennf
youennf
approved these changes
Sep 27, 2023
View reviewed changes
@youennfyouennf
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once bots are happy. I would also add a test with capabilities.torch=false.
Comment threadSource/WebCore/Modules/mediastream/MediaStreamTrack.idl
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Outdated

Comment threadSource/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
Outdated

Comment threadSource/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Outdated

@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 27, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 9afe9f0)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 27, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 5564544)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe⏳ 🛠 wincairo 
❌ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
❌ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc ❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64 ❌ 🛠 tv❌ 🧪 mac-AS-debug-wk2
❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress
❌ 🛠 watch
❌ 🛠 watch-sim
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 29, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 73667cc)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress✅ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim✅ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 29, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Sep 30, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 8d87c04)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 watch
✅ 🛠 watch-sim
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Sep 30, 2023
@philn
philn
commented
Sep 30, 2023

Copy link


Copy Markdown

Member
Let me know if you need help with CMake here too :)
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 1, 2023
@eric-carlson
eric-carlson
requested review from
a team and rniwa
as code ownersOctober 1, 2023 23:48
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 1, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash d06a18b)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac✅ 🛠 gtk
❌ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1❌ 🧪 gtk-wk2
✅ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2✅ 🛠 jsc-armv7
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
✅ 🛠 watch✅ 🛠 jsc-mips
✅ 🛠 watch-sim❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 2, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on previous version of this PR (hash 3fdbc3e)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style❌ 🛠 ios❌ 🛠 mac❌ 🛠 wpe❌ 🛠 wincairo
✅ 🧪 bindings❌ 🛠 ios-sim❌ 🛠 mac-AS-debug❌ 🧪 wpe-wk2
✅ 🧪 webkitperl❌ 🧪 ios-wk2❌ 🧪 api-mac❌ 🛠 gtk
✅ 🧪 webkitpy❌ 🧪 ios-wk2-wpt❌ 🧪 mac-wk1❌ 🧪 gtk-wk2
❌ 🛠 🧪 jsc❌ 🧪 api-ios❌ 🧪 mac-wk2❌ 🧪 api-gtk
❌ 🛠 🧪 jsc-arm64⏳ 🛠 tv ❌ 🧪 mac-AS-debug-wk2❌ 🛠 jsc-armv7
✅ 🧪 services❌ 🛠 tv-sim❌ 🧪 mac-wk2-stress❌ 🧪 jsc-armv7-tests
❌ 🛠 watch❌ 🛠 jsc-mips
⏳ 🛠 watch-sim ❌ 🧪 jsc-mips-tests
@webkit-ews-buildbotwebkit-ews-buildbot
added
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@eric-carlsoneric-carlson
removed
the 
merging-blocked
Applied to prevent a change from being merged
label
Oct 4, 2023
@webkit-early-warning-system
webkit-early-warning-system
commented
Oct 4, 2023•

edited

Loading

Copy link


Copy Markdown

Collaborator
EWS run on current version of this PR (hash 2aecfba)
Details
MisciOS, tvOS & watchOSmacOSLinuxWindows
❌ 🧪 style✅ 🛠 ios✅ 🛠 mac✅ 🛠 wpe✅ 🛠 wincairo
✅ 🧪 bindings✅ 🛠 ios-sim✅ 🛠 mac-AS-debug🧪 wpe-wk2
✅ 🧪 webkitperl✅ 🧪 ios-wk2✅ 🧪 api-mac✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt✅ 🧪 mac-wk1✅ 🧪 gtk-wk2
✅ 🧪 api-ios✅ 🧪 mac-wk2✅ 🧪 api-gtk
✅ 🛠 tv✅ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge✅ 🛠 watch
✅ 🛠 watch-sim
@eric-carlsoneric-carlson
added
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@eric-carlson
[MediaStream] Add support for torch
9c0b105
https://bugs.webkit.org/show_bug.cgi?id=262131
rdar://116066837
Reviewed by Youenn Fablet.
Add support for `torch` to MediaTrackCapabilities and MediaTrackSettings, and expose
'torch' as a supported constraint in MockRealtimeVideoSource and AVVideoCaptureSource.
* LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt: Added.
* LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::getSettings const):
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.idl:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp:
(WebCore::toMediaTrackCapabilities):
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h:
* Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp:
(WebCore::convertToInternalForm):
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h:
* Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h:
* Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm:
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::filter const):
(WebCore::MediaTrackConstraintSetMap::set):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::aspectRatio const):
(WebCore::MediaTrackConstraintSetMap::facingMode const):
(WebCore::MediaTrackConstraintSetMap::whiteBalanceMode const):
(WebCore::MediaTrackConstraintSetMap::zoom const):
(WebCore::MediaTrackConstraintSetMap::torch const):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::fitnessDistance):
(WebCore::RealtimeMediaSource::applyConstraint):
(WebCore::RealtimeMediaSource::supportsConstraint):
(WebCore::RealtimeMediaSource::supportsConstraints):
(WebCore::RealtimeMediaSource::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.h:
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h:
(WebCore::RealtimeMediaSourceCapabilities::RealtimeMediaSourceCapabilities):
(WebCore::RealtimeMediaSourceCapabilities::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceCapabilities::whiteBalanceModes const):
(WebCore::RealtimeMediaSourceCapabilities::setWhiteBalanceModes):
(WebCore::RealtimeMediaSourceCapabilities::supportsTorch const):
(WebCore::RealtimeMediaSourceCapabilities::torch const):
(WebCore::RealtimeMediaSourceCapabilities::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp:
(WebCore::RealtimeMediaSourceCenter::RealtimeMediaSourceCenter):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp:
(WebCore::RealtimeMediaSourceSettings::convertFlagsToString):
(WebCore::RealtimeMediaSourceSettings::difference const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::allFlags):
(WebCore::RealtimeMediaSourceSettings::RealtimeMediaSourceSettings):
(WebCore::RealtimeMediaSourceSettings::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::whiteBalanceMode const):
(WebCore::RealtimeMediaSourceSettings::setWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSettings::supportsTorch const):
(WebCore::RealtimeMediaSourceSettings::torch const):
(WebCore::RealtimeMediaSourceSettings::setTorch):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp:
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsConstraint const):
* Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::RealtimeMediaSourceSupportedConstraints):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsWhiteBalanceMode const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsWhiteBalanceMode):
(WebCore::RealtimeMediaSourceSupportedConstraints::supportsTorch const):
(WebCore::RealtimeMediaSourceSupportedConstraints::setSupportsTorch):
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::AVVideoCaptureSource):
(WebCore::AVVideoCaptureSource::settingsDidChange):
(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::capabilities):
(WebCore::AVVideoCaptureSource::setSessionSizeFrameRateAndZoom):
(WebCore::AVVideoCaptureSource::lockForConfiguration):
(WebCore::AVVideoCaptureSource::updateWhiteBalanceMode):
(WebCore::AVVideoCaptureSource::updateTorch):
* Source/WebCore/platform/mock/MockMediaDevice.h:
* Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::defaultDevices):
* Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::capabilities):
(WebCore::MockRealtimeVideoSource::settings):
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Canonical link: https://commits.webkit.org/268853@main
@webkit-commit-queue
webkit-commit-queue
merged commit 9c0b105
into
WebKit:mainOct 4, 2023
@webkit-commit-queue
webkit-commit-queue
commented
Oct 4, 2023

Copy link


Copy Markdown

Collaborator
Committed 268853@main (9c0b105): https://commits.webkit.org/268853@main
Reviewed commits have been landed. Closing PR #18249 and removing active labels.
@webkit-commit-queuewebkit-commit-queue
removed
the 
merge-queue
Applied to send a pull request to merge-queue
label
Oct 4, 2023
@c4b4d4
c4b4d4
commented
Dec 15, 2023•

edited

Loading

Copy link


Copy Markdown

In which Safari version is torch expected to go live?
@turbomaster95turbomaster95
mentioned this pull request
Apr 6, 2024
 Open

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jul 23, 2026
 Open

6 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@youennfyouennfyouennf approved these changes
@cdumezcdumezAwaiting requested review from cdumez
@rniwarniwaAwaiting requested review from rniwa

Assignees

@eric-carlsoneric-carlson

Labels

WebRTCFor bugs in WebRTC

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@eric-carlson@webkit-early-warning-system@philn@webkit-commit-queue@c4b4d4@youennf@webkit-ews-buildbot