Skip to content

Commit b006168

Browse files
committed
* Move pure JS functions to pre.js
* Add read timeout & fetch timeout (30s) * Improve aborting behavior * Add support for retrying after read() failures * Trigger AbortSignal before aborting ffmpeg process - to help ensure fetches are aborted
1 parent 38ec752 commit b006168

File tree

10 files changed

+439
-476
lines changed

10 files changed

+439
-476
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EFLAGS=\
2626
-s MODULARIZE=1 \
2727
-s STACK_SIZE=1048576 \
2828
-s ASYNCIFY \
29-
-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js']" \
29+
-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js', 'jsfetch_read', 'jsfetch_read_js']" \
3030
-s INITIAL_MEMORY=25165824 \
3131
-s ALLOW_MEMORY_GROWTH=1
3232

Makefile.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EFLAGS=\
2626
-s MODULARIZE=1 \
2727
-s STACK_SIZE=1048576 \
2828
-s ASYNCIFY \
29-
-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js']" \
29+
-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js', 'jsfetch_read', 'jsfetch_read_js']" \
3030
-s INITIAL_MEMORY=25165824 \
3131
-s ALLOW_MEMORY_GROWTH=1
3232

dist/libav-6.5.7.1-h264-aac-mp3.wasm.mjs

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.
440 Bytes
Binary file not shown.

ffmpeg-7.1/fftools/ffmpeg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,8 +973,8 @@ static int64_t getmaxrss(void)
973973

974974
void ffmpeg_interrupt(void);
975975
void ffmpeg_interrupt() {
976-
received_nb_signals++;
977976
jsfetch_abort_request();
977+
received_nb_signals++;
978978
}
979979

980980
int ffmpeg_main(int argc, char **argv);

0 commit comments

Comments
 (0)