From b84637801ae9e9cf330d91ce7e2e7734a7c6130c Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:38:13 +0000 Subject: [chore] update go ffmpreg to v0.6.0 (#3515) * pull in go-ffmpreg v0.6.0 * add code comment * grrr linter * set empty module name when calling ffmpeg / ffprobe --- internal/media/ffmpeg/ffmpeg.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'internal/media/ffmpeg/ffmpeg.go') diff --git a/internal/media/ffmpeg/ffmpeg.go b/internal/media/ffmpeg/ffmpeg.go index 0571c029a..b978201c1 100644 --- a/internal/media/ffmpeg/ffmpeg.go +++ b/internal/media/ffmpeg/ffmpeg.go @@ -21,6 +21,7 @@ package ffmpeg import ( "context" + "errors" "codeberg.org/gruf/go-ffmpreg/wasm" ) @@ -35,12 +36,25 @@ var ffmpegRunner runner // prepares the runner to only allow max given concurrent running instances. func InitFfmpeg(ctx context.Context, max int) error { ffmpegRunner.Init(max) - return compileFfmpeg(ctx) + return initWASM(ctx) } // Ffmpeg runs the given arguments with an instance of ffmpeg. func Ffmpeg(ctx context.Context, args Args) (uint32, error) { return ffmpegRunner.Run(ctx, func() (uint32, error) { - return wasm.Run(ctx, runtime, ffmpeg, args) + + // Load WASM rt and module. + ffmpreg := ffmpreg.Load() + if ffmpreg == nil { + return 0, errors.New("wasm not initialized") + } + + // Call into ffmpeg. + args.Name = "ffmpeg" + return wasm.Run(ctx, + ffmpreg.run, + ffmpreg.mod, + args, + ) }) } -- cgit v1.2.3