Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/ci-oss-assets-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
--summary \
--excludePackages '@comfyorg/comfyui-frontend;@comfyorg/design-system;@comfyorg/ingest-types;@comfyorg/registry-types;@comfyorg/shared-frontend-utils;@comfyorg/tailwind-utils;@comfyorg/comfyui-electron-types' \
--clarificationsFile .github/license-clarifications.json \
--onlyAllow 'MIT;MIT*;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;0BSD;BlueOak-1.0.0;Python-2.0;CC0-1.0;Unlicense;(MIT OR Apache-2.0);(MIT OR GPL-3.0);(Apache-2.0 OR MIT);(MPL-2.0 OR Apache-2.0);CC-BY-4.0;CC-BY-3.0;GPL-3.0-only'; then
--onlyAllow 'MIT;MIT*;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;0BSD;BlueOak-1.0.0;Python-2.0;CC0-1.0;Unlicense;(MIT OR Apache-2.0);(MIT OR GPL-3.0);(Apache-2.0 OR MIT);(MPL-2.0 OR Apache-2.0);MPL-2.0;CC-BY-4.0;CC-BY-3.0;GPL-3.0-only'; then
Comment thread
christian-byrne marked this conversation as resolved.
echo ''
echo '✅ All production dependency licenses are approved!'
else
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"jsonata": "catalog:",
"loglevel": "^1.9.2",
"marked": "^15.0.11",
"mediabunny": "catalog:",
"minisearch": "catalog:",
"pinia": "catalog:",
"posthog-js": "catalog:",
Expand Down
26 changes: 26 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ catalog:
lenis: ^1.3.21
lint-staged: ^16.2.7
markdown-table: ^3.0.4
mediabunny: ^1.53.1
minisearch: ^7.2.0
mixpanel-browser: ^2.71.0
monocart-coverage-reports: ^2.12.9
Expand Down
2 changes: 0 additions & 2 deletions src/composables/video/useVideoFilmstrip.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ describe('useVideoFilmstrip', () => {
vi.mocked(fetchVideoMetadata).mockResolvedValueOnce({
fps: 24,
duration: 10,
frame_count: 240,
width: 512,
height: 512,
size: 5 * 1024 * 1024
Expand Down Expand Up @@ -219,7 +218,6 @@ describe('useVideoFilmstrip', () => {
vi.mocked(fetchVideoMetadata).mockResolvedValueOnce({
fps: 24,
duration: 8,
frame_count: null,
width: 640,
height: 360,
size: 1024
Expand Down
6 changes: 2 additions & 4 deletions src/composables/video/useVideoFilmstrip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,8 @@ export function useVideoFilmstrip(
width.value = metadata?.width ?? video.videoWidth
height.value = metadata?.height ?? video.videoHeight
fps.value = metadata?.fps ?? options.fps ?? DEFAULT_VIDEO_FPS
fileSize.value = metadata?.size
totalFrames.value =
metadata?.frame_count ??
Math.max(Math.round(effectiveDuration * fps.value), 1)
fileSize.value = metadata?.size ?? undefined
totalFrames.value = Math.max(Math.round(effectiveDuration * fps.value), 1)

const capturedThumbnail = await captureRepresentativeFrame(
video,
Expand Down
Binary file added src/utils/__fixtures__/tiny.mp4
Binary file not shown.
Binary file added src/utils/__fixtures__/tiny.webm
Binary file not shown.
Loading
Loading