@revideo/2d 0.4.7-alpha.1024 → 0.4.7-alpha.1028
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/editor/editor/tsconfig.build.tsbuildinfo +1 -1
- package/editor/index.js +151 -380
- package/editor/index.js.map +1 -1
- package/lib/code/CodeCursor.d.ts +74 -74
- package/lib/code/CodeDiffer.d.ts +16 -21
- package/lib/code/CodeDiffer.js +41 -39
- package/lib/code/CodeFragment.d.ts +8 -16
- package/lib/code/CodeFragment.js +36 -36
- package/lib/code/CodeHighlighter.d.ts +59 -59
- package/lib/code/CodeHighlighter.js +1 -1
- package/lib/code/CodeMetrics.d.ts +8 -12
- package/lib/code/CodeMetrics.js +24 -26
- package/lib/code/CodeRange.d.ts +5 -21
- package/lib/code/CodeRange.js +124 -131
- package/lib/code/CodeScope.d.ts +8 -18
- package/lib/code/CodeSelection.d.ts +4 -9
- package/lib/code/CodeSelection.js +8 -8
- package/lib/code/CodeSignal.d.ts +47 -74
- package/lib/code/CodeTokenizer.d.ts +1 -1
- package/lib/code/CodeTokenizer.js +41 -41
- package/lib/code/DefaultHighlightStyle.d.ts +2 -2
- package/lib/code/DefaultHighlightStyle.js +96 -96
- package/lib/code/LezerHighlighter.d.ts +19 -21
- package/lib/code/diff.d.ts +9 -12
- package/lib/code/diff.js +205 -218
- package/lib/code/extractRange.d.ts +4 -7
- package/lib/code/extractRange.js +71 -79
- package/lib/code/index.d.ts +1 -1
- package/lib/code/index.js +1 -1
- package/lib/components/Audio.d.ts +11 -11
- package/lib/components/Bezier.d.ts +18 -18
- package/lib/components/Circle.d.ts +90 -95
- package/lib/components/Code.d.ts +211 -244
- package/lib/components/CodeBlock.d.ts +1 -1
- package/lib/components/CubicBezier.d.ts +36 -36
- package/lib/components/Curve.d.ts +198 -208
- package/lib/components/Grid.d.ts +42 -47
- package/lib/components/Icon.d.ts +50 -55
- package/lib/components/Img.d.ts +79 -86
- package/lib/components/Knot.d.ts +78 -97
- package/lib/components/Latex.d.ts +12 -12
- package/lib/components/Layout.d.ts +413 -455
- package/lib/components/Line.d.ts +49 -61
- package/lib/components/Media.d.ts +37 -37
- package/lib/components/Node.d.ts +1 -1
- package/lib/components/Path.d.ts +1 -1
- package/lib/components/Polygon.d.ts +55 -60
- package/lib/components/QuadBezier.d.ts +29 -29
- package/lib/components/Ray.d.ts +28 -28
- package/lib/components/Rect.d.ts +108 -115
- package/lib/components/SVG.d.ts +1 -1
- package/lib/components/Shape.d.ts +1 -1
- package/lib/components/Spline.d.ts +40 -46
- package/lib/components/Txt.d.ts +44 -55
- package/lib/components/TxtLeaf.d.ts +16 -20
- package/lib/components/Video.d.ts +1 -0
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +7 -2
- package/lib/components/View2D.d.ts +22 -22
- package/lib/components/index.d.ts +1 -1
- package/lib/components/types.d.ts +9 -22
- package/lib/curves/ArcSegment.d.ts +24 -36
- package/lib/curves/CircleSegment.d.ts +16 -26
- package/lib/curves/CubicBezierSegment.d.ts +13 -18
- package/lib/curves/CurveDrawingInfo.d.ts +9 -9
- package/lib/curves/CurvePoint.d.ts +13 -13
- package/lib/curves/CurveProfile.d.ts +5 -5
- package/lib/curves/CurveProfile.js +1 -1
- package/lib/curves/KnotInfo.d.ts +8 -8
- package/lib/curves/LineSegment.d.ts +14 -19
- package/lib/curves/Polynomial.d.ts +110 -110
- package/lib/curves/Polynomial2D.d.ts +20 -20
- package/lib/curves/PolynomialSegment.d.ts +37 -42
- package/lib/curves/QuadBezierSegment.d.ts +12 -12
- package/lib/curves/Segment.d.ts +7 -12
- package/lib/curves/UniformPolynomialCurveSampler.d.ts +34 -34
- package/lib/curves/createCurveProfileLerp.d.ts +6 -17
- package/lib/curves/getBezierSplineProfile.d.ts +4 -8
- package/lib/curves/getCircleProfile.d.ts +4 -10
- package/lib/curves/getPathProfile.d.ts +2 -2
- package/lib/curves/getPointAtDistance.d.ts +4 -7
- package/lib/curves/getPolylineProfile.d.ts +4 -8
- package/lib/curves/getRectProfile.d.ts +4 -9
- package/lib/curves/index.d.ts +1 -1
- package/lib/curves/index.js +1 -1
- package/lib/decorators/canvasStyleSignal.d.ts +3 -3
- package/lib/decorators/colorSignal.d.ts +1 -1
- package/lib/decorators/compound.d.ts +2 -4
- package/lib/decorators/computed.d.ts +1 -1
- package/lib/decorators/defaultStyle.d.ts +2 -5
- package/lib/decorators/filtersSignal.d.ts +8 -28
- package/lib/decorators/index.d.ts +1 -1
- package/lib/decorators/index.js +1 -1
- package/lib/decorators/initializers.d.ts +2 -5
- package/lib/decorators/initializers.js +19 -18
- package/lib/decorators/nodeName.d.ts +1 -1
- package/lib/decorators/nodeName.js +4 -4
- package/lib/decorators/signal.d.ts +20 -40
- package/lib/decorators/spacingSignal.d.ts +1 -1
- package/lib/decorators/vector2Signal.d.ts +7 -13
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/jsx-dev-runtime.d.ts +3 -3
- package/lib/jsx-dev-runtime.js +3 -3
- package/lib/jsx-runtime.d.ts +9 -19
- package/lib/jsx-runtime.js +18 -18
- package/lib/partials/Filter.d.ts +16 -24
- package/lib/partials/Gradient.d.ts +24 -30
- package/lib/partials/Pattern.d.ts +9 -14
- package/lib/partials/ShaderConfig.d.ts +74 -81
- package/lib/partials/index.d.ts +1 -1
- package/lib/partials/index.js +1 -1
- package/lib/partials/types.d.ts +6 -19
- package/lib/scenes/Scene2D.d.ts +23 -42
- package/lib/scenes/index.d.ts +1 -1
- package/lib/scenes/index.js +1 -1
- package/lib/scenes/makeScene2D.d.ts +5 -7
- package/lib/scenes/useScene2D.d.ts +2 -2
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/diff.d.ts +18 -25
- package/lib/utils/diff.js +87 -84
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/is.d.ts +2 -4
- package/lib/utils/is.js +2 -2
- package/lib/utils/makeSignalExtensions.d.ts +4 -11
- package/lib/utils/video/mp4-parser-manager.d.ts +1 -0
- package/lib/utils/video/mp4-parser-manager.d.ts.map +1 -1
- package/lib/utils/video/mp4-parser-manager.js +21 -4
- package/lib/utils/video/parser/index.d.ts +2 -0
- package/lib/utils/video/parser/index.d.ts.map +1 -0
- package/lib/utils/video/parser/index.js +2 -0
- package/lib/utils/video/parser/parser.d.ts +21 -0
- package/lib/utils/video/parser/parser.d.ts.map +1 -0
- package/lib/utils/video/parser/parser.js +168 -0
- package/lib/utils/video/parser/sampler.d.ts +16 -0
- package/lib/utils/video/parser/sampler.d.ts.map +1 -0
- package/lib/utils/video/parser/sampler.js +56 -0
- package/lib/utils/video/parser/segment.d.ts +44 -0
- package/lib/utils/video/parser/segment.d.ts.map +1 -0
- package/lib/utils/video/parser/segment.js +161 -0
- package/lib/utils/video/parser/sink.d.ts +9 -0
- package/lib/utils/video/parser/sink.d.ts.map +1 -0
- package/lib/utils/video/parser/sink.js +22 -0
- package/lib/utils/video/parser/utils.d.ts +10 -0
- package/lib/utils/video/parser/utils.d.ts.map +1 -0
- package/lib/utils/video/parser/utils.js +22 -0
- package/package.json +4 -4
- package/src/lib/components/Video.ts +7 -1
- package/src/lib/utils/video/mp4-parser-manager.ts +24 -5
- package/src/lib/utils/video/parser/index.ts +1 -0
- package/src/lib/utils/video/parser/parser.ts +256 -0
- package/src/lib/utils/video/parser/sampler.ts +72 -0
- package/src/lib/utils/video/parser/segment.ts +211 -0
- package/src/lib/utils/video/parser/sink.ts +29 -0
- package/src/lib/utils/video/parser/utils.ts +31 -0
- package/lib/components/HlsVideo.d.ts +0 -62
- package/lib/components/HlsVideo.d.ts.map +0 -1
- package/lib/components/HlsVideo.js +0 -169
- package/lib/tsconfig.tsbuildinfo +0 -1
- package/lib/utils/video/mp4-parser.d.ts +0 -63
- package/lib/utils/video/mp4-parser.d.ts.map +0 -1
- package/lib/utils/video/mp4-parser.js +0 -264
- package/src/lib/utils/video/mp4-parser.ts +0 -340
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import {Segment} from './segment';
|
|
2
|
+
|
|
3
|
+
export class FrameSampler {
|
|
4
|
+
private framesRequested = 0;
|
|
5
|
+
private lastFrame?: VideoFrame;
|
|
6
|
+
|
|
7
|
+
public constructor(
|
|
8
|
+
private segment: Segment,
|
|
9
|
+
private sourceFps: number,
|
|
10
|
+
private targetFps: number,
|
|
11
|
+
private sum: number = 0,
|
|
12
|
+
) {}
|
|
13
|
+
|
|
14
|
+
public async getNextFrame() {
|
|
15
|
+
const samplingRate = this.sourceFps / this.targetFps;
|
|
16
|
+
this.sum += samplingRate;
|
|
17
|
+
this.framesRequested += 1;
|
|
18
|
+
|
|
19
|
+
// Return last frame if we haven't progressed enough to get a new frame.
|
|
20
|
+
if (this.sum < 1 && this.lastFrame) {
|
|
21
|
+
return this.lastFrame;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
// Burn frames if we have too many.
|
|
25
|
+
while (this.sum >= 2) {
|
|
26
|
+
// Burn frame
|
|
27
|
+
const frame = await this.segment.getNextFrame();
|
|
28
|
+
|
|
29
|
+
// If there are no more frames, return
|
|
30
|
+
if (!frame) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
frame.close();
|
|
35
|
+
this.sum -= 1;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
// Get a new frame.
|
|
39
|
+
if (this.sum >= 1 || !this.lastFrame) {
|
|
40
|
+
this.sum -= 1;
|
|
41
|
+
const frame = await this.segment.getNextFrame();
|
|
42
|
+
|
|
43
|
+
// If there are no more frames, return
|
|
44
|
+
if (!frame) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
this.lastFrame?.close();
|
|
49
|
+
this.lastFrame = frame;
|
|
50
|
+
return frame;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// One of the three if statements above is always true.
|
|
54
|
+
throw new Error('Unreachable code');
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
public getLastFrame() {
|
|
58
|
+
return this.lastFrame;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
public getSum() {
|
|
62
|
+
return this.sum;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
public getSegment() {
|
|
66
|
+
return this.segment;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
public getTime(framesToSubtract: number) {
|
|
70
|
+
return (this.framesRequested - framesToSubtract) / this.targetFps;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
@@ -0,0 +1,211 @@
|
|
|
1
|
+
import {MP4FileSink} from './sink';
|
|
2
|
+
import {Edit} from './utils';
|
|
3
|
+
|
|
4
|
+
export class Segment {
|
|
5
|
+
private done: boolean = false;
|
|
6
|
+
private abortController = new AbortController();
|
|
7
|
+
private uri: string;
|
|
8
|
+
|
|
9
|
+
private file: any;
|
|
10
|
+
private edit: Edit;
|
|
11
|
+
|
|
12
|
+
private responseFinished: boolean = false;
|
|
13
|
+
private decoder: VideoDecoder;
|
|
14
|
+
|
|
15
|
+
private framesProcessed = 0;
|
|
16
|
+
private startTime: number;
|
|
17
|
+
private framesDue = 0;
|
|
18
|
+
private frameBuffer: VideoFrame[] = [];
|
|
19
|
+
|
|
20
|
+
private readMore: () => Promise<void> = async () => {};
|
|
21
|
+
|
|
22
|
+
public constructor(
|
|
23
|
+
uri: string,
|
|
24
|
+
file: any,
|
|
25
|
+
edits: Edit[],
|
|
26
|
+
currentSegment: number,
|
|
27
|
+
startTime: number = 0,
|
|
28
|
+
) {
|
|
29
|
+
this.uri = uri;
|
|
30
|
+
|
|
31
|
+
this.file = file;
|
|
32
|
+
this.file.onSamples = this.onSamples.bind(this);
|
|
33
|
+
this.edit = edits[currentSegment];
|
|
34
|
+
|
|
35
|
+
this.startTime = startTime;
|
|
36
|
+
|
|
37
|
+
// Check how many frames we skipped because of the startTime and add them to the frames processed.
|
|
38
|
+
const framesSkipped = Math.floor(this.startTime * this.edit.fps);
|
|
39
|
+
this.framesProcessed += framesSkipped;
|
|
40
|
+
|
|
41
|
+
this.decoder = new VideoDecoder({
|
|
42
|
+
output: this.onFrame.bind(this),
|
|
43
|
+
error(e) {
|
|
44
|
+
console.error(e);
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
public async start(decoderConfig: VideoDecoderConfig) {
|
|
50
|
+
this.decoder.configure(decoderConfig);
|
|
51
|
+
const videoTrack = this.file.getInfo().videoTracks[0];
|
|
52
|
+
const trak = this.file.getTrackById(videoTrack.id);
|
|
53
|
+
|
|
54
|
+
const mediaTimeInTimescale = this.edit.mediaTime;
|
|
55
|
+
const startTimeInTimescale = this.startTime * videoTrack.timescale;
|
|
56
|
+
const seekTimeInTimescale = mediaTimeInTimescale + startTimeInTimescale;
|
|
57
|
+
|
|
58
|
+
const seekTimeInSec = seekTimeInTimescale / videoTrack.timescale;
|
|
59
|
+
const seekInfo = this.file.seekTrack(seekTimeInSec, true, trak);
|
|
60
|
+
this.readMore = await this.startStreamingAtOffset(
|
|
61
|
+
this.file,
|
|
62
|
+
this.uri,
|
|
63
|
+
seekInfo.offset,
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Starts streaming the video at the given URI from the given offset.
|
|
69
|
+
* @param file - MP4Box file. Needs to be created and configured before calling this function.
|
|
70
|
+
* @param uri - URI of the video file.
|
|
71
|
+
* @param offset - Offset to start streaming from.
|
|
72
|
+
* @returns - A function to read more data from the response.
|
|
73
|
+
*/
|
|
74
|
+
private async startStreamingAtOffset(file: any, uri: string, offset: number) {
|
|
75
|
+
return fetch(uri, {
|
|
76
|
+
headers: {
|
|
77
|
+
/* eslint-disable-next-line @typescript-eslint/naming-convention */
|
|
78
|
+
Range: `bytes=${offset}-`,
|
|
79
|
+
},
|
|
80
|
+
signal: this.abortController.signal,
|
|
81
|
+
}).then(async response => {
|
|
82
|
+
if (!response.body) {
|
|
83
|
+
throw new Error('Response body is null');
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const reader = response.body.getReader();
|
|
87
|
+
const sink = new MP4FileSink(file, () => {}, offset);
|
|
88
|
+
|
|
89
|
+
return async () => {
|
|
90
|
+
return reader.read().then(({done, value}) => {
|
|
91
|
+
// Request is done.
|
|
92
|
+
if (done) {
|
|
93
|
+
this.responseFinished = true;
|
|
94
|
+
this.abortController.abort();
|
|
95
|
+
this.decoder.flush();
|
|
96
|
+
sink.close();
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
sink.write(value);
|
|
101
|
+
});
|
|
102
|
+
};
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* Called when samples are available on the MP4 file.
|
|
108
|
+
* Sends chunks to the decoder.
|
|
109
|
+
*/
|
|
110
|
+
private onSamples(_unused1: any, _unused2: any, samples: any) {
|
|
111
|
+
for (const sample of samples) {
|
|
112
|
+
const chunk = new EncodedVideoChunk({
|
|
113
|
+
type: sample.is_sync ? 'key' : 'delta',
|
|
114
|
+
timestamp: (1e6 * sample.cts) / sample.timescale,
|
|
115
|
+
duration: (1e6 * sample.duration) / sample.timescale,
|
|
116
|
+
data: sample.data,
|
|
117
|
+
});
|
|
118
|
+
this.framesDue++;
|
|
119
|
+
this.decoder.decode(chunk);
|
|
120
|
+
|
|
121
|
+
const videoTrack = this.file.getInfo().videoTracks[0];
|
|
122
|
+
const trak = this.file.getTrackById(videoTrack.id);
|
|
123
|
+
this.file.releaseSample(trak, sample.number);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* Called when the decoder has a frame ready.
|
|
129
|
+
* Pushes the frame to the buffer so it can be consumed.
|
|
130
|
+
*/
|
|
131
|
+
private onFrame(frame: VideoFrame) {
|
|
132
|
+
this.framesDue--;
|
|
133
|
+
|
|
134
|
+
// If the frame comes before the seek time, close it.
|
|
135
|
+
const mediaTimeInSec =
|
|
136
|
+
this.edit.mediaTime / this.file.getInfo().videoTracks[0].timescale;
|
|
137
|
+
const seekTimeInSec = this.startTime + mediaTimeInSec;
|
|
138
|
+
const frameTimeInSec = frame.timestamp / 1e6;
|
|
139
|
+
if (frameTimeInSec < seekTimeInSec) {
|
|
140
|
+
frame.close();
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// Check if we are past the segment duration.
|
|
145
|
+
const segmentDurationInSec =
|
|
146
|
+
this.edit.segmentDuration /
|
|
147
|
+
this.file.getInfo().videoTracks[0].movie_timescale;
|
|
148
|
+
const segmentEndTime = mediaTimeInSec + segmentDurationInSec;
|
|
149
|
+
if (frameTimeInSec > segmentEndTime) {
|
|
150
|
+
frame.close();
|
|
151
|
+
this.done = true;
|
|
152
|
+
this.decoder.flush();
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
this.frameBuffer.push(frame);
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
private async populateBuffer() {
|
|
160
|
+
// Fetch more frames if we don't have any.
|
|
161
|
+
while (this.frameBuffer.length === 0 && !this.responseFinished) {
|
|
162
|
+
await this.readMore();
|
|
163
|
+
await new Promise(res => setTimeout(res, 0));
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
// Wait for decoder if there are frames due.
|
|
167
|
+
if (this.frameBuffer.length === 0 && this.framesDue > 0) {
|
|
168
|
+
let maxIterations = 1000;
|
|
169
|
+
while (this.frameBuffer.length === 0) {
|
|
170
|
+
await new Promise(res => setTimeout(res, 10));
|
|
171
|
+
maxIterations--;
|
|
172
|
+
|
|
173
|
+
if (this.done) {
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
if (maxIterations === 0) {
|
|
178
|
+
throw new Error(
|
|
179
|
+
`Timed out while waiting for VideoDecoder to produce a frame. Frames due: ${this.framesDue}`,
|
|
180
|
+
);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
public async getNextFrame() {
|
|
187
|
+
await this.populateBuffer();
|
|
188
|
+
const frame = this.frameBuffer.shift();
|
|
189
|
+
if (frame) {
|
|
190
|
+
this.framesProcessed++;
|
|
191
|
+
}
|
|
192
|
+
return frame;
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
/**
|
|
196
|
+
* Called when we are done with the extractor.
|
|
197
|
+
*/
|
|
198
|
+
public close() {
|
|
199
|
+
this.abortController.abort();
|
|
200
|
+
this.frameBuffer.forEach(frame => frame.close());
|
|
201
|
+
this.decoder.close();
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
public getFramesProcessed() {
|
|
205
|
+
return this.framesProcessed;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
public getStartTime() {
|
|
209
|
+
return this.startTime;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
// Wraps an MP4Box File as a WritableStream underlying sink.
|
|
2
|
+
export class MP4FileSink {
|
|
3
|
+
private setStatus;
|
|
4
|
+
private file;
|
|
5
|
+
private offset;
|
|
6
|
+
|
|
7
|
+
public constructor(file: any, setStatus: any, offset: number = 0) {
|
|
8
|
+
this.file = file;
|
|
9
|
+
this.setStatus = setStatus;
|
|
10
|
+
this.offset = offset;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
public write(chunk: any) {
|
|
14
|
+
const buffer = new ArrayBuffer(chunk.byteLength);
|
|
15
|
+
new Uint8Array(buffer).set(chunk);
|
|
16
|
+
|
|
17
|
+
// Inform MP4Box where in the file this chunk is from.
|
|
18
|
+
(buffer as any).fileStart = this.offset;
|
|
19
|
+
this.offset += buffer.byteLength;
|
|
20
|
+
|
|
21
|
+
this.setStatus('fetch', (this.offset / 1024 ** 2).toFixed(1) + ' MiB');
|
|
22
|
+
this.file.appendBuffer(buffer);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
public close() {
|
|
26
|
+
this.setStatus('fetch', 'Done');
|
|
27
|
+
this.file.flush();
|
|
28
|
+
}
|
|
29
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import {DataStream} from 'mp4box';
|
|
2
|
+
|
|
3
|
+
export function description(file: any, track: any) {
|
|
4
|
+
const trak = file.getTrackById(track.id);
|
|
5
|
+
for (const entry of trak.mdia.minf.stbl.stsd.entries) {
|
|
6
|
+
const box = entry.avcC || entry.hvcC || entry.vpcC || entry.av1C;
|
|
7
|
+
if (box) {
|
|
8
|
+
const stream = new DataStream(undefined, 0, DataStream.BIG_ENDIAN);
|
|
9
|
+
box.write(stream);
|
|
10
|
+
return new Uint8Array(stream.buffer, 8); // Remove the box header.
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
throw new Error('avcC, hvcC, vpcC, or av1C box not found');
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface Edit {
|
|
17
|
+
mediaTime: number;
|
|
18
|
+
segmentDuration: number;
|
|
19
|
+
mediaRateInteger: number;
|
|
20
|
+
mediaRateFraction: number;
|
|
21
|
+
fps: number;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export function mp4BoxEditToEdit(edit: any): Omit<Edit, 'fps'> {
|
|
25
|
+
return {
|
|
26
|
+
mediaTime: edit.media_time,
|
|
27
|
+
segmentDuration: edit.segment_duration,
|
|
28
|
+
mediaRateInteger: edit.media_rate_integer,
|
|
29
|
+
mediaRateFraction: edit.media_rate_fraction,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import {SerializedVector2, SignalValue, SimpleSignal} from '@revideo/core';
|
|
2
|
-
import {DesiredLength} from '../partials';
|
|
3
|
-
import {Media, MediaProps} from './Media';
|
|
4
|
-
export interface HlsVideoProps extends MediaProps {
|
|
5
|
-
/**
|
|
6
|
-
* {@inheritDoc Video.alpha}
|
|
7
|
-
*/
|
|
8
|
-
alpha?: SignalValue<number>;
|
|
9
|
-
/**
|
|
10
|
-
* {@inheritDoc Video.smoothing}
|
|
11
|
-
*/
|
|
12
|
-
smoothing?: SignalValue<boolean>;
|
|
13
|
-
/**
|
|
14
|
-
* {@inheritDoc Video.png}
|
|
15
|
-
*/
|
|
16
|
-
png?: SignalValue<boolean>;
|
|
17
|
-
}
|
|
18
|
-
export declare class HlsVideo extends Media {
|
|
19
|
-
/**
|
|
20
|
-
* The alpha value of this video.
|
|
21
|
-
*
|
|
22
|
-
* @remarks
|
|
23
|
-
* Unlike opacity, the alpha value affects only the video itself, leaving the
|
|
24
|
-
* fill, stroke, and children intact.
|
|
25
|
-
*/
|
|
26
|
-
readonly alpha: SimpleSignal<number, this>;
|
|
27
|
-
/**
|
|
28
|
-
* Whether the video should be smoothed.
|
|
29
|
-
*
|
|
30
|
-
* @remarks
|
|
31
|
-
* When disabled, the video will be scaled using the nearest neighbor
|
|
32
|
-
* interpolation with no smoothing. The resulting video will appear pixelated.
|
|
33
|
-
*
|
|
34
|
-
* @defaultValue true
|
|
35
|
-
*/
|
|
36
|
-
readonly smoothing: SimpleSignal<boolean, this>;
|
|
37
|
-
/**
|
|
38
|
-
* Whether the video frames should be extracted as PNGs. Uses JPEGs when
|
|
39
|
-
* set to false.
|
|
40
|
-
*
|
|
41
|
-
* @remarks
|
|
42
|
-
* PNGs have better image quality and support transparency, but they make
|
|
43
|
-
* rendering slower.
|
|
44
|
-
*
|
|
45
|
-
* @defaultValue false
|
|
46
|
-
*/
|
|
47
|
-
readonly png: SimpleSignal<boolean, this>;
|
|
48
|
-
private static readonly pool;
|
|
49
|
-
constructor(props: HlsVideoProps);
|
|
50
|
-
protected desiredSize(): SerializedVector2<DesiredLength>;
|
|
51
|
-
protected mediaElement(): HTMLVideoElement;
|
|
52
|
-
protected seekedMedia(): HTMLVideoElement;
|
|
53
|
-
protected fastSeekedMedia(): HTMLVideoElement;
|
|
54
|
-
private video;
|
|
55
|
-
protected seekedVideo(): HTMLVideoElement;
|
|
56
|
-
protected fastSeekedVideo(): HTMLVideoElement;
|
|
57
|
-
protected lastFrame: HTMLImageElement | null;
|
|
58
|
-
protected seekFunction(): Promise<HTMLVideoElement>;
|
|
59
|
-
protected draw(context: CanvasRenderingContext2D): Promise<void>;
|
|
60
|
-
protected applyFlex(): void;
|
|
61
|
-
}
|
|
62
|
-
//# sourceMappingURL=HlsVideo.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"HlsVideo.d.ts","sourceRoot":"","sources":["../../src/lib/components/HlsVideo.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,iBAAiB,EACjB,WAAW,EACX,YAAY,EAEb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,SAAS,CAAC;AAG1C,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C;;OAEG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5B;;OAEG;IACH,SAAS,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC;;OAEG;IACH,GAAG,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAC5B;AAED,qBACa,QAAS,SAAQ,KAAK;IACjC;;;;;;OAMG;IACH,SAEwB,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE1D;;;;;;;;OAQG;IACH,SAEwB,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE/D;;;;;;;;;OASG;IACH,SAEwB,GAAG,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAwC;gBAEjD,KAAK,EAAE,aAAa;cAIpB,WAAW,IAAI,iBAAiB,CAAC,aAAa,CAAC;IAalE,SAAS,CAAC,YAAY,IAAI,gBAAgB;IAI1C,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;IAK7C,OAAO,CAAC,KAAK;IAsCb,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAoBzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;IA+B7C,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAAQ;cAGpC,YAAY;cAgBH,IAAI,CAAC,OAAO,EAAE,wBAAwB;cAwB5C,SAAS;CAO7B"}
|
|
@@ -1,169 +0,0 @@
|
|
|
1
|
-
var __decorate =
|
|
2
|
-
(this && this.__decorate) ||
|
|
3
|
-
function (decorators, target, key, desc) {
|
|
4
|
-
var c = arguments.length,
|
|
5
|
-
r =
|
|
6
|
-
c < 3
|
|
7
|
-
? target
|
|
8
|
-
: desc === null
|
|
9
|
-
? (desc = Object.getOwnPropertyDescriptor(target, key))
|
|
10
|
-
: desc,
|
|
11
|
-
d;
|
|
12
|
-
if (typeof Reflect === 'object' && typeof Reflect.decorate === 'function')
|
|
13
|
-
r = Reflect.decorate(decorators, target, key, desc);
|
|
14
|
-
else
|
|
15
|
-
for (var i = decorators.length - 1; i >= 0; i--)
|
|
16
|
-
if ((d = decorators[i]))
|
|
17
|
-
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
-
};
|
|
20
|
-
var HlsVideo_1;
|
|
21
|
-
import {BBox, DependencyContext, PlaybackState, viaProxy} from '@revideo/core';
|
|
22
|
-
import Hls from 'hls.js';
|
|
23
|
-
import {computed, initial, nodeName, signal} from '../decorators';
|
|
24
|
-
import {drawImage} from '../utils';
|
|
25
|
-
import {Media} from './Media';
|
|
26
|
-
let HlsVideo = (HlsVideo_1 = class HlsVideo extends Media {
|
|
27
|
-
constructor(props) {
|
|
28
|
-
super(props);
|
|
29
|
-
this.lastFrame = null;
|
|
30
|
-
}
|
|
31
|
-
desiredSize() {
|
|
32
|
-
const custom = super.desiredSize();
|
|
33
|
-
if (custom.x === null && custom.y === null) {
|
|
34
|
-
const image = this.video();
|
|
35
|
-
return {
|
|
36
|
-
x: image.videoWidth,
|
|
37
|
-
y: image.videoHeight,
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
return custom;
|
|
41
|
-
}
|
|
42
|
-
mediaElement() {
|
|
43
|
-
return this.video();
|
|
44
|
-
}
|
|
45
|
-
seekedMedia() {
|
|
46
|
-
return this.seekedVideo();
|
|
47
|
-
}
|
|
48
|
-
fastSeekedMedia() {
|
|
49
|
-
return this.fastSeekedVideo();
|
|
50
|
-
}
|
|
51
|
-
video() {
|
|
52
|
-
const src = viaProxy(this.fullSource());
|
|
53
|
-
const key = `${this.key}/${src}`;
|
|
54
|
-
let video = HlsVideo_1.pool[key];
|
|
55
|
-
if (!video) {
|
|
56
|
-
video = document.createElement('video');
|
|
57
|
-
video.crossOrigin = 'anonymous';
|
|
58
|
-
const hls = new Hls();
|
|
59
|
-
hls.loadSource(src);
|
|
60
|
-
hls.attachMedia(video);
|
|
61
|
-
HlsVideo_1.pool[key] = video;
|
|
62
|
-
}
|
|
63
|
-
if (video.readyState < 2) {
|
|
64
|
-
DependencyContext.collectPromise(
|
|
65
|
-
new Promise(resolve => {
|
|
66
|
-
const onCanPlay = () => {
|
|
67
|
-
resolve();
|
|
68
|
-
video.removeEventListener('canplay', onCanPlay);
|
|
69
|
-
};
|
|
70
|
-
const onError = () => {
|
|
71
|
-
const reason = this.getErrorReason(video.error?.code);
|
|
72
|
-
console.log(`ERROR: Error loading video: ${src}, ${reason}`);
|
|
73
|
-
};
|
|
74
|
-
video.addEventListener('canplay', onCanPlay);
|
|
75
|
-
video.addEventListener('error', onError);
|
|
76
|
-
}),
|
|
77
|
-
);
|
|
78
|
-
}
|
|
79
|
-
return video;
|
|
80
|
-
}
|
|
81
|
-
seekedVideo() {
|
|
82
|
-
const video = this.video();
|
|
83
|
-
const time = this.clampTime(this.time());
|
|
84
|
-
video.playbackRate = this.playbackRate();
|
|
85
|
-
if (!video.paused) {
|
|
86
|
-
video.pause();
|
|
87
|
-
}
|
|
88
|
-
if (this.lastTime === time) {
|
|
89
|
-
return video;
|
|
90
|
-
}
|
|
91
|
-
this.setCurrentTime(time);
|
|
92
|
-
return video;
|
|
93
|
-
}
|
|
94
|
-
fastSeekedVideo() {
|
|
95
|
-
const video = this.video();
|
|
96
|
-
const time = this.clampTime(this.time());
|
|
97
|
-
video.playbackRate = this.playbackRate();
|
|
98
|
-
if (this.lastTime === time) {
|
|
99
|
-
return video;
|
|
100
|
-
}
|
|
101
|
-
const playing =
|
|
102
|
-
this.playing() && time < video.duration && video.playbackRate > 0;
|
|
103
|
-
if (playing) {
|
|
104
|
-
if (video.paused) {
|
|
105
|
-
DependencyContext.collectPromise(video.play());
|
|
106
|
-
}
|
|
107
|
-
} else {
|
|
108
|
-
if (!video.paused) {
|
|
109
|
-
video.pause();
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
if (Math.abs(video.currentTime - time) > 0.3) {
|
|
113
|
-
this.setCurrentTime(time);
|
|
114
|
-
} else if (!playing) {
|
|
115
|
-
video.currentTime = time;
|
|
116
|
-
}
|
|
117
|
-
return video;
|
|
118
|
-
}
|
|
119
|
-
async seekFunction() {
|
|
120
|
-
const playbackState = this.view().playbackState();
|
|
121
|
-
if (
|
|
122
|
-
playbackState === PlaybackState.Playing ||
|
|
123
|
-
playbackState === PlaybackState.Presenting
|
|
124
|
-
) {
|
|
125
|
-
return this.fastSeekedVideo();
|
|
126
|
-
}
|
|
127
|
-
if (playbackState === PlaybackState.Rendering) {
|
|
128
|
-
return this.seekedVideo();
|
|
129
|
-
}
|
|
130
|
-
return this.seekedVideo();
|
|
131
|
-
}
|
|
132
|
-
async draw(context) {
|
|
133
|
-
this.drawShape(context);
|
|
134
|
-
const alpha = this.alpha();
|
|
135
|
-
if (alpha > 0) {
|
|
136
|
-
const video = await this.seekFunction();
|
|
137
|
-
const box = BBox.fromSizeCentered(this.computedSize());
|
|
138
|
-
context.save();
|
|
139
|
-
context.clip(this.getPath());
|
|
140
|
-
if (alpha < 1) {
|
|
141
|
-
context.globalAlpha *= alpha;
|
|
142
|
-
}
|
|
143
|
-
context.imageSmoothingEnabled = this.smoothing();
|
|
144
|
-
drawImage(context, video, box);
|
|
145
|
-
context.restore();
|
|
146
|
-
}
|
|
147
|
-
if (this.clip()) {
|
|
148
|
-
context.clip(this.getPath());
|
|
149
|
-
}
|
|
150
|
-
await this.drawChildren(context);
|
|
151
|
-
}
|
|
152
|
-
applyFlex() {
|
|
153
|
-
super.applyFlex();
|
|
154
|
-
const video = this.video();
|
|
155
|
-
this.element.style.aspectRatio = (
|
|
156
|
-
this.ratio() ?? video.videoWidth / video.videoHeight
|
|
157
|
-
).toString();
|
|
158
|
-
}
|
|
159
|
-
});
|
|
160
|
-
HlsVideo.pool = {};
|
|
161
|
-
__decorate([initial(1), signal()], HlsVideo.prototype, 'alpha', void 0);
|
|
162
|
-
__decorate([initial(true), signal()], HlsVideo.prototype, 'smoothing', void 0);
|
|
163
|
-
__decorate([initial(true), signal()], HlsVideo.prototype, 'png', void 0);
|
|
164
|
-
__decorate([computed()], HlsVideo.prototype, 'video', null);
|
|
165
|
-
__decorate([computed()], HlsVideo.prototype, 'seekedVideo', null);
|
|
166
|
-
__decorate([computed()], HlsVideo.prototype, 'fastSeekedVideo', null);
|
|
167
|
-
HlsVideo = HlsVideo_1 = __decorate([nodeName('HlsVideo')], HlsVideo);
|
|
168
|
-
export {HlsVideo};
|
|
169
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGxzVmlkZW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvSGxzVmlkZW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLE9BQU8sRUFDSCxJQUFJLEVBQ0osaUJBQWlCLEVBQ2pCLGFBQWEsRUFJYixRQUFRLEdBQ1QsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUVsRSxPQUFPLEVBQUMsU0FBUyxFQUFDLE1BQU0sVUFBVSxDQUFDO0FBQ25DLE9BQU8sRUFBQyxLQUFLLEVBQWEsTUFBTSxTQUFTLENBQUM7QUFDMUMsT0FBTyxHQUFHLE1BQU0sUUFBUSxDQUFDO0FBa0JsQixJQUFNLFFBQVEsZ0JBQWQsTUFBTSxRQUFTLFNBQVEsS0FBSztJQXlDakMsWUFBbUIsS0FBb0I7UUFDckMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBc0hMLGNBQVMsR0FBNEIsSUFBSSxDQUFDO0lBckhwRCxDQUFDO0lBRWtCLFdBQVc7UUFDNUIsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ25DLElBQUksTUFBTSxDQUFDLENBQUMsS0FBSyxJQUFJLElBQUksTUFBTSxDQUFDLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztZQUMzQyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDM0IsT0FBTztnQkFDTCxDQUFDLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQ25CLENBQUMsRUFBRSxLQUFLLENBQUMsV0FBVzthQUNyQixDQUFDO1FBQ0osQ0FBQztRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7SUFFUyxZQUFZO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFUyxXQUFXO1FBQ25CLE9B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
|