Branch: refs/heads/main Home: https://github.com/WebKit/WebKit Commit: 9c0b105d80212675839a00325b58df55f408f1c0 https://github.com/WebKit/WebKit/commit/9c0b105d80212675839a00325b58df55f408f1c0 Author: Eric Carlson <eric.carl...@apple.com> Date: 2023-10-04 (Wed, 04 Oct 2023)
Changed paths: M LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt A LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt A LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html M Source/WebCore/Modules/mediastream/MediaDevices.cpp M Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp M Source/WebCore/Modules/mediastream/MediaStreamTrack.h M Source/WebCore/Modules/mediastream/MediaStreamTrack.idl M Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp M Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h M Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl M Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp M Source/WebCore/Modules/mediastream/MediaTrackConstraints.h M Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl M Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h M Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl M Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h M Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm M Source/WebCore/platform/mediastream/MediaConstraints.cpp M Source/WebCore/platform/mediastream/MediaConstraints.h M Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp M Source/WebCore/platform/mediastream/RealtimeMediaSource.h M Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h M Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp M Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp M Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h M Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp M Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h M Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h M Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm M Source/WebCore/platform/mock/MockMediaDevice.h M Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp M Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in Log Message: ----------- [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 _______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes