@remotion/webcodecs 4.0.298 → 4.0.301

package/dist/on-audio-track-handler.d.ts

@@ -1,4 +1,4 @@
-import type { AudioTrack, LogLevel, MediaParserContainer } from '@remotion/media-parser';
+import type { MediaParserAudioTrack, MediaParserContainer, MediaParserLogLevel } from '@remotion/media-parser';
 import type { ConvertMediaAudioCodec } from './get-available-audio-codecs';
 import type { ConvertMediaContainer } from './get-available-containers';
 export type AudioOperation = {
@@ -14,9 +14,9 @@ export type AudioOperation = {
     type: 'drop';
 };
 export type ConvertMediaOnAudioTrackHandler = (options: {
-    track: AudioTrack;
+    track: MediaParserAudioTrack;
     defaultAudioCodec: ConvertMediaAudioCodec | null;
-    logLevel: LogLevel;
+    logLevel: MediaParserLogLevel;
     outputContainer: ConvertMediaContainer;
     inputContainer: MediaParserContainer;
     canCopyTrack: boolean;

package/dist/on-audio-track.d.ts

@@ -1,4 +1,4 @@
-import { type LogLevel, type OnAudioTrack } from '@remotion/media-parser';
+import { type MediaParserLogLevel, type MediaParserOnAudioTrack } from '@remotion/media-parser';
 import type { ConvertMediaOnAudioData } from './convert-media';
 import type { MediaFn } from './create/media-fn';
 import type { ProgressTracker } from './create/progress-tracker';
@@ -14,8 +14,8 @@ export declare const makeAudioTrackHandler: ({ state, defaultAudioCodec: audioCo
     abortConversion: (errCause: Error) => void;
     onMediaStateUpdate: null | ConvertMediaProgressFn;
     onAudioTrack: ConvertMediaOnAudioTrackHandler | null;
-    logLevel: LogLevel;
+    logLevel: MediaParserLogLevel;
     outputContainer: ConvertMediaContainer;
     progressTracker: ProgressTracker;
     onAudioData: ConvertMediaOnAudioData | null;
-}) => OnAudioTrack;
+}) => MediaParserOnAudioTrack;

package/dist/on-audio-track.js

@@ -13,7 +13,7 @@ const get_default_audio_codec_1 = require("./get-default-audio-codec");
 const log_1 = require("./log");
 const makeAudioTrackHandler = ({ state, defaultAudioCodec: audioCodec, controller, abortConversion, onMediaStateUpdate, onAudioTrack, logLevel, outputContainer, progressTracker, onAudioData, }) => async ({ track, container: inputContainer }) => {
     const canCopyTrack = (0, can_copy_audio_track_1.canCopyAudioTrack)({
-        inputCodec: track.codecWithoutConfig,
+        inputCodec: track.codecEnum,
         outputContainer,
         inputContainer,
     });
@@ -34,19 +34,19 @@ const makeAudioTrackHandler = ({ state, defaultAudioCodec: audioCodec, controlle
     if (audioOperation.type === 'copy') {
         const addedTrack = await state.addTrack({
             type: 'audio',
-            codec: track.codecWithoutConfig,
+            codec: track.codecEnum,
             numberOfChannels: track.numberOfChannels,
             sampleRate: track.sampleRate,
-            codecPrivate: track.codecPrivate,
+            codecPrivate: track.codecData?.data ?? null,
             timescale: track.timescale,
         });
-        log_1.Log.verbose(logLevel, `Copying audio track ${track.trackId} as track ${addedTrack.trackNumber}. Timescale = ${track.timescale}, codec = ${track.codecWithoutConfig} (${track.codec}) `);
+        log_1.Log.verbose(logLevel, `Copying audio track ${track.trackId} as track ${addedTrack.trackNumber}. Timescale = ${track.timescale}, codec = ${track.codecEnum} (${track.codec}) `);
         return async (audioSample) => {
             await state.addSample({
                 chunk: audioSample,
                 trackNumber: addedTrack.trackNumber,
                 isVideo: false,
-                codecPrivate: track.codecPrivate,
+                codecPrivate: track.codecData?.data ?? null,
             });
             onMediaStateUpdate?.((prevState) => {
                 return {

package/dist/on-frame.d.ts

@@ -1,4 +1,4 @@
-import type { VideoTrack } from '@remotion/media-parser';
+import type { MediaParserVideoTrack } from '@remotion/media-parser';
 import type { ConvertMediaOnVideoFrame } from './convert-media';
 import type { ConvertMediaVideoCodec } from './get-available-video-codecs';
 import type { ResizeOperation } from './resizing/mode';
@@ -7,7 +7,7 @@ export declare const onFrame: ({ frame: unrotatedFrame, onVideoFrame, videoEncod
     frame: VideoFrame;
     onVideoFrame: ConvertMediaOnVideoFrame | null;
     videoEncoder: WebCodecsVideoEncoder;
-    track: VideoTrack;
+    track: MediaParserVideoTrack;
     outputCodec: ConvertMediaVideoCodec;
     rotation: number;
     resizeOperation: ResizeOperation | null;

package/dist/on-video-track-handler.d.ts

@@ -1,4 +1,4 @@
-import type { LogLevel, MediaParserContainer, VideoTrack } from '@remotion/media-parser';
+import type { MediaParserContainer, MediaParserLogLevel, MediaParserVideoTrack } from '@remotion/media-parser';
 import type { ConvertMediaContainer } from './get-available-containers';
 import type { ConvertMediaVideoCodec } from './get-available-video-codecs';
 import type { ResizeOperation } from './resizing/mode';
@@ -16,8 +16,8 @@ export type VideoOperation = {
 };
 export type ConvertMediaOnVideoTrackHandler = (options: {
     defaultVideoCodec: ConvertMediaVideoCodec | null;
-    track: VideoTrack;
-    logLevel: LogLevel;
+    track: MediaParserVideoTrack;
+    logLevel: MediaParserLogLevel;
     outputContainer: ConvertMediaContainer;
     rotate: number;
     resizeOperation: ResizeOperation | null;

package/dist/on-video-track.d.ts

@@ -1,4 +1,4 @@
-import type { LogLevel, OnVideoTrack } from '@remotion/media-parser';
+import type { MediaParserLogLevel, MediaParserOnVideoTrack } from '@remotion/media-parser';
 import type { ConvertMediaOnVideoFrame } from './convert-media';
 import type { MediaFn } from './create/media-fn';
 import type { ProgressTracker } from './create/progress-tracker';
@@ -16,9 +16,9 @@ export declare const makeVideoTrackHandler: ({ state, onVideoFrame, onMediaState
     controller: WebCodecsController;
     defaultVideoCodec: ConvertMediaVideoCodec | null;
     onVideoTrack: ConvertMediaOnVideoTrackHandler | null;
-    logLevel: LogLevel;
+    logLevel: MediaParserLogLevel;
     outputContainer: ConvertMediaContainer;
     rotate: number;
     progress: ProgressTracker;
     resizeOperation: ResizeOperation | null;
-}) => OnVideoTrack;
+}) => MediaParserOnVideoTrack;

package/dist/on-video-track.js

@@ -14,7 +14,7 @@ const video_decoder_config_1 = require("./video-decoder-config");
 const video_encoder_1 = require("./video-encoder");
 const video_encoder_config_1 = require("./video-encoder-config");
 const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortConversion, controller, defaultVideoCodec, onVideoTrack, logLevel, outputContainer, rotate, progress, resizeOperation, }) => async ({ track, container: inputContainer }) => {
-    if (controller._internals.signal.aborted) {
+    if (controller._internals._mediaParserController._internals.signal.aborted) {
         throw new Error('Aborted');
     }
     const canCopyTrack = (0, can_copy_video_track_1.canCopyVideoTrack)({
@@ -44,11 +44,11 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
         log_1.Log.verbose(logLevel, `Copying video track with codec ${track.codec} and timescale ${track.timescale}`);
         const videoTrack = await state.addTrack({
             type: 'video',
-            color: track.color,
+            color: track.advancedColor,
             width: track.codedWidth,
             height: track.codedHeight,
-            codec: track.codecWithoutConfig,
-            codecPrivate: track.codecPrivate,
+            codec: track.codecEnum,
+            codecPrivate: track.codecData?.data ?? null,
             timescale: track.timescale,
         });
         return async (sample) => {
@@ -56,7 +56,7 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
                 chunk: sample,
                 trackNumber: videoTrack.trackNumber,
                 isVideo: true,
-                codecPrivate: track.codecPrivate,
+                codecPrivate: track.codecData?.data ?? null,
             });
             onMediaStateUpdate?.((prevState) => {
                 return {
@@ -96,7 +96,7 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
     }
     const { trackNumber } = await state.addTrack({
         type: 'video',
-        color: track.color,
+        color: track.advancedColor,
         width: newWidth,
         height: newHeight,
         codec: videoOperation.videoCodec,

package/dist/resizing/calculate-new-size.d.ts

@@ -1,8 +1,8 @@
-import type { MediaParserVideoCodec } from '@remotion/media-parser';
+import type { MediaParserDimensions, MediaParserVideoCodec } from '@remotion/media-parser';
 import type { ConvertMediaVideoCodec } from '../get-available-video-codecs';
-import type { Dimensions, ResizeOperation } from './mode';
+import type { ResizeOperation } from './mode';
 export declare const calculateNewSizeAfterResizing: ({ dimensions, resizeOperation, videoCodec, }: {
-    dimensions: Dimensions;
+    dimensions: MediaParserDimensions;
     resizeOperation: ResizeOperation | null;
     videoCodec: ConvertMediaVideoCodec | MediaParserVideoCodec;
-}) => Dimensions;
+}) => MediaParserDimensions;

package/dist/resizing/mode.d.ts

@@ -1,7 +1,3 @@
-export type Dimensions = {
-    width: number;
-    height: number;
-};
 export type ResizeOperation = {
     mode: 'width';
     width: number;

package/dist/rotation.d.ts

@@ -1,7 +1,7 @@
-import type { Dimensions, MediaParserVideoCodec } from '@remotion/media-parser';
+import type { MediaParserDimensions, MediaParserVideoCodec } from '@remotion/media-parser';
 import type { ConvertMediaVideoCodec } from './get-available-video-codecs';
 import type { ResizeOperation } from './resizing/mode';
-export declare const calculateNewDimensionsFromRotate: ({ height, width, rotation, }: Dimensions & {
+export declare const calculateNewDimensionsFromRotate: ({ height, width, rotation, }: MediaParserDimensions & {
     rotation: number;
 }) => {
     height: number;
@@ -13,4 +13,4 @@ export declare const calculateNewDimensionsFromRotateAndScale: ({ width, height,
     rotation: number;
     resizeOperation: ResizeOperation | null;
     videoCodec: ConvertMediaVideoCodec | MediaParserVideoCodec;
-}) => import("./resizing/mode").Dimensions;
+}) => MediaParserDimensions;

package/dist/sort-video-frames.js

@@ -5,7 +5,7 @@ const MAX_QUEUE_SIZE = 5;
 const videoFrameSorter = ({ onRelease, controller, }) => {
     const frames = [];
     const releaseFrame = async () => {
-        await controller._internals.checkForAbortAndPause();
+        await controller._internals._mediaParserController._internals.checkForAbortAndPause();
         const frame = frames.shift();
         if (frame) {
             await onRelease(frame);
@@ -41,9 +41,9 @@ const videoFrameSorter = ({ onRelease, controller, }) => {
         while (frames.length > 0) {
             await releaseFrame();
         }
-        controller._internals.signal.removeEventListener('abort', onAbort);
+        controller._internals._mediaParserController._internals.signal.removeEventListener('abort', onAbort);
     };
-    controller._internals.signal.addEventListener('abort', onAbort);
+    controller._internals._mediaParserController._internals.signal.addEventListener('abort', onAbort);
     return {
         inputFrame,
         flush,

package/dist/video-decoder.d.ts

@@ -1,8 +1,8 @@
-import type { AudioOrVideoSample, LogLevel } from '@remotion/media-parser';
+import type { MediaParserLogLevel, MediaParserVideoSample } from '@remotion/media-parser';
 import type { ProgressTracker } from './create/progress-tracker';
 import type { WebCodecsController } from './webcodecs-controller';
 export type WebCodecsVideoDecoder = {
-    processSample: (videoSample: AudioOrVideoSample) => Promise<void>;
+    processSample: (videoSample: MediaParserVideoSample) => Promise<void>;
     waitForFinish: () => Promise<void>;
     close: () => void;
     flush: () => Promise<void>;
@@ -12,6 +12,6 @@ export declare const createVideoDecoder: ({ onFrame, onError, controller, config
     onError: (error: DOMException) => void;
     controller: WebCodecsController;
     config: VideoDecoderConfig;
-    logLevel: LogLevel;
+    logLevel: MediaParserLogLevel;
     progress: ProgressTracker;
 }) => WebCodecsVideoDecoder;

package/dist/video-decoder.js

@@ -15,12 +15,12 @@ const createVideoDecoder = ({ onFrame, onError, controller, config, logLevel, pr
         const cleanup = () => {
             frame.close();
         };
-        controller._internals.signal.addEventListener('abort', cleanup, {
+        controller._internals._mediaParserController._internals.signal.addEventListener('abort', cleanup, {
             once: true,
         });
         outputQueue = outputQueue
             .then(() => {
-            if (controller._internals.signal.aborted) {
+            if (controller._internals._mediaParserController._internals.signal.aborted) {
                 return;
             }
             return onFrame(frame);
@@ -32,7 +32,7 @@ const createVideoDecoder = ({ onFrame, onError, controller, config, logLevel, pr
             onError(err);
         })
             .finally(() => {
-            controller._internals.signal.removeEventListener('abort', cleanup);
+            controller._internals._mediaParserController._internals.signal.removeEventListener('abort', cleanup);
             cleanup();
         });
         return outputQueue;
@@ -53,8 +53,9 @@ const createVideoDecoder = ({ onFrame, onError, controller, config, logLevel, pr
         },
     });
     const close = () => {
+        controller._internals._mediaParserController._internals.signal.removeEventListener('abort', 
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
-        controller._internals.signal.removeEventListener('abort', onAbort);
+        onAbort);
         if (videoDecoder.state === 'closed') {
             return;
         }
@@ -63,7 +64,7 @@ const createVideoDecoder = ({ onFrame, onError, controller, config, logLevel, pr
     const onAbort = () => {
         close();
     };
-    controller._internals.signal.addEventListener('abort', onAbort);
+    controller._internals._mediaParserController._internals.signal.addEventListener('abort', onAbort);
     videoDecoder.configure(config);
     const processSample = async (sample) => {
         if (videoDecoder.state === 'closed') {

package/dist/video-encoder.d.ts

@@ -1,4 +1,4 @@
-import { type LogLevel } from '@remotion/media-parser';
+import { type MediaParserLogLevel } from '@remotion/media-parser';
 import type { ProgressTracker } from './create/progress-tracker';
 import type { ConvertMediaVideoCodec } from './get-available-video-codecs';
 import type { WebCodecsController } from './webcodecs-controller';
@@ -13,7 +13,7 @@ export declare const createVideoEncoder: ({ onChunk, onError, controller, config
     onError: (error: DOMException) => void;
     controller: WebCodecsController;
     config: VideoEncoderConfig;
-    logLevel: LogLevel;
+    logLevel: MediaParserLogLevel;
     outputCodec: ConvertMediaVideoCodec;
     progress: ProgressTracker;
 }) => WebCodecsVideoEncoder;

package/dist/video-encoder.js

@@ -6,7 +6,7 @@ const convert_to_correct_videoframe_1 = require("./convert-to-correct-videoframe
 const io_synchronizer_1 = require("./io-manager/io-synchronizer");
 const log_1 = require("./log");
 const createVideoEncoder = ({ onChunk, onError, controller, config, logLevel, outputCodec, progress, }) => {
-    if (controller._internals.signal.aborted) {
+    if (controller._internals._mediaParserController._internals.signal.aborted) {
         throw new media_parser_1.MediaParserAbortError('Not creating video encoder, already aborted');
     }
     const ioSynchronizer = (0, io_synchronizer_1.makeIoSynchronizer)({
@@ -24,7 +24,8 @@ const createVideoEncoder = ({ onChunk, onError, controller, config, logLevel, ou
             ioSynchronizer.onOutput(timestamp);
             outputQueue = outputQueue
                 .then(() => {
-                if (controller._internals.signal.aborted) {
+                if (controller._internals._mediaParserController._internals.signal
+                    .aborted) {
                     return;
                 }
                 return onChunk(chunk, metadata ?? null);
@@ -39,8 +40,9 @@ const createVideoEncoder = ({ onChunk, onError, controller, config, logLevel, ou
         },
     });
     const close = () => {
+        controller._internals._mediaParserController._internals.signal.removeEventListener('abort', 
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
-        controller._internals.signal.removeEventListener('abort', onAbort);
+        onAbort);
         if (encoder.state === 'closed') {
             return;
         }
@@ -49,7 +51,7 @@ const createVideoEncoder = ({ onChunk, onError, controller, config, logLevel, ou
     const onAbort = () => {
         close();
     };
-    controller._internals.signal.addEventListener('abort', onAbort);
+    controller._internals._mediaParserController._internals.signal.addEventListener('abort', onAbort);
     log_1.Log.verbose(logLevel, 'Configuring video encoder', config);
     encoder.configure(config);
     let framesProcessed = 0;

package/dist/wav-audio-encoder.js

@@ -8,7 +8,7 @@ const getWaveAudioEncoder = ({ onChunk, controller, config, }) => {
             return Promise.resolve();
         },
         encodeFrame: (unconvertedAudioData) => {
-            if (controller._internals.signal.aborted) {
+            if (controller._internals._mediaParserController._internals.signal.aborted) {
                 return Promise.resolve();
             }
             const audioData = (0, convert_audiodata_1.convertAudioData)({

package/dist/webcodecs-controller.d.ts

@@ -9,9 +9,7 @@ export type WebCodecsController = {
      * @deprecated Not public API
      */
     _internals: {
-        signal: AbortSignal;
-        checkForAbortAndPause: MediaParserController['_internals']['checkForAbortAndPause'];
+        _mediaParserController: MediaParserController;
     };
-    _mediaParserController: MediaParserController;
 };
 export declare const webcodecsController: () => WebCodecsController;

package/dist/webcodecs-controller.js

@@ -10,8 +10,7 @@ const webcodecsController = () => {
         resume: controller.resume,
         addEventListener: controller.addEventListener,
         removeEventListener: controller.removeEventListener,
-        _internals: controller._internals,
-        _mediaParserController: controller,
+        _internals: { _mediaParserController: controller },
     };
 };
 exports.webcodecsController = webcodecsController;

package/dist/writers/buffer-implementation/writer.d.ts

@@ -1,2 +1,2 @@
-import type { CreateContent } from '@remotion/media-parser';
-export declare const createContent: CreateContent;
+import type { MediaParserInternalTypes } from '@remotion/media-parser';
+export declare const createContent: MediaParserInternalTypes['CreateContent'];

package/dist/writers/buffer-implementation/writer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createContent = void 0;
-const createContent = ({ filename, mimeType }) => {
+const createContent = ({ filename, mimeType, }) => {
     const buf = new ArrayBuffer(0, {
         // TODO: Educate that the buffer is limited to 2GB
         maxByteLength: 2000000000,
@@ -36,9 +36,7 @@ const createContent = ({ filename, mimeType }) => {
         },
         getBlob() {
             const arr = new Uint8Array(buf);
-            return Promise.resolve(
-            // TODO: Unhardcode MIME type and file name
-            new File([arr.slice()], filename, { type: mimeType }));
+            return Promise.resolve(new File([arr.slice()], filename, { type: mimeType }));
         },
         remove() {
             removed = true;

package/dist/writers/buffer.d.ts

@@ -1,2 +1,2 @@
-import type { WriterInterface } from '@remotion/media-parser';
-export declare const bufferWriter: WriterInterface;
+import type { MediaParserInternalTypes } from '@remotion/media-parser';
+export declare const bufferWriter: MediaParserInternalTypes['WriterInterface'];

package/dist/writers/web-fs.d.ts

@@ -1,3 +1,3 @@
-import type { WriterInterface } from '@remotion/media-parser';
-export declare const webFsWriter: WriterInterface;
+import type { MediaParserInternalTypes } from '@remotion/media-parser';
+export declare const webFsWriter: MediaParserInternalTypes['WriterInterface'];
 export declare const canUseWebFsWriter: () => Promise<boolean>;

package/dist/writers/web-fs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canUseWebFsWriter = exports.webFsWriter = void 0;
-const createContent = async ({ filename }) => {
+const createContent = async ({ filename, }) => {
     const directoryHandle = await navigator.storage.getDirectory();
     const actualFilename = `__remotion_mediaparser:${filename}`;
     const remove = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/webcodecs",
-  "version": "4.0.298",
+  "version": "4.0.301",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/esm/index.mjs",
@@ -19,8 +19,8 @@
   "author": "Jonny Burger <jonny@remotion.dev>",
   "license": "Remotion License (See https://remotion.dev/docs/webcodecs#license)",
   "dependencies": {
-    "@remotion/licensing": "4.0.298",
-    "@remotion/media-parser": "4.0.298"
+    "@remotion/media-parser": "4.0.301",
+    "@remotion/licensing": "4.0.301"
   },
   "peerDependencies": {},
   "devDependencies": {
@@ -28,8 +28,8 @@
     "playwright": "1.51.1",
     "@playwright/test": "1.51.1",
     "eslint": "9.19.0",
-    "@remotion/eslint-config-internal": "4.0.298",
-    "@remotion/example-videos": "4.0.298"
+    "@remotion/example-videos": "4.0.301",
+    "@remotion/eslint-config-internal": "4.0.301"
   },
   "keywords": [],
   "publishConfig": {

package/dist/resample-audiodata.d.ts

@@ -1,4 +0,0 @@
-export declare const resampleAudioData: ({ audioData, newSampleRate, }: {
-    audioData: AudioData;
-    newSampleRate: number;
-}) => AudioData;

package/dist/resample-audiodata.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resampleAudioData = void 0;
-const resampleAudioData = ({ audioData, newSampleRate, }) => {
-    const { numberOfChannels, sampleRate: currentSampleRate, numberOfFrames, } = audioData;
-    const ratio = currentSampleRate / newSampleRate;
-    const newNumberOfFrames = Math.floor(numberOfFrames / ratio);
-    // TODO: Float32Array hardcoded
-    const src = new Float32Array(numberOfChannels * numberOfFrames);
-    audioData.clone().copyTo(src, {
-        // TODO: Plane index hardcoded
-        planeIndex: 0,
-    });
-    const data = new Float32Array(newNumberOfFrames * numberOfChannels);
-    const chunkSize = numberOfFrames / newNumberOfFrames;
-    for (let i = 0; i < newNumberOfFrames; i++) {
-        const start = Math.floor(i * chunkSize);
-        const end = Math.max(Math.floor(start + chunkSize), start + 1);
-        const chunk = src.slice(start, end);
-        const average = chunk.reduce((a, b) => a + b, 0) / chunk.length;
-        for (let j = 0; j < numberOfChannels; j++) {
-            data[i * numberOfChannels + j] = average;
-        }
-    }
-    const newAudioData = new AudioData({
-        data,
-        format: audioData.format,
-        numberOfChannels,
-        numberOfFrames: newNumberOfFrames,
-        sampleRate: newSampleRate,
-        timestamp: audioData.timestamp,
-    });
-    return newAudioData;
-};
-exports.resampleAudioData = resampleAudioData;