Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Add JPEG XL asset imports

JonnyBurgerbefff3c72646
diff --git a/packages/bundler/src/shared-bundler-config.ts b/packages/bundler/src/shared-bundler-config.ts
index 65cd6ac635..9036c92144 100644
--- a/packages/bundler/src/shared-bundler-config.ts
+++ b/packages/bundler/src/shared-bundler-config.ts
@@ -155,7 +155,7 @@ export const getSharedModuleRules = () => [
type: 'javascript/auto' as const,
},
{
- test: /\.(png|svg|jpg|jpeg|webp|gif|bmp|webm|mp4|mov|mp3|m4a|wav|aac)$/,
+ test: /\.(png|svg|jpg|jpeg|jxl|webp|gif|bmp|webm|mp4|mov|mp3|m4a|wav|aac)$/,
type: 'asset/resource' as const,
},
{
diff --git a/packages/core/src/asset-types.ts b/packages/core/src/asset-types.ts
index 573680cef9..c235726238 100644
--- a/packages/core/src/asset-types.ts
+++ b/packages/core/src/asset-types.ts
@@ -39,6 +39,11 @@ declare module '*.jpeg' {
export default src;
}
+declare module '*.jxl' {
+ const src: string;
+ export default src;
+}
+
declare module '*.bmp' {
const src: string;
export default src;
diff --git a/packages/renderer/src/mime-db.ts b/packages/renderer/src/mime-db.ts
index 03be0c61bf..3da3e21bfe 100644
--- a/packages/renderer/src/mime-db.ts
+++ b/packages/renderer/src/mime-db.ts
@@ -7266,6 +7266,11 @@ export const mimeDb: Record<
compressible: false,
extensions: ['jpx', 'jpf'],
},
+ 'image/jxl': {
+ source: 'iana',
+ compressible: false,
+ extensions: ['jxl'],
+ },
'image/jxr': {
source: 'iana',
extensions: ['jxr'],
diff --git a/packages/studio-shared/src/detect-file-type.ts b/packages/studio-shared/src/detect-file-type.ts
index 115cfd8356..00e5a2efc0 100644
--- a/packages/studio-shared/src/detect-file-type.ts
+++ b/packages/studio-shared/src/detect-file-type.ts
@@ -206,6 +206,22 @@ const isJpeg = (data: Uint8Array): JpegType | null => {
return {dimensions: dim, type: 'jpeg'};
};
+const isJxl = (data: Uint8Array): JxlType | null => {
+ const codestreamPattern = new Uint8Array([0xff, 0x0a]);
+ const containerPattern = new Uint8Array([
+ 0x00, 0x00, 0x00, 0x0c, 0x4a, 0x58, 0x4c, 0x20, 0x0d, 0x0a, 0x87, 0x0a,
+ ]);
+ if (
+ matchesPattern(codestreamPattern)(data) ||
+ matchesPattern(containerPattern)(data)
+ ) {
+ // Image dimensions are resolved by the browser when inserting the asset.
+ return {type: 'jxl', dimensions: null};
+ }
+
+ return null;
+};
+
const getGifDimensions = (data: Uint8Array): FileDimensions | null => {
if (data.length < 10) {
return null;
@@ -418,6 +434,11 @@ export type JpegType = {
dimensions: FileDimensions | null;
};
+export type JxlType = {
+ type: 'jxl';
+ dimensions: FileDimensions | null;
+};
+
export type WebpType = {
type: 'webp';
dimensions: FileDimensions | null;
@@ -439,6 +460,7 @@ export type UnknownType = {
export type FileType =
| JpegType
+ | JxlType
| WebpType
| RiffType
| WebmType
@@ -459,6 +481,7 @@ export type FileType =
export type ImageFileType =
| JpegType
+ | JxlType
| WebpType
| GifType
| PngType
@@ -470,6 +493,7 @@ export const isImageFileType = (
): fileType is ImageFileType => {
return (
fileType.type === 'jpeg' ||
+ fileType.type === 'jxl' ||
fileType.type === 'webp' ||
fileType.type === 'gif' ||
fileType.type === 'png' ||
@@ -479,6 +503,11 @@ export const isImageFileType = (
};
export const detectFileType = (data: Uint8Array): FileType => {
+ const jxl = isJxl(data);
+ if (jxl) {
+ return jxl;
+ }
+
if (isRiffWave(data)) {
return {type: 'wav'};
}
diff --git a/packages/studio-shared/src/remote-asset.ts b/packages/studio-shared/src/remote-asset.ts
index 888b6f461c..aa924b6f62 100644
--- a/packages/studio-shared/src/remote-asset.ts
+++ b/packages/studio-shared/src/remote-asset.ts
@@ -4,12 +4,13 @@ import type {ImageFileType} from './detect-file-type';
export const maxRemoteAssetSize = 50 * 1024 * 1024;
export const remoteAssetDownloadTimeout = 15_000;
export const remoteAssetAcceptHeader =
- 'image/png,image/apng,image/jpeg,image/webp,image/bmp,image/gif';
+ 'image/png,image/apng,image/jpeg,image/jxl,image/webp,image/bmp,image/gif';
const extensionsForFileType: Record<ImageFileType['type'], string[]> = {
png: ['png'],
apng: ['png', 'apng'],
jpeg: ['jpg', 'jpeg'],
+ jxl: ['jxl'],
webp: ['webp'],
bmp: ['bmp'],
gif: ['gif'],
diff --git a/packages/studio/src/components/import-assets.ts b/packages/studio/src/components/import-assets.ts
index 32028a2fcc..366706b836 100644
--- a/packages/studio/src/components/import-assets.ts
+++ b/packages/studio/src/components/import-assets.ts
@@ -84,6 +84,7 @@ export const getAssetElement = ({
if (
fileType.type === 'png' ||
fileType.type === 'jpeg' ||
+ fileType.type === 'jxl' ||
fileType.type === 'webp' ||
fileType.type === 'bmp'
) {
@@ -171,7 +172,7 @@ export const getAssetElementFromPath = (
return null;
}
- if (['png', 'jpg', 'jpeg', 'webp', 'bmp', 'svg'].includes(extension)) {
+ if (['png', 'jpg', 'jpeg', 'jxl', 'webp', 'bmp', 'svg'].includes(extension)) {
return {
type: 'asset',
assetType: 'image',
@@ -451,6 +452,7 @@ const getFileMetadata = async ({
if (
fileType.type === 'png' ||
fileType.type === 'jpeg' ||
+ fileType.type === 'jxl' ||
fileType.type === 'webp' ||
fileType.type === 'bmp' ||
fileType.type === 'apng' ||
@@ -510,7 +512,7 @@ const getStaticAssetMetadata = (
if (
extension &&
- ['png', 'jpg', 'jpeg', 'webp', 'bmp', 'gif', 'apng', 'svg'].includes(
+ ['png', 'jpg', 'jpeg', 'jxl', 'webp', 'bmp', 'gif', 'apng', 'svg'].includes(
extension,
)
) {
diff --git a/packages/studio/src/helpers/get-preview-file-type.ts b/packages/studio/src/helpers/get-preview-file-type.ts
index f6021d1a11..1a7febe840 100644
--- a/packages/studio/src/helpers/get-preview-file-type.ts
+++ b/packages/studio/src/helpers/get-preview-file-type.ts
@@ -28,6 +28,7 @@ export const getPreviewFileType = (fileName: string | null): AssetFileType => {
const imageExtensions = [
'jpg',
'jpeg',
+ 'jxl',
'png',
'apng',
'gif',