[MediaStream] Add support for torch#18249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
webkit-commit-queue merged 1 commit into from
Oct 4, 2023
Merged

[MediaStream] Add support for torch #18249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
capabilities.frameRate = { max: 120, min: 1 }
capabilities.groupId = <UUID>
capabilities.height = { max: 2160, min: 1 }
capabilities.torch = true
capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
capabilities.width = { max: 3840, min: 1 }
capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
capabilities.frameRate = { max: 120, min: 1 }
capabilities.groupId = <UUID>
capabilities.height = { max: 2160, min: 1 }
capabilities.torch = true
capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
capabilities.width = { max: 3840, min: 1 }
capabilities.zoom = { max: 4, min: 1 }
Expand Down
4 changes: 4 additions & 0 deletions LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch

32 changes: 32 additions & 0 deletions LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8'>
<title>Camera track torch</title>
<script src='../../resources/testharness.js'></script>
<script src='../../resources/testharnessreport.js'></script>
</head>
<body>
<canvas id='canvas'></canvas>
<video controls autoplay width=640 height=480 playsInline id='video'></video>
<script>

let stream;
promise_test(async (test) => {
stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

await stream.getVideoTracks()[0].applyConstraints({ torch : true });
assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

await stream.getVideoTracks()[0].applyConstraints({ torch : false });
assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

}, 'getUserMedia torch');
</script>
</body>
</html>
3 changes: 2 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaDevices.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
case MediaConstraintType::Volume:
case MediaConstraintType::EchoCancellation:
case MediaConstraintType::FocusDistance:
case MediaConstraintType::Zoom:
case MediaConstraintType::WhiteBalanceMode:
case MediaConstraintType::Zoom:
case MediaConstraintType::Torch:
// Ignored.
break;

Expand Down
7 changes: 5 additions & 2 deletions Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
result.frameRate = settings.frameRate();
if (settings.supportsFacingMode())
result.facingMode = convertEnumerationToString(settings.facingMode());
if (settings.supportsWhiteBalanceMode())
result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
if (settings.supportsVolume())
result.volume = settings.volume();
if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
result.groupId = m_groupId;
if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

if (settings.supportsWhiteBalanceMode())
result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
if (settings.supportsZoom())
result.zoom = settings.zoom();
if (settings.supportsTorch())
result.torch = settings.torch();

return result;
}
Expand Down
4 changes: 3 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaStreamTrack.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
std::optional<double> aspectRatio;
std::optional<double> frameRate;
String facingMode;
String whiteBalanceMode;
std::optional<double> volume;
std::optional<int> sampleRate;
std::optional<int> sampleSize;
std::optional<bool> echoCancellation;
String displaySurface;
String deviceId;
String groupId;

String whiteBalanceMode;
std::optional<double> zoom;
std::optional<bool> torch;
};
TrackSettings getSettings() const;

Expand Down
20 changes: 19 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaStreamTrack.idl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
DOMString deviceId;
DOMString groupId;
DOMString displaySurface;
double zoom;

DOMString whiteBalanceMode;
// FIXME: add exposureMode;
// FIXME: add focusMode;
// FIXME: add pointsOfInterest;

// FIXME: add exposureCompensation;
// FIXME: add exposureTime;
// FIXME: add colorTemperature;
// FIXME: add iso;

// FIXME: add brightness;
// FIXME: add contrast;
// FIXME: add saturation;
// FIXME: add sharpness;

// FIXME: add focusDistance;
double zoom;

boolean torch;

};
7 changes: 4 additions & 3 deletions Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
result.groupId = groupId;
if (capabilities.supportsFocusDistance())
result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
if (capabilities.supportsZoom())
result.zoom = capabilityDoubleRange(capabilities.zoom());
if (capabilities.supportsWhiteBalanceMode())
result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

if (capabilities.supportsZoom())
result.zoom = capabilityDoubleRange(capabilities.zoom());
if (capabilities.supportsTorch())
result.torch = capabilities.torch();

return result;
}
Expand Down
3 changes: 2 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
std::optional<DoubleRange> aspectRatio;
std::optional<DoubleRange> frameRate;
std::optional<Vector<String>> facingMode;
std::optional<Vector<String>> whiteBalanceMode;
std::optional<DoubleRange> volume;
std::optional<LongRange> sampleRate;
std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
String groupId;
String displaySurface;
std::optional<DoubleRange> focusDistance;
std::optional<Vector<String>> whiteBalanceMode;
std::optional<DoubleRange> zoom;
std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down
19 changes: 18 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
DOMString groupId;
DOMString displaySurface;
DoubleRange focusDistance;
DoubleRange zoom;

sequence<DOMString> whiteBalanceMode;
// FIXME: add exposureMode;
// FIXME: add focusMode;

// FIXME: add exposureCompensation;
// FIXME: add exposureTime;
// FIXME: add colorTemperature;
// FIXME: add iso;

// FIXME: add brightness;
// FIXME: add contrast;
// FIXME: add saturation;
// FIXME: add sharpness;

// FIXME: add focusDistance;
DoubleRange zoom;

boolean torch;
};
5 changes: 4 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

return result;
}

Expand Down
4 changes: 3 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackConstraints.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
std::optional<ConstrainDouble> aspectRatio;
std::optional<ConstrainDouble> frameRate;
std::optional<ConstrainDOMString> facingMode;
std::optional<ConstrainDOMString> whiteBalanceMode;
std::optional<ConstrainDouble> volume;
std::optional<ConstrainLong> sampleRate;
std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
std::optional<ConstrainDOMString> groupId;
std::optional<ConstrainDOMString> displaySurface;
std::optional<ConstrainBoolean> logicalSurface;

std::optional<ConstrainDOMString> whiteBalanceMode;
std::optional<ConstrainDouble> zoom;
std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down
21 changes: 20 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
ConstrainDOMString groupId;
ConstrainDOMString displaySurface;
ConstrainBoolean logicalSurface;
ConstrainDouble zoom;

ConstrainDOMString whiteBalanceMode;
// FIXME: add exposureMode;
// FIXME: add focusMode;
// FIXME: add pointsOfInterest;

// FIXME: add exposureCompensation;
// FIXME: add exposureTime;
// FIXME: add colorTemperature;
// FIXME: add iso;

// FIXME: add brightness;
// FIXME: add contrast;
// FIXME: add saturation;
// FIXME: add sharpness;

// FIXME: add focusDistance;
ConstrainDouble zoom;

ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down
3 changes: 2 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
bool deviceId;
bool groupId;
bool displaySurface;
bool zoom;
bool whiteBalanceMode;
bool zoom;
bool torch;
};

} // namespace WebCore
Expand Down
19 changes: 18 additions & 1 deletion Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
boolean deviceId = true;
boolean groupId = true;
boolean displaySurface = true;
boolean zoom = true;

boolean whiteBalanceMode = true;
// FIXME: add exposureMode
// FIXME: add focusMode
// FIXME: add pointsOfInterest

// FIXME: add exposureCompensation
// FIXME: add exposureTime
// FIXME: add colorTemperature
// FIXME: add iso

// FIXME: add brightness
// FIXME: add contrast
// FIXME: add saturation
// FIXME: add sharpness
// FIXME: add focusDistance
boolean zoom = true;
boolean torch = true;

};
3 changes: 3 additions & 0 deletions Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)
2 changes: 2 additions & 0 deletions Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)
26 changes: 18 additions & 8 deletions Source/WebCore/platform/mediastream/MediaConstraints.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
return;
if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
return;
if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
return;
if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
return;
if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
return;
if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
return;
if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
return;

if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
return;
if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
return;
if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
case MediaConstraintType::DisplaySurface:
case MediaConstraintType::LogicalSurface:
case MediaConstraintType::FocusDistance:
case MediaConstraintType::Zoom:
case MediaConstraintType::WhiteBalanceMode:
case MediaConstraintType::Zoom:
case MediaConstraintType::Torch:
case MediaConstraintType::Unknown:
ASSERT_NOT_REACHED();
break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
case MediaConstraintType::LogicalSurface:
case MediaConstraintType::FocusDistance:
case MediaConstraintType::WhiteBalanceMode:
case MediaConstraintType::Torch:
case MediaConstraintType::Unknown:
ASSERT_NOT_REACHED();
break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
m_logicalSurface = WTFMove(constraint);
break;

case MediaConstraintType::Torch:
m_torch = WTFMove(constraint);
break;

case MediaConstraintType::Width:
case MediaConstraintType::Height:
case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
case MediaConstraintType::FacingMode:
m_facingMode = WTFMove(constraint);
break;
case MediaConstraintType::WhiteBalanceMode:
m_whiteBalanceMode = WTFMove(constraint);
break;
case MediaConstraintType::DeviceId:
if (constraint)
constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
case MediaConstraintType::GroupId:
m_groupId = WTFMove(constraint);
break;
case MediaConstraintType::WhiteBalanceMode:
m_whiteBalanceMode = WTFMove(constraint);
break;

case MediaConstraintType::Width:
case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
case MediaConstraintType::LogicalSurface:
case MediaConstraintType::FocusDistance:
case MediaConstraintType::Zoom:
case MediaConstraintType::Torch:
case MediaConstraintType::Unknown:
ASSERT_NOT_REACHED();
break;
Expand Down
Loading
, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

webkit-commit-queue
merged 1 commit into

from

Oct 4, 2023
 Merged


[MediaStream] Add support for torch
#18249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand All@@ -46,6 +47,7 @@ video track capabilities:
 capabilities.frameRate = { max: 120, min: 1 }
 capabilities.groupId = <UUID>
 capabilities.height = { max: 2160, min: 1 }
 capabilities.torch = true
 capabilities.whiteBalanceMode = [ manual, single-shot, continuous ]
 capabilities.width = { max: 3840, min: 1 }
 capabilities.zoom = { max: 4, min: 1 }
Expand Down

4 changes: 4 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch-expected.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@


PASS getUserMedia torch


32 changes: 32 additions & 0 deletions
LayoutTests/fast/mediastream/mediastreamtrack-video-torch.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
 <meta charset='utf-8'>
 <title>Camera track torch</title>
 <script src='../../resources/testharness.js'></script>
 <script src='../../resources/testharnessreport.js'></script>
</head>
<body>
 <canvas id='canvas'></canvas>
 <video controls autoplay width=640 height=480 playsInline id='video'></video>
 <script>

 let stream;
 promise_test(async (test) => {
 stream = await navigator.mediaDevices.getUserMedia({ video: { width : 640 } });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, undefined, 'settings-1');
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, undefined, 'capabilities-1');

 stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, torch : true } });
 assert_equals(stream.getVideoTracks()[0].getCapabilities().torch, true, 'capabilities-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : true });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, true, 'settings-2');

 await stream.getVideoTracks()[0].applyConstraints({ torch : false });
 assert_equals(stream.getVideoTracks()[0].getSettings().torch, false, 'settings -3');

 }, 'getUserMedia torch');
 </script>
</body>
</html>

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaDevices.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,8 +228,9 @@ static bool hasInvalidGetDisplayMediaConstraint(const MediaConstraints& constrai
 case MediaConstraintType::Volume:
 case MediaConstraintType::EchoCancellation:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 // Ignored.
 break;

Expand Down

7 changes: 5 additions & 2 deletions
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,6 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.frameRate = settings.frameRate();
 if (settings.supportsFacingMode())
 result.facingMode = convertEnumerationToString(settings.facingMode());
 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsVolume())
 result.volume = settings.volume();
 if (settings.supportsSampleRate())
Expand All@@ -292,8 +290,13 @@ MediaStreamTrack::TrackSettings MediaStreamTrack::getSettings() const
 result.groupId = m_groupId;
 if (settings.supportsDisplaySurface() && settings.displaySurface() != DisplaySurfaceType::Invalid)
 result.displaySurface = RealtimeMediaSourceSettings::displaySurface(settings.displaySurface());

 if (settings.supportsWhiteBalanceMode())
 result.whiteBalanceMode = convertEnumerationToString(settings.whiteBalanceMode());
 if (settings.supportsZoom())
 result.zoom = settings.zoom();
 if (settings.supportsTorch())
 result.torch = settings.torch();

 return result;
}
Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,15 +112,17 @@ class MediaStreamTrack
 std::optional<double> aspectRatio;
 std::optional<double> frameRate;
 String facingMode;
 String whiteBalanceMode;
 std::optional<double> volume;
 std::optional<int> sampleRate;
 std::optional<int> sampleSize;
 std::optional<bool> echoCancellation;
 String displaySurface;
 String deviceId;
 String groupId;

 String whiteBalanceMode;
 std::optional<double> zoom;
 std::optional<bool> torch;
 };
 TrackSettings getSettings() const;

Expand Down

20 changes: 19 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,25 @@ enum MediaStreamTrackState { "live", "ended" };
 DOMString deviceId;
 DOMString groupId;
 DOMString displaySurface;
 double zoom;

 DOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 double zoom;

 boolean torch;

};

7 changes: 4 additions & 3 deletions
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,11 +113,12 @@ MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabil
 result.groupId = groupId;
 if (capabilities.supportsFocusDistance())
 result.focusDistance = capabilityDoubleRange(capabilities.focusDistance());
 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsWhiteBalanceMode())
 result.whiteBalanceMode = capabilityStringVector(capabilities.whiteBalanceModes());

 if (capabilities.supportsZoom())
 result.zoom = capabilityDoubleRange(capabilities.zoom());
 if (capabilities.supportsTorch())
 result.torch = capabilities.torch();

 return result;
}
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ struct MediaTrackCapabilities {
 std::optional<DoubleRange> aspectRatio;
 std::optional<DoubleRange> frameRate;
 std::optional<Vector<String>> facingMode;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> volume;
 std::optional<LongRange> sampleRate;
 std::optional<LongRange> sampleSize;
Expand All@@ -50,7 +49,9 @@ struct MediaTrackCapabilities {
 String groupId;
 String displaySurface;
 std::optional<DoubleRange> focusDistance;
 std::optional<Vector<String>> whiteBalanceMode;
 std::optional<DoubleRange> zoom;
 std::optional<bool> torch;
};

MediaTrackCapabilities toMediaTrackCapabilities(const RealtimeMediaSourceCapabilities&, const String& groupId);
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackCapabilities.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,23 @@
 DOMString groupId;
 DOMString displaySurface;
 DoubleRange focusDistance;
 DoubleRange zoom;

 sequence<DOMString> whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 DoubleRange zoom;

 boolean torch;
};

5 changes: 4 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,8 +173,11 @@ static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setTyp
 set(result, setType, "groupId"_s, MediaConstraintType::GroupId, constraintSet.groupId);
 set(result, setType, "displaySurface"_s, MediaConstraintType::DisplaySurface, constraintSet.displaySurface);
 set(result, setType, "logicalSurface"_s, MediaConstraintType::LogicalSurface, constraintSet.logicalSurface);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);

 set(result, setType, "whiteBalanceMode"_s, MediaConstraintType::WhiteBalanceMode, constraintSet.whiteBalanceMode);
 set(result, setType, "zoom"_s, MediaConstraintType::Zoom, constraintSet.zoom);
 set(result, setType, "torch"_s, MediaConstraintType::Torch, constraintSet.torch);

 return result;
}

Expand Down

4 changes: 3 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,6 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDouble> aspectRatio;
 std::optional<ConstrainDouble> frameRate;
 std::optional<ConstrainDOMString> facingMode;
 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> volume;
 std::optional<ConstrainLong> sampleRate;
 std::optional<ConstrainLong> sampleSize;
Expand All@@ -76,7 +75,10 @@ struct MediaTrackConstraintSet {
 std::optional<ConstrainDOMString> groupId;
 std::optional<ConstrainDOMString> displaySurface;
 std::optional<ConstrainBoolean> logicalSurface;

 std::optional<ConstrainDOMString> whiteBalanceMode;
 std::optional<ConstrainDouble> zoom;
 std::optional<ConstrainBoolean> torch;
};

struct MediaTrackConstraints : MediaTrackConstraintSet {
Expand Down

21 changes: 20 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,27 @@
 ConstrainDOMString groupId;
 ConstrainDOMString displaySurface;
 ConstrainBoolean logicalSurface;
 ConstrainDouble zoom;

 ConstrainDOMString whiteBalanceMode;
 // FIXME: add exposureMode;
 // FIXME: add focusMode;
 // FIXME: add pointsOfInterest;

 // FIXME: add exposureCompensation;
 // FIXME: add exposureTime;
 // FIXME: add colorTemperature;
 // FIXME: add iso;

 // FIXME: add brightness;
 // FIXME: add contrast;
 // FIXME: add saturation;
 // FIXME: add sharpness;

 // FIXME: add focusDistance;
 ConstrainDouble zoom;

 ConstrainBoolean torch;

};

typedef (double or ConstrainDoubleRange) ConstrainDouble;
Expand Down

3 changes: 2 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,9 @@ struct MediaTrackSupportedConstraints {
 bool deviceId;
 bool groupId;
 bool displaySurface;
 bool zoom;
 bool whiteBalanceMode;
 bool zoom;
 bool torch;
};

} // namespace WebCore
Expand Down

19 changes: 18 additions & 1 deletion
Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,23 @@
 boolean deviceId = true;
 boolean groupId = true;
 boolean displaySurface = true;
 boolean zoom = true;

 boolean whiteBalanceMode = true;
 // FIXME: add exposureMode
 // FIXME: add focusMode
 // FIXME: add pointsOfInterest

 // FIXME: add exposureCompensation
 // FIXME: add exposureTime
 // FIXME: add colorTemperature
 // FIXME: add iso

 // FIXME: add brightness
 // FIXME: add contrast
 // FIXME: add saturation
 // FIXME: add sharpness
 // FIXME: add focusDistance
 boolean zoom = true;
 boolean torch = true;

};

3 changes: 3 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -384,4 +384,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVSpeechSynthesisAvailableVoice
#define AVSpeechSynthesisAvailableVoicesDidChangeNotification PAL::get_AVFoundation_AVSpeechSynthesisAvailableVoicesDidChangeNotification()
#endif // HAVE(AVSPEECHSYNTHESIS_VOICES_CHANGE_NOTIFICATION)

SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float)
#define AVCaptureMaxAvailableTorchLevel PAL::get_AVFoundation_AVCaptureMaxAvailableTorchLevel()

#endif // USE(AVFOUNDATION)

2 changes: 2 additions & 0 deletions
Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -277,4 +277,6 @@ static BOOL justReturnsNO()
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioSessionPortCarAudio, NSString *, PAL_EXPORT)
#endif // HAVE(AVAUDIOSESSION)

SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureMaxAvailableTorchLevel, float, PAL_EXPORT)

#endif // USE(AVFOUNDATION)

26 changes: 18 additions & 8 deletions
Source/WebCore/platform/mediastream/MediaConstraints.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -201,8 +201,6 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_aspectRatio && !m_aspectRatio->isEmpty() && callback(*m_aspectRatio))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_frameRate && !m_frameRate->isEmpty() && callback(*m_frameRate))
 return;
 if (m_volume && !m_volume->isEmpty() && callback(*m_volume))
Expand All@@ -213,12 +211,17 @@ void MediaTrackConstraintSetMap::filter(const Function<bool(const MediaConstrain

 if (m_facingMode && !m_facingMode->isEmpty() && callback(*m_facingMode))
 return;
 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_deviceId && !m_deviceId->isEmpty() && callback(*m_deviceId))
 return;
 if (m_groupId && !m_groupId->isEmpty() && callback(*m_groupId))
 return;

 if (m_whiteBalanceMode && !m_whiteBalanceMode->isEmpty() && callback(*m_whiteBalanceMode))
 return;
 if (m_zoom && !m_zoom->isEmpty() && callback(*m_zoom))
 return;
 if (m_torch && !m_torch->isEmpty() && callback(*m_torch))
 return;
}

void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::optional<IntConstraint>&& constraint)
Expand DownExpand Up@@ -247,8 +250,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::DisplaySurface:
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand DownExpand Up@@ -283,6 +287,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::WhiteBalanceMode:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand All@@ -302,6 +307,10 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 m_logicalSurface = WTFMove(constraint);
 break;

 case MediaConstraintType::Torch:
 m_torch = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
 case MediaConstraintType::SampleRate:
Expand All@@ -327,9 +336,6 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::FacingMode:
 m_facingMode = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;
 case MediaConstraintType::DeviceId:
 if (constraint)
 constraint->removeEmptyStringConstraint();
Expand All@@ -338,6 +344,9 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::GroupId:
 m_groupId = WTFMove(constraint);
 break;
 case MediaConstraintType::WhiteBalanceMode:
 m_whiteBalanceMode = WTFMove(constraint);
 break;

 case MediaConstraintType::Width:
 case MediaConstraintType::Height:
Expand All@@ -351,6 +360,7 @@ void MediaTrackConstraintSetMap::set(MediaConstraintType constraintType, std::op
 case MediaConstraintType::LogicalSurface:
 case MediaConstraintType::FocusDistance:
 case MediaConstraintType::Zoom:
 case MediaConstraintType::Torch:
 case MediaConstraintType::Unknown:
 ASSERT_NOT_REACHED();
 break;
Expand Down
Loading