Keyboard and captions tracks #1615
+3,027
−372
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2370,6 +2370,8 @@ fn project_config_from_recording( | |
| scene_segments: Vec::new(), | ||
| mask_segments: Vec::new(), | ||
| text_segments: Vec::new(), | ||
| caption_segments: Vec::new(), | ||
| keyboard_segments: Vec::new(), | ||
| }); | ||
|
|
||
| config | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -364,6 +364,31 @@ export function CaptionsTab() { | |
| if (result && result.segments.length > 0) { | ||
| setProject("captions", "segments", result.segments); | ||
| updateCaptionSetting("enabled", true); | ||
|
|
||
| const trackSegments = result.segments.map( | ||
| (seg: { | ||
| id: string; | ||
| start: number; | ||
| end: number; | ||
| text: string; | ||
| words?: Array<{ text: string; start: number; end: number }>; | ||
| }) => ({ | ||
| id: seg.id, | ||
| start: seg.start, | ||
| end: seg.end, | ||
| text: seg.text, | ||
| words: seg.words ?? [], | ||
| fadeDurationOverride: null, | ||
| lingerDurationOverride: null, | ||
| positionOverride: null, | ||
| colorOverride: null, | ||
| backgroundColorOverride: null, | ||
| fontSizeOverride: null, | ||
| }), | ||
| ); | ||
| setProject("timeline", "captionSegments", trackSegments); | ||
| setEditorState("timeline", "tracks", "caption", true); | ||
|
|
||
| toast.success("Captions generated successfully!"); | ||
| } else { | ||
| toast.error( | ||
|
|
@@ -395,52 +420,14 @@ export function CaptionsTab() { | |
| } | ||
| }; | ||
|
|
||
| const hasCaptions = createMemo( | ||
| () => | ||
| (project.timeline?.captionSegments?.length ?? 0) > 0 || | ||
| (project.captions?.segments?.length ?? 0) > 0, | ||
| ); | ||
|
|
||
| return ( | ||
| <Field name="Captions" icon={<IconCapMessageBubble />} badge="Beta"> | ||
| <div class="flex flex-col gap-4"> | ||
| <div class="space-y-6 transition-all duration-200"> | ||
| <div class="space-y-4"> | ||
|
|
@@ -890,117 +877,106 @@ export function CaptionsTab() { | |
| </Field> | ||
| </div> | ||
|
|
||
| <Show | ||
| when={ | ||
| editorState.timeline.selection?.type === "caption" && | ||
| editorState.timeline.selection.indices.length === 1 | ||
| } | ||
| > | ||
| {(() => { | ||
| const selectedIndex = () => | ||
| editorState.timeline.selection?.type === "caption" | ||
| ? editorState.timeline.selection.indices[0] | ||
| : -1; | ||
| const selectedSegment = () => | ||
| project.timeline?.captionSegments?.[selectedIndex()]; | ||
|
|
||
| return ( | ||
| <Field | ||
| name="Selected Caption Override" | ||
| icon={<IconCapMessageBubble />} | ||
| > | ||
| <Show when={selectedSegment()}> | ||
| {(seg) => ( | ||
| <div class="space-y-3"> | ||
| <Subfield name="Start Time"> | ||
| <Input | ||
| type="number" | ||
| value={seg().start.toFixed(2)} | ||
| step="0.1" | ||
| min={0} | ||
| onChange={(e) => | ||
| setProject( | ||
| "timeline", | ||
| "captionSegments", | ||
| selectedIndex(), | ||
| "start", | ||
| Number.parseFloat(e.target.value), | ||
| ) | ||
| } | ||
| /> | ||
| </Subfield> | ||
| <Subfield name="End Time"> | ||
| <Input | ||
| type="number" | ||
| value={seg().end.toFixed(2)} | ||
| step="0.1" | ||
| min={seg().start} | ||
| onChange={(e) => | ||
| setProject( | ||
| "timeline", | ||
| "captionSegments", | ||
| selectedIndex(), | ||
| "end", | ||
| Number.parseFloat(e.target.value), | ||
| ) | ||
| } | ||
| /> | ||
| </Subfield> | ||
| <Subfield name="Caption Text"> | ||
| <Input | ||
| type="text" | ||
| value={seg().text} | ||
| onChange={(e) => | ||
| setProject( | ||
| "timeline", | ||
| "captionSegments", | ||
| selectedIndex(), | ||
| "text", | ||
| e.target.value, | ||
| ) | ||
| } | ||
| /> | ||
| </Subfield> | ||
| <Subfield name="Fade Duration Override"> | ||
| <Slider | ||
| value={[ | ||
| (seg().fadeDurationOverride ?? | ||
| getSetting("fadeDuration")) * 100, | ||
| ]} | ||
| onChange={(v) => | ||
| setProject( | ||
| "timeline", | ||
| "captionSegments", | ||
| selectedIndex(), | ||
| "fadeDurationOverride", | ||
| v[0] / 100, | ||
| ) | ||
| } | ||
| minValue={0} | ||
| maxValue={50} | ||
| step={1} | ||
| /> | ||
| </Subfield> | ||
| </div> | ||
| )} | ||
| </Show> | ||
| </Field> | ||
| ); | ||
| })()} | ||
| </Show> | ||
| </div> | ||
| </div> | ||
| </Field> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
partial_cmp+unwrap_or(Equal)can hide NaNs and makes ordering less explicit. Since this isf64,total_cmpis a nice drop-in here.