summaryrefslogtreecommitdiff
path: root/internal/media/ffmpeg/ffmpeg.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-11-06 13:38:13 +0000
committerLibravatar GitHub <noreply@github.com>2024-11-06 14:38:13 +0100
commitb84637801ae9e9cf330d91ce7e2e7734a7c6130c (patch)
treee7518f95e0a44506c24c298dd88c654c0a4bdae5 /internal/media/ffmpeg/ffmpeg.go
parent[bugfix] sets the max value placeholders to MaxInt32 instead of MaxInt (#3517) (diff)
downloadgotosocial-b84637801ae9e9cf330d91ce7e2e7734a7c6130c.tar.xz
[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
Diffstat (limited to 'internal/media/ffmpeg/ffmpeg.go')
-rw-r--r--internal/media/ffmpeg/ffmpeg.go18
1 files changed, 16 insertions, 2 deletions
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,
+ )
})
}