@remotion/webcodecs 4.0.228 → 4.0.230
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/arraybuffer-to-uint8-array.d.ts +1 -0
- package/dist/arraybuffer-to-uint8-array.js +7 -0
- package/dist/audio-decoder-config.js +3 -0
- package/dist/audio-decoder.d.ts +2 -2
- package/dist/audio-encoder-config.js +15 -2
- package/dist/audio-encoder.d.ts +2 -1
- package/dist/audio-encoder.js +16 -4
- package/dist/calculate-progress.d.ts +2 -2
- package/dist/calculate-progress.js +3 -3
- package/dist/can-copy-audio-track.d.ts +6 -0
- package/dist/can-copy-audio-track.js +13 -0
- package/dist/can-copy-video-track.d.ts +6 -0
- package/dist/can-copy-video-track.js +13 -0
- package/dist/can-reencode-audio-track.d.ts +7 -0
- package/dist/can-reencode-audio-track.js +16 -0
- package/dist/can-reencode-video-track.d.ts +6 -0
- package/dist/can-reencode-video-track.js +16 -0
- package/dist/choose-correct-avc1-profile.d.ts +5 -0
- package/dist/choose-correct-avc1-profile.js +54 -0
- package/dist/codec-id.d.ts +10 -2
- package/dist/codec-id.js +30 -0
- package/dist/convert-encoded-chunk.d.ts +3 -0
- package/dist/convert-encoded-chunk.js +38 -0
- package/dist/convert-media.d.ts +22 -14
- package/dist/convert-media.js +25 -20
- package/dist/default-on-audio-track-handler.d.ts +2 -0
- package/dist/default-on-audio-track-handler.js +36 -0
- package/dist/default-on-video-track-handler.d.ts +2 -0
- package/dist/default-on-video-track-handler.js +29 -0
- package/dist/esm/index.mjs +497 -210
- package/dist/get-default-audio-codec.d.ts +4 -0
- package/dist/get-default-audio-codec.js +13 -0
- package/dist/get-default-video-codec.d.ts +4 -0
- package/dist/get-default-video-codec.js +10 -0
- package/dist/index.d.ts +12 -1
- package/dist/index.js +21 -1
- package/dist/io-manager/io-synchronizer.js +2 -2
- package/dist/on-audio-track-handler.d.ts +19 -0
- package/dist/on-audio-track-handler.js +2 -0
- package/dist/on-audio-track.d.ts +6 -6
- package/dist/on-audio-track.js +54 -27
- package/dist/on-frame.d.ts +11 -0
- package/dist/on-frame.js +32 -0
- package/dist/on-video-track-handler.d.ts +18 -0
- package/dist/on-video-track-handler.js +2 -0
- package/dist/on-video-track.d.ts +10 -9
- package/dist/on-video-track.js +55 -25
- package/dist/video-decoder.d.ts +2 -2
- package/dist/video-decoder.js +5 -0
- package/dist/video-encoder-config.d.ts +7 -1
- package/dist/video-encoder-config.js +11 -1
- package/dist/video-encoder.d.ts +2 -2
- package/dist/video-encoder.js +4 -6
- package/package.json +4 -4
- package/dist/event-emitter.d.ts +0 -25
- package/dist/event-emitter.js +0 -23
- package/dist/resolve-audio-action.d.ts +0 -15
- package/dist/resolve-audio-action.js +0 -30
- package/dist/resolve-video-action.d.ts +0 -15
- package/dist/resolve-video-action.js +0 -33
- package/dist/wait-until-return.d.ts +0 -4
- package/dist/wait-until-return.js +0 -14
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDefaultAudioCodec = void 0;
|
|
4
|
+
const getDefaultAudioCodec = ({ container, }) => {
|
|
5
|
+
if (container === 'webm') {
|
|
6
|
+
return 'opus';
|
|
7
|
+
}
|
|
8
|
+
if (container === 'mp4') {
|
|
9
|
+
return 'aac';
|
|
10
|
+
}
|
|
11
|
+
throw new Error(`Unhandled container: ${container}`);
|
|
12
|
+
};
|
|
13
|
+
exports.getDefaultAudioCodec = getDefaultAudioCodec;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDefaultVideoCodec = void 0;
|
|
4
|
+
const getDefaultVideoCodec = ({ container, }) => {
|
|
5
|
+
if (container === 'webm') {
|
|
6
|
+
return 'vp8';
|
|
7
|
+
}
|
|
8
|
+
throw new Error(`Unhandled container: ${container} satisfies never`);
|
|
9
|
+
};
|
|
10
|
+
exports.getDefaultVideoCodec = getDefaultVideoCodec;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
export { WebCodecsAudioDecoder, createAudioDecoder } from './audio-decoder';
|
|
2
2
|
export { WebCodecsAudioEncoder, createAudioEncoder } from './audio-encoder';
|
|
3
|
-
export {
|
|
3
|
+
export { canCopyAudioTrack } from './can-copy-audio-track';
|
|
4
|
+
export { canCopyVideoTrack } from './can-copy-video-track';
|
|
5
|
+
export { canReencodeAudioTrack } from './can-reencode-audio-track';
|
|
6
|
+
export { canReencodeVideoTrack } from './can-reencode-video-track';
|
|
7
|
+
export { ConvertMediaAudioCodec, ConvertMediaContainer, ConvertMediaVideoCodec, getAvailableAudioCodecs, getAvailableContainers, getAvailableVideoCodecs, } from './codec-id';
|
|
8
|
+
export { ConvertMediaOnMediaStateUpdate, ConvertMediaOnVideoFrame, ConvertMediaResult, ConvertMediaState, convertMedia, } from './convert-media';
|
|
9
|
+
export { defaultOnAudioTrackHandler } from './default-on-audio-track-handler';
|
|
10
|
+
export { defaultOnVideoTrackHandler } from './default-on-video-track-handler';
|
|
11
|
+
export { getDefaultAudioCodec } from './get-default-audio-codec';
|
|
12
|
+
export { getDefaultVideoCodec } from './get-default-video-codec';
|
|
13
|
+
export { AudioOperation, ConvertMediaOnAudioTrackHandler, } from './on-audio-track-handler';
|
|
14
|
+
export { ConvertMediaOnVideoTrackHandler, VideoOperation, } from './on-video-track-handler';
|
|
4
15
|
export { WebCodecsVideoDecoder, createVideoDecoder } from './video-decoder';
|
|
5
16
|
export { WebCodecsVideoEncoder, createVideoEncoder } from './video-encoder';
|
package/dist/index.js
CHANGED
|
@@ -1,12 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createVideoEncoder = exports.createVideoDecoder = exports.convertMedia = exports.createAudioEncoder = exports.createAudioDecoder = void 0;
|
|
3
|
+
exports.createVideoEncoder = exports.createVideoDecoder = exports.getDefaultVideoCodec = exports.getDefaultAudioCodec = exports.defaultOnVideoTrackHandler = exports.defaultOnAudioTrackHandler = exports.convertMedia = exports.getAvailableVideoCodecs = exports.getAvailableContainers = exports.getAvailableAudioCodecs = exports.canReencodeVideoTrack = exports.canReencodeAudioTrack = exports.canCopyVideoTrack = exports.canCopyAudioTrack = exports.createAudioEncoder = exports.createAudioDecoder = void 0;
|
|
4
4
|
var audio_decoder_1 = require("./audio-decoder");
|
|
5
5
|
Object.defineProperty(exports, "createAudioDecoder", { enumerable: true, get: function () { return audio_decoder_1.createAudioDecoder; } });
|
|
6
6
|
var audio_encoder_1 = require("./audio-encoder");
|
|
7
7
|
Object.defineProperty(exports, "createAudioEncoder", { enumerable: true, get: function () { return audio_encoder_1.createAudioEncoder; } });
|
|
8
|
+
var can_copy_audio_track_1 = require("./can-copy-audio-track");
|
|
9
|
+
Object.defineProperty(exports, "canCopyAudioTrack", { enumerable: true, get: function () { return can_copy_audio_track_1.canCopyAudioTrack; } });
|
|
10
|
+
var can_copy_video_track_1 = require("./can-copy-video-track");
|
|
11
|
+
Object.defineProperty(exports, "canCopyVideoTrack", { enumerable: true, get: function () { return can_copy_video_track_1.canCopyVideoTrack; } });
|
|
12
|
+
var can_reencode_audio_track_1 = require("./can-reencode-audio-track");
|
|
13
|
+
Object.defineProperty(exports, "canReencodeAudioTrack", { enumerable: true, get: function () { return can_reencode_audio_track_1.canReencodeAudioTrack; } });
|
|
14
|
+
var can_reencode_video_track_1 = require("./can-reencode-video-track");
|
|
15
|
+
Object.defineProperty(exports, "canReencodeVideoTrack", { enumerable: true, get: function () { return can_reencode_video_track_1.canReencodeVideoTrack; } });
|
|
16
|
+
var codec_id_1 = require("./codec-id");
|
|
17
|
+
Object.defineProperty(exports, "getAvailableAudioCodecs", { enumerable: true, get: function () { return codec_id_1.getAvailableAudioCodecs; } });
|
|
18
|
+
Object.defineProperty(exports, "getAvailableContainers", { enumerable: true, get: function () { return codec_id_1.getAvailableContainers; } });
|
|
19
|
+
Object.defineProperty(exports, "getAvailableVideoCodecs", { enumerable: true, get: function () { return codec_id_1.getAvailableVideoCodecs; } });
|
|
8
20
|
var convert_media_1 = require("./convert-media");
|
|
9
21
|
Object.defineProperty(exports, "convertMedia", { enumerable: true, get: function () { return convert_media_1.convertMedia; } });
|
|
22
|
+
var default_on_audio_track_handler_1 = require("./default-on-audio-track-handler");
|
|
23
|
+
Object.defineProperty(exports, "defaultOnAudioTrackHandler", { enumerable: true, get: function () { return default_on_audio_track_handler_1.defaultOnAudioTrackHandler; } });
|
|
24
|
+
var default_on_video_track_handler_1 = require("./default-on-video-track-handler");
|
|
25
|
+
Object.defineProperty(exports, "defaultOnVideoTrackHandler", { enumerable: true, get: function () { return default_on_video_track_handler_1.defaultOnVideoTrackHandler; } });
|
|
26
|
+
var get_default_audio_codec_1 = require("./get-default-audio-codec");
|
|
27
|
+
Object.defineProperty(exports, "getDefaultAudioCodec", { enumerable: true, get: function () { return get_default_audio_codec_1.getDefaultAudioCodec; } });
|
|
28
|
+
var get_default_video_codec_1 = require("./get-default-video-codec");
|
|
29
|
+
Object.defineProperty(exports, "getDefaultVideoCodec", { enumerable: true, get: function () { return get_default_video_codec_1.getDefaultVideoCodec; } });
|
|
10
30
|
var video_decoder_1 = require("./video-decoder");
|
|
11
31
|
Object.defineProperty(exports, "createVideoDecoder", { enumerable: true, get: function () { return video_decoder_1.createVideoDecoder; } });
|
|
12
32
|
var video_encoder_1 = require("./video-encoder");
|
|
@@ -17,11 +17,11 @@ const makeIoSynchronizer = (logLevel, label) => {
|
|
|
17
17
|
let unprocessed = 0;
|
|
18
18
|
const getUnprocessed = () => unprocessed;
|
|
19
19
|
const getUnemittedItems = () => {
|
|
20
|
-
inputs = inputs.filter((input) => input > lastOutput);
|
|
20
|
+
inputs = inputs.filter((input) => Math.floor(input) > Math.floor(lastOutput));
|
|
21
21
|
return inputs.length;
|
|
22
22
|
};
|
|
23
23
|
const getUnemittedKeyframes = () => {
|
|
24
|
-
keyframes = keyframes.filter((keyframe) => keyframe > lastOutput);
|
|
24
|
+
keyframes = keyframes.filter((keyframe) => Math.floor(keyframe) > Math.floor(lastOutput));
|
|
25
25
|
return keyframes.length;
|
|
26
26
|
};
|
|
27
27
|
const printState = (prefix) => {
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { AudioTrack, LogLevel } from '@remotion/media-parser';
|
|
2
|
+
import type { ConvertMediaAudioCodec, ConvertMediaContainer } from './codec-id';
|
|
3
|
+
export type AudioOperation = {
|
|
4
|
+
type: 'reencode';
|
|
5
|
+
bitrate: number;
|
|
6
|
+
audioCodec: ConvertMediaAudioCodec;
|
|
7
|
+
} | {
|
|
8
|
+
type: 'copy';
|
|
9
|
+
} | {
|
|
10
|
+
type: 'fail';
|
|
11
|
+
} | {
|
|
12
|
+
type: 'drop';
|
|
13
|
+
};
|
|
14
|
+
export type ConvertMediaOnAudioTrackHandler = (options: {
|
|
15
|
+
track: AudioTrack;
|
|
16
|
+
defaultAudioCodec: ConvertMediaAudioCodec | null;
|
|
17
|
+
logLevel: LogLevel;
|
|
18
|
+
container: ConvertMediaContainer;
|
|
19
|
+
}) => AudioOperation | Promise<AudioOperation>;
|
package/dist/on-audio-track.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import type { LogLevel, MediaFn, OnAudioTrack } from '@remotion/media-parser';
|
|
2
|
-
import type { ConvertMediaAudioCodec } from './codec-id';
|
|
2
|
+
import type { ConvertMediaAudioCodec, ConvertMediaContainer } from './codec-id';
|
|
3
3
|
import type { ConvertMediaState } from './convert-media';
|
|
4
4
|
import Error from './error-cause';
|
|
5
|
-
import type {
|
|
6
|
-
export declare const makeAudioTrackHandler: ({ state, audioCodec, convertMediaState, controller, abortConversion, onMediaStateUpdate, onAudioTrack,
|
|
5
|
+
import type { ConvertMediaOnAudioTrackHandler } from './on-audio-track-handler';
|
|
6
|
+
export declare const makeAudioTrackHandler: ({ state, defaultAudioCodec: audioCodec, convertMediaState, controller, abortConversion, onMediaStateUpdate, onAudioTrack, logLevel, container, }: {
|
|
7
7
|
state: MediaFn;
|
|
8
|
-
|
|
8
|
+
defaultAudioCodec: ConvertMediaAudioCodec | null;
|
|
9
9
|
convertMediaState: ConvertMediaState;
|
|
10
10
|
controller: AbortController;
|
|
11
11
|
abortConversion: (errCause: Error) => void;
|
|
12
12
|
onMediaStateUpdate: null | ((state: ConvertMediaState) => void);
|
|
13
|
-
onAudioTrack:
|
|
14
|
-
bitrate: number;
|
|
13
|
+
onAudioTrack: ConvertMediaOnAudioTrackHandler | null;
|
|
15
14
|
logLevel: LogLevel;
|
|
15
|
+
container: ConvertMediaContainer;
|
|
16
16
|
}) => OnAudioTrack;
|
package/dist/on-audio-track.js
CHANGED
|
@@ -8,45 +8,57 @@ const audio_decoder_1 = require("./audio-decoder");
|
|
|
8
8
|
const audio_decoder_config_1 = require("./audio-decoder-config");
|
|
9
9
|
const audio_encoder_1 = require("./audio-encoder");
|
|
10
10
|
const audio_encoder_config_1 = require("./audio-encoder-config");
|
|
11
|
+
const convert_encoded_chunk_1 = require("./convert-encoded-chunk");
|
|
12
|
+
const default_on_audio_track_handler_1 = require("./default-on-audio-track-handler");
|
|
11
13
|
const error_cause_1 = __importDefault(require("./error-cause"));
|
|
12
|
-
const
|
|
13
|
-
const makeAudioTrackHandler = ({ state, audioCodec, convertMediaState, controller, abortConversion, onMediaStateUpdate, onAudioTrack,
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
numberOfChannels: track.numberOfChannels,
|
|
17
|
-
sampleRate: track.sampleRate,
|
|
18
|
-
bitrate,
|
|
19
|
-
});
|
|
20
|
-
const audioDecoderConfig = await (0, audio_decoder_config_1.getAudioDecoderConfig)({
|
|
21
|
-
codec: track.codec,
|
|
22
|
-
numberOfChannels: track.numberOfChannels,
|
|
23
|
-
sampleRate: track.sampleRate,
|
|
24
|
-
description: track.description,
|
|
25
|
-
});
|
|
26
|
-
const audioOperation = await (0, resolve_audio_action_1.resolveAudioAction)({
|
|
27
|
-
audioDecoderConfig,
|
|
28
|
-
audioEncoderConfig,
|
|
29
|
-
audioCodec,
|
|
14
|
+
const log_1 = require("./log");
|
|
15
|
+
const makeAudioTrackHandler = ({ state, defaultAudioCodec: audioCodec, convertMediaState, controller, abortConversion, onMediaStateUpdate, onAudioTrack, logLevel, container, }) => async (track) => {
|
|
16
|
+
const audioOperation = await (onAudioTrack !== null && onAudioTrack !== void 0 ? onAudioTrack : default_on_audio_track_handler_1.defaultOnAudioTrackHandler)({
|
|
17
|
+
defaultAudioCodec: audioCodec,
|
|
30
18
|
track,
|
|
31
|
-
|
|
19
|
+
logLevel,
|
|
20
|
+
container,
|
|
32
21
|
});
|
|
33
|
-
if (audioOperation === 'drop') {
|
|
22
|
+
if (audioOperation.type === 'drop') {
|
|
34
23
|
return null;
|
|
35
24
|
}
|
|
36
|
-
if (audioOperation === '
|
|
25
|
+
if (audioOperation.type === 'fail') {
|
|
26
|
+
throw new error_cause_1.default(`Audio track with ID ${track.trackId} could resolved with {"type": "fail"}. This could mean that this audio track could neither be copied to the output container or re-encoded. You have the option to drop the track instead of failing it: https://remotion.dev/docs/webcodecs/track-transformation`);
|
|
27
|
+
}
|
|
28
|
+
if (audioOperation.type === 'copy') {
|
|
37
29
|
const addedTrack = await state.addTrack({
|
|
38
30
|
type: 'audio',
|
|
39
|
-
codec:
|
|
31
|
+
codec: track.codecWithoutConfig,
|
|
40
32
|
numberOfChannels: track.numberOfChannels,
|
|
41
33
|
sampleRate: track.sampleRate,
|
|
42
34
|
codecPrivate: track.codecPrivate,
|
|
35
|
+
timescale: track.timescale,
|
|
43
36
|
});
|
|
37
|
+
log_1.Log.verbose(logLevel, `Copying audio track ${track.trackId} as track ${addedTrack.trackNumber}. Timescale = ${track.timescale}, codec = ${track.codecWithoutConfig} (${track.codec}) `);
|
|
44
38
|
return async (audioSample) => {
|
|
45
|
-
await state.addSample(
|
|
39
|
+
await state.addSample({
|
|
40
|
+
chunk: audioSample,
|
|
41
|
+
trackNumber: addedTrack.trackNumber,
|
|
42
|
+
isVideo: false,
|
|
43
|
+
timescale: track.timescale,
|
|
44
|
+
codecPrivate: track.codecPrivate,
|
|
45
|
+
});
|
|
46
46
|
convertMediaState.encodedAudioFrames++;
|
|
47
47
|
onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate({ ...convertMediaState });
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
|
+
const audioEncoderConfig = await (0, audio_encoder_config_1.getAudioEncoderConfig)({
|
|
51
|
+
numberOfChannels: track.numberOfChannels,
|
|
52
|
+
sampleRate: track.sampleRate,
|
|
53
|
+
codec: audioOperation.audioCodec,
|
|
54
|
+
bitrate: audioOperation.bitrate,
|
|
55
|
+
});
|
|
56
|
+
const audioDecoderConfig = await (0, audio_decoder_config_1.getAudioDecoderConfig)({
|
|
57
|
+
codec: track.codec,
|
|
58
|
+
numberOfChannels: track.numberOfChannels,
|
|
59
|
+
sampleRate: track.sampleRate,
|
|
60
|
+
description: track.description,
|
|
61
|
+
});
|
|
50
62
|
if (!audioEncoderConfig) {
|
|
51
63
|
abortConversion(new error_cause_1.default(`Could not configure audio encoder of track ${track.trackId}`));
|
|
52
64
|
return null;
|
|
@@ -55,16 +67,31 @@ const makeAudioTrackHandler = ({ state, audioCodec, convertMediaState, controlle
|
|
|
55
67
|
abortConversion(new error_cause_1.default(`Could not configure audio decoder of track ${track.trackId}`));
|
|
56
68
|
return null;
|
|
57
69
|
}
|
|
70
|
+
const codecPrivate = audioOperation.audioCodec === 'aac' ? new Uint8Array([17, 144]) : null;
|
|
58
71
|
const { trackNumber } = await state.addTrack({
|
|
59
72
|
type: 'audio',
|
|
60
|
-
codec: audioCodec,
|
|
73
|
+
codec: audioOperation.audioCodec,
|
|
61
74
|
numberOfChannels: track.numberOfChannels,
|
|
62
75
|
sampleRate: track.sampleRate,
|
|
63
|
-
codecPrivate
|
|
76
|
+
codecPrivate,
|
|
77
|
+
timescale: track.timescale,
|
|
64
78
|
});
|
|
65
79
|
const audioEncoder = (0, audio_encoder_1.createAudioEncoder)({
|
|
80
|
+
// This is weird 😵💫
|
|
81
|
+
// Chrome completely ignores the sample rate and uses it's own
|
|
82
|
+
// We cannot determine it here because it depends on the system
|
|
83
|
+
// sample rate. Unhardcode then declare it later once we know.
|
|
84
|
+
onNewAudioSampleRate: (sampleRate) => {
|
|
85
|
+
state.updateTrackSampleRate({ sampleRate, trackNumber });
|
|
86
|
+
},
|
|
66
87
|
onChunk: async (chunk) => {
|
|
67
|
-
await state.addSample(
|
|
88
|
+
await state.addSample({
|
|
89
|
+
chunk: (0, convert_encoded_chunk_1.convertEncodedChunk)(chunk, trackNumber),
|
|
90
|
+
trackNumber,
|
|
91
|
+
isVideo: false,
|
|
92
|
+
timescale: track.timescale,
|
|
93
|
+
codecPrivate,
|
|
94
|
+
});
|
|
68
95
|
convertMediaState.encodedAudioFrames++;
|
|
69
96
|
onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate({ ...convertMediaState });
|
|
70
97
|
},
|
|
@@ -73,7 +100,7 @@ const makeAudioTrackHandler = ({ state, audioCodec, convertMediaState, controlle
|
|
|
73
100
|
cause: err,
|
|
74
101
|
}));
|
|
75
102
|
},
|
|
76
|
-
codec: audioCodec,
|
|
103
|
+
codec: audioOperation.audioCodec,
|
|
77
104
|
signal: controller.signal,
|
|
78
105
|
config: audioEncoderConfig,
|
|
79
106
|
logLevel,
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { VideoTrack } from '@remotion/media-parser';
|
|
2
|
+
import type { ConvertMediaOnMediaStateUpdate, ConvertMediaOnVideoFrame, ConvertMediaState } from './convert-media';
|
|
3
|
+
import type { WebCodecsVideoEncoder } from './video-encoder';
|
|
4
|
+
export declare const onFrame: ({ frame, onVideoFrame, videoEncoder, onMediaStateUpdate, track, convertMediaState, }: {
|
|
5
|
+
frame: VideoFrame;
|
|
6
|
+
onVideoFrame: ConvertMediaOnVideoFrame | null;
|
|
7
|
+
videoEncoder: WebCodecsVideoEncoder;
|
|
8
|
+
onMediaStateUpdate: ConvertMediaOnMediaStateUpdate | null;
|
|
9
|
+
track: VideoTrack;
|
|
10
|
+
convertMediaState: ConvertMediaState;
|
|
11
|
+
}) => Promise<void>;
|
package/dist/on-frame.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.onFrame = void 0;
|
|
4
|
+
const onFrame = async ({ frame, onVideoFrame, videoEncoder, onMediaStateUpdate, track, convertMediaState, }) => {
|
|
5
|
+
const newFrame = onVideoFrame ? await onVideoFrame({ frame, track }) : frame;
|
|
6
|
+
if (newFrame.codedHeight !== frame.codedHeight) {
|
|
7
|
+
throw new Error(`Returned VideoFrame of track ${track.trackId} has different codedHeight (${newFrame.codedHeight}) than the input frame (${frame.codedHeight})`);
|
|
8
|
+
}
|
|
9
|
+
if (newFrame.codedWidth !== frame.codedWidth) {
|
|
10
|
+
throw new Error(`Returned VideoFrame of track ${track.trackId} has different codedWidth (${newFrame.codedWidth}) than the input frame (${frame.codedWidth})`);
|
|
11
|
+
}
|
|
12
|
+
if (newFrame.displayWidth !== frame.displayWidth) {
|
|
13
|
+
throw new Error(`Returned VideoFrame of track ${track.trackId} has different displayWidth (${newFrame.displayWidth}) than the input frame (${newFrame.displayHeight})`);
|
|
14
|
+
}
|
|
15
|
+
if (newFrame.displayHeight !== frame.displayHeight) {
|
|
16
|
+
throw new Error(`Returned VideoFrame of track ${track.trackId} has different displayHeight (${newFrame.displayHeight}) than the input frame (${newFrame.displayHeight})`);
|
|
17
|
+
}
|
|
18
|
+
if (newFrame.timestamp !== frame.timestamp) {
|
|
19
|
+
throw new Error(`Returned VideoFrame of track ${track.trackId} has different timestamp (${newFrame.timestamp}) than the input frame (${newFrame.timestamp}). When calling new VideoFrame(), pass {timestamp: frame.timestamp} as second argument`);
|
|
20
|
+
}
|
|
21
|
+
if (newFrame.duration !== frame.duration) {
|
|
22
|
+
throw new Error(`Returned VideoFrame of track ${track.trackId} has different duration (${newFrame.duration}) than the input frame (${newFrame.duration}). When calling new VideoFrame(), pass {duration: frame.duration} as second argument`);
|
|
23
|
+
}
|
|
24
|
+
await videoEncoder.encodeFrame(newFrame, newFrame.timestamp);
|
|
25
|
+
convertMediaState.decodedVideoFrames++;
|
|
26
|
+
onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate({ ...convertMediaState });
|
|
27
|
+
newFrame.close();
|
|
28
|
+
if (frame !== newFrame) {
|
|
29
|
+
frame.close();
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
exports.onFrame = onFrame;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { LogLevel, VideoTrack } from '@remotion/media-parser';
|
|
2
|
+
import type { ConvertMediaContainer, ConvertMediaVideoCodec } from './codec-id';
|
|
3
|
+
export type VideoOperation = {
|
|
4
|
+
type: 'reencode';
|
|
5
|
+
videoCodec: ConvertMediaVideoCodec;
|
|
6
|
+
} | {
|
|
7
|
+
type: 'copy';
|
|
8
|
+
} | {
|
|
9
|
+
type: 'drop';
|
|
10
|
+
} | {
|
|
11
|
+
type: 'fail';
|
|
12
|
+
};
|
|
13
|
+
export type ConvertMediaOnVideoTrackHandler = (options: {
|
|
14
|
+
defaultVideoCodec: ConvertMediaVideoCodec | null;
|
|
15
|
+
track: VideoTrack;
|
|
16
|
+
logLevel: LogLevel;
|
|
17
|
+
container: ConvertMediaContainer;
|
|
18
|
+
}) => VideoOperation | Promise<VideoOperation>;
|
package/dist/on-video-track.d.ts
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import type { LogLevel, MediaFn, OnVideoTrack
|
|
2
|
-
import type { ConvertMediaVideoCodec } from './codec-id';
|
|
3
|
-
import type { ConvertMediaState } from './convert-media';
|
|
1
|
+
import type { LogLevel, MediaFn, OnVideoTrack } from '@remotion/media-parser';
|
|
2
|
+
import type { ConvertMediaContainer, ConvertMediaVideoCodec } from './codec-id';
|
|
3
|
+
import type { ConvertMediaOnMediaStateUpdate, ConvertMediaOnVideoFrame, ConvertMediaState } from './convert-media';
|
|
4
4
|
import Error from './error-cause';
|
|
5
|
-
import type {
|
|
6
|
-
export declare const makeVideoTrackHandler: ({ state, onVideoFrame, onMediaStateUpdate, abortConversion, convertMediaState, controller,
|
|
5
|
+
import type { ConvertMediaOnVideoTrackHandler } from './on-video-track-handler';
|
|
6
|
+
export declare const makeVideoTrackHandler: ({ state, onVideoFrame, onMediaStateUpdate, abortConversion, convertMediaState, controller, defaultVideoCodec, onVideoTrack, logLevel, container, }: {
|
|
7
7
|
state: MediaFn;
|
|
8
|
-
onVideoFrame: null |
|
|
9
|
-
onMediaStateUpdate: null |
|
|
8
|
+
onVideoFrame: null | ConvertMediaOnVideoFrame;
|
|
9
|
+
onMediaStateUpdate: null | ConvertMediaOnMediaStateUpdate;
|
|
10
10
|
abortConversion: (errCause: Error) => void;
|
|
11
11
|
convertMediaState: ConvertMediaState;
|
|
12
12
|
controller: AbortController;
|
|
13
|
-
|
|
14
|
-
onVideoTrack:
|
|
13
|
+
defaultVideoCodec: ConvertMediaVideoCodec | null;
|
|
14
|
+
onVideoTrack: ConvertMediaOnVideoTrackHandler | null;
|
|
15
15
|
logLevel: LogLevel;
|
|
16
|
+
container: ConvertMediaContainer;
|
|
16
17
|
}) => OnVideoTrack;
|
package/dist/on-video-track.js
CHANGED
|
@@ -4,33 +4,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.makeVideoTrackHandler = void 0;
|
|
7
|
+
const arraybuffer_to_uint8_array_1 = require("./arraybuffer-to-uint8-array");
|
|
8
|
+
const convert_encoded_chunk_1 = require("./convert-encoded-chunk");
|
|
9
|
+
const default_on_video_track_handler_1 = require("./default-on-video-track-handler");
|
|
7
10
|
const error_cause_1 = __importDefault(require("./error-cause"));
|
|
8
|
-
const
|
|
11
|
+
const log_1 = require("./log");
|
|
12
|
+
const on_frame_1 = require("./on-frame");
|
|
9
13
|
const video_decoder_1 = require("./video-decoder");
|
|
10
14
|
const video_decoder_config_1 = require("./video-decoder-config");
|
|
11
15
|
const video_encoder_1 = require("./video-encoder");
|
|
12
16
|
const video_encoder_config_1 = require("./video-encoder-config");
|
|
13
|
-
const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortConversion, convertMediaState, controller,
|
|
17
|
+
const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortConversion, convertMediaState, controller, defaultVideoCodec, onVideoTrack, logLevel, container, }) => async (track) => {
|
|
14
18
|
if (controller.signal.aborted) {
|
|
15
19
|
throw new error_cause_1.default('Aborted');
|
|
16
20
|
}
|
|
17
|
-
const
|
|
18
|
-
codec: videoCodec === 'vp9' ? 'vp09.00.10.08' : videoCodec,
|
|
19
|
-
height: track.displayAspectHeight,
|
|
20
|
-
width: track.displayAspectWidth,
|
|
21
|
-
});
|
|
22
|
-
const videoDecoderConfig = await (0, video_decoder_config_1.getVideoDecoderConfigWithHardwareAcceleration)(track);
|
|
23
|
-
const videoOperation = await (0, resolve_video_action_1.resolveVideoAction)({
|
|
24
|
-
videoDecoderConfig,
|
|
25
|
-
videoEncoderConfig,
|
|
21
|
+
const videoOperation = await (onVideoTrack !== null && onVideoTrack !== void 0 ? onVideoTrack : default_on_video_track_handler_1.defaultOnVideoTrackHandler)({
|
|
26
22
|
track,
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
defaultVideoCodec,
|
|
24
|
+
logLevel,
|
|
25
|
+
container,
|
|
29
26
|
});
|
|
30
|
-
if (videoOperation === 'drop') {
|
|
27
|
+
if (videoOperation.type === 'drop') {
|
|
31
28
|
return null;
|
|
32
29
|
}
|
|
33
|
-
if (videoOperation === '
|
|
30
|
+
if (videoOperation.type === 'fail') {
|
|
31
|
+
throw new error_cause_1.default(`Video track with ID ${track.trackId} could resolved with {"type": "fail"}. This could mean that this video track could neither be copied to the output container or re-encoded. You have the option to drop the track instead of failing it: https://remotion.dev/docs/webcodecs/track-transformation`);
|
|
32
|
+
}
|
|
33
|
+
if (videoOperation.type === 'copy') {
|
|
34
|
+
log_1.Log.verbose(logLevel, `Copying video track with codec ${track.codec} and timescale ${track.timescale}`);
|
|
34
35
|
const videoTrack = await state.addTrack({
|
|
35
36
|
type: 'video',
|
|
36
37
|
color: track.color,
|
|
@@ -38,13 +39,27 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
|
|
|
38
39
|
height: track.codedHeight,
|
|
39
40
|
codec: track.codecWithoutConfig,
|
|
40
41
|
codecPrivate: track.codecPrivate,
|
|
42
|
+
timescale: track.timescale,
|
|
41
43
|
});
|
|
42
44
|
return async (sample) => {
|
|
43
|
-
await state.addSample(
|
|
45
|
+
await state.addSample({
|
|
46
|
+
chunk: sample,
|
|
47
|
+
trackNumber: videoTrack.trackNumber,
|
|
48
|
+
isVideo: true,
|
|
49
|
+
timescale: track.timescale,
|
|
50
|
+
codecPrivate: track.codecPrivate,
|
|
51
|
+
});
|
|
44
52
|
convertMediaState.decodedVideoFrames++;
|
|
45
53
|
onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate({ ...convertMediaState });
|
|
46
54
|
};
|
|
47
55
|
}
|
|
56
|
+
const videoEncoderConfig = await (0, video_encoder_config_1.getVideoEncoderConfig)({
|
|
57
|
+
codec: videoOperation.videoCodec,
|
|
58
|
+
height: track.displayAspectHeight,
|
|
59
|
+
width: track.displayAspectWidth,
|
|
60
|
+
fps: track.fps,
|
|
61
|
+
});
|
|
62
|
+
const videoDecoderConfig = await (0, video_decoder_config_1.getVideoDecoderConfigWithHardwareAcceleration)(track);
|
|
48
63
|
if (videoEncoderConfig === null) {
|
|
49
64
|
abortConversion(new error_cause_1.default(`Could not configure video encoder of track ${track.trackId}`));
|
|
50
65
|
return null;
|
|
@@ -58,12 +73,21 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
|
|
|
58
73
|
color: track.color,
|
|
59
74
|
width: track.codedWidth,
|
|
60
75
|
height: track.codedHeight,
|
|
61
|
-
codec: videoCodec,
|
|
76
|
+
codec: videoOperation.videoCodec,
|
|
62
77
|
codecPrivate: null,
|
|
78
|
+
timescale: track.timescale,
|
|
63
79
|
});
|
|
80
|
+
log_1.Log.verbose(logLevel, `Created new video track with ID ${trackNumber}, codec ${videoOperation.videoCodec} and timescale ${track.timescale}`);
|
|
64
81
|
const videoEncoder = (0, video_encoder_1.createVideoEncoder)({
|
|
65
|
-
onChunk: async (chunk) => {
|
|
66
|
-
|
|
82
|
+
onChunk: async (chunk, metadata) => {
|
|
83
|
+
var _a, _b;
|
|
84
|
+
await state.addSample({
|
|
85
|
+
chunk: (0, convert_encoded_chunk_1.convertEncodedChunk)(chunk, trackNumber),
|
|
86
|
+
trackNumber,
|
|
87
|
+
isVideo: true,
|
|
88
|
+
timescale: track.timescale,
|
|
89
|
+
codecPrivate: (0, arraybuffer_to_uint8_array_1.arrayBufferToUint8Array)(((_b = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.decoderConfig) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : null)),
|
|
90
|
+
});
|
|
67
91
|
convertMediaState.encodedVideoFrames++;
|
|
68
92
|
onMediaStateUpdate === null || onMediaStateUpdate === void 0 ? void 0 : onMediaStateUpdate({ ...convertMediaState });
|
|
69
93
|
},
|
|
@@ -79,11 +103,14 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
|
|
|
79
103
|
const videoDecoder = (0, video_decoder_1.createVideoDecoder)({
|
|
80
104
|
config: videoDecoderConfig,
|
|
81
105
|
onFrame: async (frame) => {
|
|
82
|
-
await (
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
106
|
+
await (0, on_frame_1.onFrame)({
|
|
107
|
+
convertMediaState,
|
|
108
|
+
frame,
|
|
109
|
+
onMediaStateUpdate,
|
|
110
|
+
track,
|
|
111
|
+
videoEncoder,
|
|
112
|
+
onVideoFrame,
|
|
113
|
+
});
|
|
87
114
|
},
|
|
88
115
|
onError: (err) => {
|
|
89
116
|
abortConversion(new error_cause_1.default(`Video decoder of track ${track.trackId} failed (see .cause of this error)`, {
|
|
@@ -94,10 +121,13 @@ const makeVideoTrackHandler = ({ state, onVideoFrame, onMediaStateUpdate, abortC
|
|
|
94
121
|
logLevel,
|
|
95
122
|
});
|
|
96
123
|
state.addWaitForFinishPromise(async () => {
|
|
124
|
+
log_1.Log.verbose(logLevel, 'Waiting for video decoder to finish');
|
|
97
125
|
await videoDecoder.waitForFinish();
|
|
98
|
-
await videoEncoder.waitForFinish();
|
|
99
126
|
videoDecoder.close();
|
|
127
|
+
log_1.Log.verbose(logLevel, 'Video decoder finished. Waiting for encoder to finish');
|
|
128
|
+
await videoEncoder.waitForFinish();
|
|
100
129
|
videoEncoder.close();
|
|
130
|
+
log_1.Log.verbose(logLevel, 'Encoder finished');
|
|
101
131
|
});
|
|
102
132
|
return async (chunk) => {
|
|
103
133
|
await videoDecoder.processSample(chunk);
|
package/dist/video-decoder.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AudioOrVideoSample, LogLevel } from '@remotion/media-parser';
|
|
2
2
|
export type WebCodecsVideoDecoder = {
|
|
3
|
-
processSample: (videoSample:
|
|
3
|
+
processSample: (videoSample: AudioOrVideoSample) => Promise<void>;
|
|
4
4
|
waitForFinish: () => Promise<void>;
|
|
5
5
|
close: () => void;
|
|
6
6
|
flush: () => Promise<void>;
|
package/dist/video-decoder.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createVideoDecoder = void 0;
|
|
4
4
|
const io_synchronizer_1 = require("./io-manager/io-synchronizer");
|
|
5
|
+
const log_1 = require("./log");
|
|
5
6
|
const createVideoDecoder = ({ onFrame, onError, signal, config, logLevel, }) => {
|
|
6
7
|
const ioSynchronizer = (0, io_synchronizer_1.makeIoSynchronizer)(logLevel, 'Video decoder');
|
|
7
8
|
let outputQueue = Promise.resolve();
|
|
@@ -69,9 +70,13 @@ const createVideoDecoder = ({ onFrame, onError, signal, config, logLevel, }) =>
|
|
|
69
70
|
},
|
|
70
71
|
waitForFinish: async () => {
|
|
71
72
|
await videoDecoder.flush();
|
|
73
|
+
log_1.Log.verbose(logLevel, 'Flushed video decoder');
|
|
72
74
|
await ioSynchronizer.waitForFinish();
|
|
75
|
+
log_1.Log.verbose(logLevel, 'IO synchro finished');
|
|
73
76
|
await outputQueue;
|
|
77
|
+
log_1.Log.verbose(logLevel, 'Output queue finished');
|
|
74
78
|
await inputQueue;
|
|
79
|
+
log_1.Log.verbose(logLevel, 'Input queue finished');
|
|
75
80
|
},
|
|
76
81
|
close,
|
|
77
82
|
flush: async () => {
|
|
@@ -1 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
import type { ConvertMediaVideoCodec } from './codec-id';
|
|
2
|
+
export declare const getVideoEncoderConfig: ({ codec, height, width, fps, }: {
|
|
3
|
+
width: number;
|
|
4
|
+
height: number;
|
|
5
|
+
codec: ConvertMediaVideoCodec;
|
|
6
|
+
fps: number | null;
|
|
7
|
+
}) => Promise<VideoEncoderConfig | null>;
|
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getVideoEncoderConfig = void 0;
|
|
4
|
-
const
|
|
4
|
+
const choose_correct_avc1_profile_1 = require("./choose-correct-avc1-profile");
|
|
5
|
+
const getVideoEncoderConfig = async ({ codec, height, width, fps, }) => {
|
|
5
6
|
if (typeof VideoEncoder === 'undefined') {
|
|
6
7
|
return null;
|
|
7
8
|
}
|
|
9
|
+
const config = {
|
|
10
|
+
codec: codec === 'h264'
|
|
11
|
+
? (0, choose_correct_avc1_profile_1.chooseCorrectAvc1Profile)({ fps, height, width })
|
|
12
|
+
: codec === 'vp9'
|
|
13
|
+
? 'vp09.00.10.08'
|
|
14
|
+
: codec,
|
|
15
|
+
height,
|
|
16
|
+
width,
|
|
17
|
+
};
|
|
8
18
|
const hardware = {
|
|
9
19
|
...config,
|
|
10
20
|
hardwareAcceleration: 'prefer-hardware',
|
package/dist/video-encoder.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { LogLevel } from '@remotion/media-parser';
|
|
2
2
|
export type WebCodecsVideoEncoder = {
|
|
3
|
-
encodeFrame: (videoFrame: VideoFrame) => Promise<void>;
|
|
3
|
+
encodeFrame: (videoFrame: VideoFrame, timestamp: number) => Promise<void>;
|
|
4
4
|
waitForFinish: () => Promise<void>;
|
|
5
5
|
close: () => void;
|
|
6
6
|
flush: () => Promise<void>;
|
|
7
7
|
};
|
|
8
8
|
export declare const createVideoEncoder: ({ onChunk, onError, signal, config, logLevel, }: {
|
|
9
|
-
onChunk: (chunk: EncodedVideoChunk) => Promise<void>;
|
|
9
|
+
onChunk: (chunk: EncodedVideoChunk, metadata: EncodedVideoChunkMetadata | null) => Promise<void>;
|
|
10
10
|
onError: (error: DOMException) => void;
|
|
11
11
|
signal: AbortSignal;
|
|
12
12
|
config: VideoEncoderConfig;
|
package/dist/video-encoder.js
CHANGED
|
@@ -12,18 +12,16 @@ const createVideoEncoder = ({ onChunk, onError, signal, config, logLevel, }) =>
|
|
|
12
12
|
error(error) {
|
|
13
13
|
onError(error);
|
|
14
14
|
},
|
|
15
|
-
output(chunk) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
const timestamp = chunk.timestamp + chunk.duration;
|
|
15
|
+
output(chunk, metadata) {
|
|
16
|
+
var _a;
|
|
17
|
+
const timestamp = chunk.timestamp + ((_a = chunk.duration) !== null && _a !== void 0 ? _a : 0);
|
|
20
18
|
ioSynchronizer.onOutput(timestamp);
|
|
21
19
|
outputQueue = outputQueue
|
|
22
20
|
.then(() => {
|
|
23
21
|
if (signal.aborted) {
|
|
24
22
|
return;
|
|
25
23
|
}
|
|
26
|
-
return onChunk(chunk);
|
|
24
|
+
return onChunk(chunk, metadata !== null && metadata !== void 0 ? metadata : null);
|
|
27
25
|
})
|
|
28
26
|
.then(() => {
|
|
29
27
|
ioSynchronizer.onProcessed();
|