Skip to content

Commit 3bcfc1d

Browse files
Bashamegasaschanaz
Bashamega
and
saschanaz
authored
Migrate Media Track (#2269)
Co-authored-by: saschanaz <saschanaz@users.noreply.github.com>
1 parent e471abc commit 3bcfc1d

File tree

5 files changed

+134
-148
lines changed

5 files changed

+134
-148
lines changed

‎inputfiles/patches/mediacapture-image.kdl‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
removals {
2+
// Image Capture extensions which are Blink only as of 2025-04
3+
// https://w3c.github.io/mediacapture-image/#mediatrackcapabilities-section
4+
dictionary MediaTrackCapabilities {
5+
member whiteBalanceMode
6+
member exposureMode
7+
member focusMode
8+
member exposureCompensation
9+
member exposureTime
10+
member colorTemperature
11+
member iso
12+
member brightness
13+
member contrast
14+
member saturation
15+
member sharpness
16+
member focusDistance
17+
member pan
18+
member tilt
19+
member zoom
20+
member torch
21+
}
22+
23+
dictionary MediaTrackConstraintSet {
24+
member whiteBalanceMode
25+
member exposureMode
26+
member focusMode
27+
member pointsOfInterest
28+
member exposureCompensation
29+
member exposureTime
30+
member colorTemperature
31+
member iso
32+
member brightness
33+
member contrast
34+
member saturation
35+
member sharpness
36+
member focusDistance
37+
member pan
38+
member tilt
39+
member zoom
40+
member torch
41+
}
42+
43+
dictionary MediaTrackSettings {
44+
member exposureMode
45+
member focusMode
46+
member pointsOfInterest
47+
member exposureCompensation
48+
member exposureTime
49+
member colorTemperature
50+
member iso
51+
member brightness
52+
member contrast
53+
member saturation
54+
member sharpness
55+
member focusDistance
56+
member pan
57+
member tilt
58+
}
59+
60+
dictionary MediaTrackSupportedConstraints {
61+
member whiteBalanceMode
62+
member exposureMode
63+
member focusMode
64+
member pointsOfInterest
65+
member exposureCompensation
66+
member exposureTime
67+
member colorTemperature
68+
member iso
69+
member brightness
70+
member contrast
71+
member saturation
72+
member sharpness
73+
member focusDistance
74+
member pan
75+
member tilt
76+
member zoom
77+
member torch
78+
}
79+
}

‎inputfiles/patches/mediacapture-main.kdl‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
removals {
2+
// Gecko: https://searchfox.org/firefox-main/source/dom/webidl/MediaTrackCapabilities.webidl
3+
// WebKit: https://searchfox.org/wubkat/source/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl
4+
// Blink: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/mediastream/media_track_capabilities.idl
5+
dictionary MediaTrackCapabilities {
6+
member latency // Blink only as of 2022-11
7+
member resizeMode // Blink only as of 2022-11
8+
}
9+
10+
dictionary MediaTrackConstraintSet {
11+
member latency // Blink only as of 2022-11
12+
member resizeMode // Blink only as of 2022-11
13+
}
14+
15+
dictionary MediaTrackSettings {
16+
member latency // Blink only as of 2025-04
17+
member resizeMode // Blink only as of 2025-04
18+
}
19+
20+
dictionary MediaTrackSupportedConstraints {
21+
member latency
22+
member resizeMode
23+
}
24+
}

‎inputfiles/patches/mediacapture-screen.kdl‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
removals {
2+
// Screen Share extensions
3+
// https://w3c.github.io/mediacapture-screen-share/#mediadevices-additions
4+
dictionary MediaTrackCapabilities {
5+
member cursor
6+
member logicalSurface
7+
}
8+
9+
dictionary MediaTrackConstraintSet {
10+
member cursor
11+
member logicalSurface
12+
member restrictOwnAudio
13+
member suppressLocalAudioPlayback
14+
}
15+
16+
dictionary MediaTrackSettings {
17+
member cursor // Blink only as of 2025-04
18+
member logicalSurface // Blink only as of 2025-04
19+
member restrictOwnAudio // Blink only as of 2025-04
20+
member suppressLocalAudioPlayback // Blink only as of 2025-04
21+
member screenPixelRatio // Blink only as of 2025-04
22+
}
23+
24+
dictionary MediaTrackSupportedConstraints {
25+
member cursor
26+
member logicalSurface
27+
member restrictOwnAudio
28+
member suppressLocalAudioPlayback // Blink only as of 2022-11
29+
}
30+
}

‎inputfiles/removedTypes.jsonc‎

Lines changed: 0 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -435,153 +435,6 @@
435435
}
436436
}
437437
},
438-
"MediaTrackCapabilities": {
439-
"members": {
440-
"member": {
441-
// Gecko: Unsupported
442-
// WebKit: https://searchfox.org/wubkat/source/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl
443-
// Blink: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/mediastream/media_track_capabilities.idl
444-
"latency": null, // Blink only as of 2022-11
445-
"resizeMode": null, // Blink only as of 2022-11
446-
447-
// Screen Share extensions
448-
// https://w3c.github.io/mediacapture-screen-share/#mediadevices-additions
449-
"cursor": null,
450-
"logicalSurface": null,
451-
452-
// Image Capture extensions which is Blink only as of 2022-11
453-
// https://w3c.github.io/mediacapture-image/#mediatrackcapabilities-section
454-
"whiteBalanceMode": null,
455-
"exposureMode": null,
456-
"focusMode": null,
457-
"exposureCompensation": null,
458-
"exposureTime": null,
459-
"colorTemperature": null,
460-
"iso": null,
461-
"brightness": null,
462-
"contrast": null,
463-
"saturation": null,
464-
"sharpness": null,
465-
"focusDistance": null,
466-
"pan": null,
467-
"tilt": null,
468-
"zoom": null,
469-
"torch": null
470-
}
471-
}
472-
},
473-
"MediaTrackConstraintSet": {
474-
"members": {
475-
"member": {
476-
// Gecko: https://searchfox.org/mozilla-central/source/dom/webidl/MediaStreamTrack.webidl
477-
// WebKit: https://searchfox.org/wubkat/source/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl#28
478-
// Blink: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/mediastream/media_track_constraint_set.idl
479-
"latency": null, // Blink only as of 2022-11
480-
"resizeMode": null, // Blink only as of 2022-11
481-
482-
// Screen Share extensions
483-
// https://w3c.github.io/mediacapture-screen-share/#mediadevices-additions
484-
"cursor": null,
485-
"logicalSurface": null,
486-
"restrictOwnAudio": null,
487-
"suppressLocalAudioPlayback": null,
488-
489-
// Image Capture extensions which is Blink only as of 2022-11
490-
// https://w3c.github.io/mediacapture-image/#mediatrackcapabilities-section
491-
"whiteBalanceMode": null,
492-
"exposureMode": null,
493-
"focusMode": null,
494-
"pointsOfInterest": null,
495-
"exposureCompensation": null,
496-
"exposureTime": null,
497-
"colorTemperature": null,
498-
"iso": null,
499-
"brightness": null,
500-
"contrast": null,
501-
"saturation": null,
502-
"sharpness": null,
503-
"focusDistance": null,
504-
"pan": null,
505-
"tilt": null,
506-
"zoom": null,
507-
"torch": null
508-
}
509-
}
510-
},
511-
"MediaTrackSettings": {
512-
"members": {
513-
"member": {
514-
// Gecko: https://searchfox.org/mozilla-central/source/dom/webidl/MediaTrackSettings.webidl
515-
// WebKit: https://searchfox.org/wubkat/source/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl
516-
// Blink: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/mediastream/media_track_settings.idl
517-
"latency": null, // Blink only as of 2025-04
518-
"resizeMode": null, // Blink only as of 2025-04
519-
520-
// Screen Share extensions
521-
// https://w3c.github.io/mediacapture-screen-share/#mediadevices-additions
522-
"cursor": null, // Blink only as of 2025-04
523-
"logicalSurface": null, // Blink only as of 2025-04
524-
"restrictOwnAudio": null, // Blink only as of 2025-04
525-
"suppressLocalAudioPlayback": null, // Blink only as of 2025-04s
526-
"screenPixelRatio": null, // Blink only as of 2025-04
527-
528-
// Image Capture extensions which are Blink only as of 2025-04
529-
// https://w3c.github.io/mediacapture-image/#mediatrackcapabilities-section
530-
"exposureMode": null,
531-
"focusMode": null,
532-
"pointsOfInterest": null,
533-
"exposureCompensation": null,
534-
"exposureTime": null,
535-
"colorTemperature": null,
536-
"iso": null,
537-
"brightness": null,
538-
"contrast": null,
539-
"saturation": null,
540-
"sharpness": null,
541-
"focusDistance": null,
542-
"pan": null,
543-
"tilt": null
544-
}
545-
}
546-
},
547-
"MediaTrackSupportedConstraints": {
548-
"members": {
549-
"member": {
550-
// Gecko: https://searchfox.org/mozilla-central/source/dom/webidl/MediaTrackSupportedConstraints.webidl
551-
// WebKit: https://searchfox.org/wubkat/source/Source/WebCore/Modules/mediastream/MediaTrackSupportedConstraints.idl
552-
// Blink: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/mediastream/media_track_supported_constraints.idl
553-
"latency": null,
554-
"resizeMode": null,
555-
556-
// Screen Share extensions
557-
// https://w3c.github.io/mediacapture-screen-share/#mediadevices-additions
558-
"cursor": null,
559-
"logicalSurface": null,
560-
"restrictOwnAudio": null,
561-
"suppressLocalAudioPlayback": null, // Blink only as of 2022-11
562-
563-
// Image Capture extensions which are Blink only as of 2022-11
564-
// https://w3c.github.io/mediacapture-image/#mediatrackcapabilities-section
565-
"whiteBalanceMode": null,
566-
"exposureMode": null,
567-
"focusMode": null,
568-
"pointsOfInterest": null,
569-
"exposureCompensation": null,
570-
"exposureTime": null,
571-
"colorTemperature": null,
572-
"iso": null,
573-
"brightness": null,
574-
"contrast": null,
575-
"saturation": null,
576-
"sharpness": null,
577-
"focusDistance": null,
578-
"pan": null,
579-
"tilt": null,
580-
"zoom": null,
581-
"torch": null
582-
}
583-
}
584-
},
585438
"NotificationOptions": {
586439
"members": {
587440
"member": {

‎src/build/patches.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function convertKDLNodes(nodes: Node[]): DeepPartial<WebIdl> {
111111
interfaces[name] = handleMixinAndInterfaces(node, "interface");
112112
break;
113113
case "dictionary":
114-
dictionary[name] = handleDictionary(node);
114+
dictionary[name] = merge(dictionary[name], handleDictionary(node));
115115
break;
116116
default:
117117
throw new Error(`Unknown node name: ${node.name}`);

0 commit comments

Comments
 (0)