@remotion/webcodecs 4.0.233 → 4.0.235

package/dist/audio-decoder-config.d.ts

@@ -1,2 +1 @@
-import type { LogLevel } from './log';
-export declare const getAudioDecoderConfig: (config: AudioDecoderConfig, logLevel: LogLevel) => Promise<AudioDecoderConfig | null>;
+export declare const getAudioDecoderConfig: (config: AudioDecoderConfig) => Promise<AudioDecoderConfig | null>;

package/dist/audio-decoder-config.js

@@ -1,41 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAudioDecoderConfig = void 0;
-const browser_quirks_1 = require("./browser-quirks");
-const log_1 = require("./log");
-const overrideBrowserQuirks = ({ config, logLevel, }) => {
-    const bytes = config.description;
-    if (!bytes) {
-        return config;
-    }
-    if (bytes[0] === 18 && bytes[1] === 8) {
-        // riverside_use_cursor_.mp4
-        if ((0, browser_quirks_1.isFirefox)()) {
-            return {
-                ...config,
-                codec: 'mp4a.40.2',
-                description: bytes,
-            };
-        }
-        if (!(0, browser_quirks_1.isChrome)()) {
-            return config;
-        }
-        log_1.Log.warn(logLevel, 'Chrome has a bug and might not be able to decode this audio. It will be fixed, see: https://issues.chromium.org/issues/360083330');
-        return {
-            ...config,
-            description: new Uint8Array([18, 16]),
-        };
-    }
-    if (bytes.byteLength === 2 && bytes[0] === 17 && bytes[1] === 136) {
-        log_1.Log.warn(logLevel, 'Chrome has a bug and might not be able to decode this audio. It will be fixed, see: https://issues.chromium.org/issues/360083330');
-        return {
-            ...config,
-            description: new Uint8Array([18, 144]),
-        };
-    }
-    return config;
-};
-const getAudioDecoderConfig = async (config, logLevel) => {
+const getAudioDecoderConfig = async (config) => {
     if (config.codec === 'pcm-s16') {
         return config;
     }
@@ -45,12 +11,8 @@ const getAudioDecoderConfig = async (config, logLevel) => {
     if (typeof EncodedAudioChunk === 'undefined') {
         return null;
     }
-    const realConfig = overrideBrowserQuirks({
-        config,
-        logLevel,
-    });
-    if ((await AudioDecoder.isConfigSupported(realConfig)).supported) {
-        return realConfig;
+    if ((await AudioDecoder.isConfigSupported(config)).supported) {
+        return config;
     }
     return null;
 };

package/dist/can-reencode-audio-track.d.ts

@@ -1,8 +1,7 @@
-import type { AudioTrack, LogLevel } from '@remotion/media-parser';
+import type { AudioTrack } from '@remotion/media-parser';
 import type { ConvertMediaAudioCodec } from './get-available-audio-codecs';
-export declare const canReencodeAudioTrack: ({ track, audioCodec, bitrate, logLevel, }: {
+export declare const canReencodeAudioTrack: ({ track, audioCodec, bitrate, }: {
     track: AudioTrack;
     audioCodec: ConvertMediaAudioCodec;
     bitrate: number;
-    logLevel?: LogLevel;
 }) => Promise<boolean>;

package/dist/can-reencode-audio-track.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.canReencodeAudioTrack = void 0;
 const audio_decoder_config_1 = require("./audio-decoder-config");
 const audio_encoder_config_1 = require("./audio-encoder-config");
-const canReencodeAudioTrack = async ({ track, audioCodec, bitrate, logLevel = 'info', }) => {
-    const audioDecoderConfig = await (0, audio_decoder_config_1.getAudioDecoderConfig)(track, logLevel);
+const canReencodeAudioTrack = async ({ track, audioCodec, bitrate, }) => {
+    const audioDecoderConfig = await (0, audio_decoder_config_1.getAudioDecoderConfig)(track);
     if (audioCodec === 'wav' && audioDecoderConfig) {
         return true;
     }

package/dist/create-aac-codecprivate.d.ts

@@ -0,0 +1,14 @@
+/**
+ * bytes 17,144: 00010 001 | 1 0010 000
+                 ^^^^^ ^^^   ^ ^^^^ ^
+                 |     |       |    | padding
+                 |     |       |
+                 |     |       +-- channelConfiguration (2)
+                 |     +-- samplingFrequencyIndex (3)
+                 +-- audioConfigType (2)
+  */
+export declare const createAacCodecPrivate: ({ audioObjectType, sampleRate, channelConfiguration, }: {
+    audioObjectType: number;
+    sampleRate: number;
+    channelConfiguration: number;
+}) => Uint8Array;

package/dist/create-aac-codecprivate.js

@@ -0,0 +1,72 @@
+"use strict";
+// codec private, for example [17, 144]
+// audioObjectType = 2 = 'AAC LC'
+// samplingFrequencyIndex = 3 = '48000 Hz'
+// channelConfiguration = 2 = '2 channels'
+/**
+ * bytes 17,144: 00010 001 | 1 0010 000
+                 ^^^^^ ^^^   ^ ^^^^ ^
+                 |     |       |    | padding
+                 |     |       |
+                 |     |       +-- channelConfiguration (2)
+                 |     +-- samplingFrequencyIndex (3)
+                 +-- audioConfigType (2)
+  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAacCodecPrivate = void 0;
+// https://wiki.multimedia.cx/index.php/MPEG-4_Audio#Channel_Configurations
+const getConfigForSampleRate = (sampleRate) => {
+    if (sampleRate === 96000) {
+        return 0;
+    }
+    if (sampleRate === 88200) {
+        return 1;
+    }
+    if (sampleRate === 64000) {
+        return 2;
+    }
+    if (sampleRate === 48000) {
+        return 3;
+    }
+    if (sampleRate === 44100) {
+        return 4;
+    }
+    if (sampleRate === 32000) {
+        return 5;
+    }
+    if (sampleRate === 24000) {
+        return 6;
+    }
+    if (sampleRate === 22050) {
+        return 7;
+    }
+    if (sampleRate === 16000) {
+        return 8;
+    }
+    if (sampleRate === 12000) {
+        return 9;
+    }
+    if (sampleRate === 11025) {
+        return 10;
+    }
+    if (sampleRate === 8000) {
+        return 11;
+    }
+    if (sampleRate === 7350) {
+        return 12;
+    }
+    throw new Error(`Unexpected sample rate ${sampleRate}`);
+};
+const createAacCodecPrivate = ({ audioObjectType, sampleRate, channelConfiguration, }) => {
+    const bits = `${audioObjectType.toString(2).padStart(5, '0')}${getConfigForSampleRate(sampleRate).toString(2).padStart(4, '0')}${channelConfiguration.toString(2).padStart(4, '0')}000`;
+    if (bits.length !== 16) {
+        throw new Error('Invalid AAC codec private ' + bits.length);
+    }
+    if (channelConfiguration === 0 || channelConfiguration > 7) {
+        throw new Error('Invalid channel configuration ' + channelConfiguration);
+    }
+    const firstByte = parseInt(bits.slice(0, 8), 2);
+    const secondByte = parseInt(bits.slice(8, 16), 2);
+    return new Uint8Array([firstByte, secondByte]);
+};
+exports.createAacCodecPrivate = createAacCodecPrivate;

package/dist/esm/index.mjs

@@ -492,53 +492,8 @@ var canCopyVideoTrack = ({
   }
   throw new Error(`Unhandled codec: ${container}`);
 };
-// src/browser-quirks.ts
-var isFirefox = () => {
-  return navigator.userAgent.toLowerCase().indexOf("firefox") > -1;
-};
-var isSafari = () => {
-  return /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-};
-var isChrome = () => {
-  return navigator.userAgent.toLowerCase().indexOf("chrome") > -1;
-};
-
 // src/audio-decoder-config.ts
-var overrideBrowserQuirks = ({
-  config,
-  logLevel
-}) => {
-  const bytes = config.description;
-  if (!bytes) {
-    return config;
-  }
-  if (bytes[0] === 18 && bytes[1] === 8) {
-    if (isFirefox()) {
-      return {
-        ...config,
-        codec: "mp4a.40.2",
-        description: bytes
-      };
-    }
-    if (!isChrome()) {
-      return config;
-    }
-    Log.warn(logLevel, "Chrome has a bug and might not be able to decode this audio. It will be fixed, see: https://issues.chromium.org/issues/360083330");
-    return {
-      ...config,
-      description: new Uint8Array([18, 16])
-    };
-  }
-  if (bytes.byteLength === 2 && bytes[0] === 17 && bytes[1] === 136) {
-    Log.warn(logLevel, "Chrome has a bug and might not be able to decode this audio. It will be fixed, see: https://issues.chromium.org/issues/360083330");
-    return {
-      ...config,
-      description: new Uint8Array([18, 144])
-    };
-  }
-  return config;
-};
-var getAudioDecoderConfig = async (config, logLevel) => {
+var getAudioDecoderConfig = async (config) => {
   if (config.codec === "pcm-s16") {
     return config;
   }
@@ -548,12 +503,8 @@ var getAudioDecoderConfig = async (config, logLevel) => {
   if (typeof EncodedAudioChunk === "undefined") {
     return null;
   }
-  const realConfig = overrideBrowserQuirks({
-    config,
-    logLevel
-  });
-  if ((await AudioDecoder.isConfigSupported(realConfig)).supported) {
-    return realConfig;
+  if ((await AudioDecoder.isConfigSupported(config)).supported) {
+    return config;
   }
   return null;
 };
@@ -592,10 +543,9 @@ var getAudioEncoderConfig = async (config) => {
 var canReencodeAudioTrack = async ({
   track,
   audioCodec,
-  bitrate,
-  logLevel = "info"
+  bitrate
 }) => {
-  const audioDecoderConfig = await getAudioDecoderConfig(track, logLevel);
+  const audioDecoderConfig = await getAudioDecoderConfig(track);
   if (audioCodec === "wav" && audioDecoderConfig) {
     return true;
   }
@@ -629,6 +579,14 @@ var getVideoDecoderConfigWithHardwareAcceleration = async (config) => {
   return null;
 };
 
+// src/browser-quirks.ts
+var isFirefox = () => {
+  return navigator.userAgent.toLowerCase().indexOf("firefox") > -1;
+};
+var isSafari = () => {
+  return /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+};
+
 // src/choose-correct-avc1-profile.ts
 var chooseCorrectAvc1Profile = ({
   width,
@@ -713,7 +671,7 @@ var canReencodeVideoTrack = async ({
 };
 // src/convert-media.ts
 import {
-  MediaParserInternals as MediaParserInternals7,
+  MediaParserInternals as MediaParserInternals8,
   parseMedia
 } from "@remotion/media-parser";
 
@@ -756,6 +714,11 @@ var generateOutputFilename = (source, container) => {
   return `${withoutExtension}.${container}`;
 };
 
+// src/on-audio-track.ts
+import {
+  MediaParserInternals as MediaParserInternals5
+} from "@remotion/media-parser";
+
 // src/convert-encoded-chunk.ts
 var convertEncodedChunk = (chunk, trackId) => {
   const arr = new Uint8Array(chunk.byteLength);
@@ -886,7 +849,7 @@ var makeAudioTrackHandler = ({
     numberOfChannels: track.numberOfChannels,
     sampleRate: track.sampleRate,
     description: track.description
-  }, logLevel);
+  });
   if (!audioEncoderConfig) {
     abortConversion(new error_cause_default(`Could not configure audio encoder of track ${track.trackId}`));
     return null;
@@ -895,7 +858,11 @@ var makeAudioTrackHandler = ({
     abortConversion(new error_cause_default(`Could not configure audio decoder of track ${track.trackId}`));
     return null;
   }
-  const codecPrivate = audioOperation.audioCodec === "aac" ? new Uint8Array([17, 144]) : null;
+  const codecPrivate = audioOperation.audioCodec === "aac" ? MediaParserInternals5.createAacCodecPrivate({
+    audioObjectType: 2,
+    sampleRate: track.sampleRate,
+    channelConfiguration: track.numberOfChannels
+  }) : null;
   const { trackNumber } = await state.addTrack({
     type: "audio",
     codec: audioOperation.audioCodec === "wav" ? "pcm-s16" : audioOperation.audioCodec,
@@ -973,7 +940,7 @@ var arrayBufferToUint8Array = (buffer) => {
 };
 
 // src/default-on-video-track-handler.ts
-import { MediaParserInternals as MediaParserInternals5 } from "@remotion/media-parser";
+import { MediaParserInternals as MediaParserInternals6 } from "@remotion/media-parser";
 
 // src/get-default-video-codec.ts
 var getDefaultVideoCodec = ({
@@ -1006,12 +973,12 @@ var defaultOnVideoTrackHandler = async ({
     rotationToApply: rotate
   });
   if (canCopy) {
-    MediaParserInternals5.Log.verbose(logLevel, `Track ${track.trackId} (video): Can copy, therefore copying`);
+    MediaParserInternals6.Log.verbose(logLevel, `Track ${track.trackId} (video): Can copy, therefore copying`);
     return Promise.resolve({ type: "copy" });
   }
   const videoCodec = defaultVideoCodec ?? getDefaultVideoCodec({ container });
   if (videoCodec === null) {
-    MediaParserInternals5.Log.verbose(logLevel, `Track ${track.trackId} (video): No default video codec, therefore dropping`);
+    MediaParserInternals6.Log.verbose(logLevel, `Track ${track.trackId} (video): No default video codec, therefore dropping`);
     return Promise.resolve({ type: "drop" });
   }
   const canReencode = await canReencodeVideoTrack({
@@ -1019,14 +986,14 @@ var defaultOnVideoTrackHandler = async ({
     track
   });
   if (canReencode) {
-    MediaParserInternals5.Log.verbose(logLevel, `Track ${track.trackId} (video): Cannot copy, but re-enconde, therefore re-encoding`);
+    MediaParserInternals6.Log.verbose(logLevel, `Track ${track.trackId} (video): Cannot copy, but re-enconde, therefore re-encoding`);
     return Promise.resolve({
       type: "reencode",
       videoCodec,
       rotation: rotate - track.rotation
     });
   }
-  MediaParserInternals5.Log.verbose(logLevel, `Track ${track.trackId} (video): Can neither copy nor re-encode, therefore failing`);
+  MediaParserInternals6.Log.verbose(logLevel, `Track ${track.trackId} (video): Can neither copy nor re-encode, therefore failing`);
   return Promise.resolve({ type: "fail" });
 };
 
@@ -1352,7 +1319,7 @@ var makeVideoTrackHandler = ({
   if (videoOperation.type !== "reencode") {
     throw new error_cause_default(`Video track with ID ${track.trackId} could not be resolved with a valid operation. Received ${JSON.stringify(videoOperation)}, but must be either "copy", "reencode", "drop" or "fail"`);
   }
-  const rotation = videoOperation.rotate ?? -track.rotation;
+  const rotation = (videoOperation.rotate ?? rotate) - track.rotation;
   const { height: newHeight, width: newWidth } = calculateNewDimensionsFromDimensions({
     width: track.codedWidth,
     height: track.codedHeight,
@@ -1446,16 +1413,16 @@ var makeVideoTrackHandler = ({
 };
 
 // src/select-container-creator.ts
-import { MediaParserInternals as MediaParserInternals6 } from "@remotion/media-parser";
+import { MediaParserInternals as MediaParserInternals7 } from "@remotion/media-parser";
 var selectContainerCreator = (container) => {
   if (container === "mp4") {
-    return MediaParserInternals6.createIsoBaseMedia;
+    return MediaParserInternals7.createIsoBaseMedia;
   }
   if (container === "wav") {
-    return MediaParserInternals6.createWav;
+    return MediaParserInternals7.createWav;
   }
   if (container === "webm") {
-    return MediaParserInternals6.createMatroskaMedia;
+    return MediaParserInternals7.createMatroskaMedia;
   }
   throw new Error(`Unsupported container: ${container}`);
 };
@@ -1540,7 +1507,7 @@ var convertMedia = async function({
   if (videoCodec && videoCodec !== "vp8" && videoCodec !== "vp9") {
     return Promise.reject(new TypeError('Only `videoCodec: "vp8"` and `videoCodec: "vp9"` are supported currently'));
   }
-  const { resolve, reject, getPromiseToImmediatelyReturn } = MediaParserInternals7.withResolversAndWaitForReturn();
+  const { resolve, reject, getPromiseToImmediatelyReturn } = MediaParserInternals8.withResolversAndWaitForReturn();
   const controller = new AbortController;
   const abortConversion = (errCause) => {
     reject(errCause);
@@ -1558,7 +1525,7 @@ var convertMedia = async function({
     everyMilliseconds: progressIntervalInMs ?? 100,
     signal: controller.signal
   });
-  const progressTracker = MediaParserInternals7.makeProgressTracker();
+  const progressTracker = MediaParserInternals8.makeProgressTracker();
   const state = await creator({
     filename: generateOutputFilename(src, container),
     writer: await autoSelectWriter(writer, logLevel),

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

@@ -1,4 +1,4 @@
-import type { LogLevel, MediaFn, OnAudioTrack, ProgressTracker } from '@remotion/media-parser';
+import { type LogLevel, type MediaFn, type OnAudioTrack, type ProgressTracker } from '@remotion/media-parser';
 import Error from './error-cause';
 import type { ConvertMediaAudioCodec } from './get-available-audio-codecs';
 import type { ConvertMediaContainer } from './get-available-containers';

package/dist/on-audio-track.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAudioTrackHandler = void 0;
+const media_parser_1 = require("@remotion/media-parser");
 const audio_decoder_1 = require("./audio-decoder");
 const audio_decoder_config_1 = require("./audio-decoder-config");
 const audio_encoder_1 = require("./audio-encoder");
@@ -62,7 +63,7 @@ const makeAudioTrackHandler = ({ state, defaultAudioCodec: audioCodec, controlle
         numberOfChannels: track.numberOfChannels,
         sampleRate: track.sampleRate,
         description: track.description,
-    }, logLevel);
+    });
     if (!audioEncoderConfig) {
         abortConversion(new error_cause_1.default(`Could not configure audio encoder of track ${track.trackId}`));
         return null;
@@ -71,7 +72,13 @@ const makeAudioTrackHandler = ({ state, defaultAudioCodec: audioCodec, controlle
         abortConversion(new error_cause_1.default(`Could not configure audio decoder of track ${track.trackId}`));
         return null;
     }
-    const codecPrivate = audioOperation.audioCodec === 'aac' ? new Uint8Array([17, 144]) : null;
+    const codecPrivate = audioOperation.audioCodec === 'aac'
+        ? media_parser_1.MediaParserInternals.createAacCodecPrivate({
+            audioObjectType: 2,
+            sampleRate: track.sampleRate,
+            channelConfiguration: track.numberOfChannels,
+        })
+        : null;
     const { trackNumber } = await state.addTrack({
         type: 'audio',
         codec: audioOperation.audioCodec === 'wav'

package/dist/on-video-track.js

@@ -63,7 +63,7 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
     if (videoOperation.type !== 'reencode') {
         throw new error_cause_1.default(`Video track with ID ${track.trackId} could not be resolved with a valid operation. Received ${JSON.stringify(videoOperation)}, but must be either "copy", "reencode", "drop" or "fail"`);
     }
-    const rotation = (_a = videoOperation.rotate) !== null && _a !== void 0 ? _a : -track.rotation;
+    const rotation = ((_a = videoOperation.rotate) !== null && _a !== void 0 ? _a : rotate) - track.rotation;
     const { height: newHeight, width: newWidth } = (0, rotation_1.calculateNewDimensionsFromDimensions)({
         width: track.codedWidth,
         height: track.codedHeight,

package/dist/test/aac-codecprivate.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/aac-codecprivate.test.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const bun_test_1 = require("bun:test");
+const create_aac_codecprivate_1 = require("../create-aac-codecprivate");
+(0, bun_test_1.test)('AACCodecPrivate', () => {
+    const codecPrivate = (0, create_aac_codecprivate_1.createAacCodecPrivate)({
+        audioObjectType: 2,
+        sampleRate: 48000,
+        channelConfiguration: 2,
+    });
+    (0, bun_test_1.expect)(codecPrivate).toEqual(new Uint8Array([17, 144]));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/webcodecs",
-  "version": "4.0.233",
+  "version": "4.0.235",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/esm/index.mjs",
@@ -17,14 +17,14 @@
   "author": "Jonny Burger <jonny@remotion.dev>",
   "license": "Remotion License (See https://remotion.dev/docs/webcodecs#license)",
   "dependencies": {
-    "@remotion/media-parser": "4.0.233",
-    "@remotion/example-videos": "4.0.233"
+    "@remotion/media-parser": "4.0.235"
   },
   "peerDependencies": {},
   "devDependencies": {
     "@types/dom-webcodecs": "0.1.11",
     "eslint": "9.14.0",
-    "@remotion/eslint-config-internal": "4.0.233"
+    "@remotion/example-videos": "4.0.235",
+    "@remotion/eslint-config-internal": "4.0.235"
   },
   "keywords": [],
   "publishConfig": {