update go-ffmpreg to v0.2.3 (#3120)

go.mod

@@ -12,7 +12,7 @@ require (
 	codeberg.org/gruf/go-debug v1.3.0
 	codeberg.org/gruf/go-errors/v2 v2.3.2
 	codeberg.org/gruf/go-fastcopy v1.1.2
-	codeberg.org/gruf/go-ffmpreg v0.2.2
+	codeberg.org/gruf/go-ffmpreg v0.2.3
 	codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf
 	codeberg.org/gruf/go-kv v1.6.4
 	codeberg.org/gruf/go-list v0.0.0-20240425093752-494db03d641f

go.sum

@@ -52,8 +52,8 @@ codeberg.org/gruf/go-fastcopy v1.1.2 h1:YwmYXPsyOcRBxKEE2+w1bGAZfclHVaPijFsOVOcn
 codeberg.org/gruf/go-fastcopy v1.1.2/go.mod h1:GDDYR0Cnb3U/AIfGM3983V/L+GN+vuwVMvrmVABo21s=
 codeberg.org/gruf/go-fastpath/v2 v2.0.0 h1:iAS9GZahFhyWEH0KLhFEJR+txx1ZhMXxYzu2q5Qo9c0=
 codeberg.org/gruf/go-fastpath/v2 v2.0.0/go.mod h1:3pPqu5nZjpbRrOqvLyAK7puS1OfEtQvjd6342Cwz56Q=
-codeberg.org/gruf/go-ffmpreg v0.2.2 h1:K4I/7+BuzPLOVjL3hzTFdL8Z9wC0oRCK3xMKNVE86TE=
+codeberg.org/gruf/go-ffmpreg v0.2.3 h1:6nKpR4KzAhyWHe5E1YatqogZUZbmCmUjwv6qST/P1Ks=
-codeberg.org/gruf/go-ffmpreg v0.2.2/go.mod h1:oPMfBkOK7xmR/teT/dKW6SeMFpRos9ceR/OuUrxBfcQ=
+codeberg.org/gruf/go-ffmpreg v0.2.3/go.mod h1:oPMfBkOK7xmR/teT/dKW6SeMFpRos9ceR/OuUrxBfcQ=
 codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf h1:84s/ii8N6lYlskZjHH+DG6jyia8w2mXMZlRwFn8Gs3A=
 codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf/go.mod h1:zZAICsp5rY7+hxnws2V0ePrWxE0Z2Z/KXcN3p/RQCfk=
 codeberg.org/gruf/go-kv v1.6.4 h1:3NZiW8HVdBM3kpOiLb7XfRiihnzZWMAixdCznguhILk=

internal/media/ffmpeg/ffmpeg.go

@@ -21,11 +21,9 @@
 	"context"
 
 	ffmpeglib "codeberg.org/gruf/go-ffmpreg/embed/ffmpeg"
-	"codeberg.org/gruf/go-ffmpreg/util"
 	"codeberg.org/gruf/go-ffmpreg/wasm"
 
 	"github.com/tetratelabs/wazero"
-	"github.com/tetratelabs/wazero/api"
 	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
 )
 
@@ -60,13 +58,6 @@ func Ffmpeg(ctx context.Context, args wasm.Args) (uint32, error) {
 
 			// Prepare default "env" host module.
 			env := rt.NewHostModuleBuilder("env")
-			env = env.NewFunctionBuilder().
-				WithGoModuleFunction(
-					api.GoModuleFunc(util.Wasm_Tempnam),
-					[]api.ValueType{api.ValueTypeI32, api.ValueTypeI32},
-					[]api.ValueType{api.ValueTypeI32},
-				).
-				Export("tempnam")
 
 			// Instantiate "env" module in our runtime.
 			_, err := env.Instantiate(context.Background())

internal/media/ffmpeg/ffprobe.go

@@ -21,11 +21,9 @@
 	"context"
 
 	ffprobelib "codeberg.org/gruf/go-ffmpreg/embed/ffprobe"
-	"codeberg.org/gruf/go-ffmpreg/util"
 	"codeberg.org/gruf/go-ffmpreg/wasm"
 
 	"github.com/tetratelabs/wazero"
-	"github.com/tetratelabs/wazero/api"
 	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
 )
 
@@ -60,13 +58,6 @@ func Ffprobe(ctx context.Context, args wasm.Args) (uint32, error) {
 
 			// Prepare default "env" host module.
 			env := rt.NewHostModuleBuilder("env")
-			env = env.NewFunctionBuilder().
-				WithGoModuleFunction(
-					api.GoModuleFunc(util.Wasm_Tempnam),
-					[]api.ValueType{api.ValueTypeI32, api.ValueTypeI32},
-					[]api.ValueType{api.ValueTypeI32},
-				).
-				Export("tempnam")
 
 			// Instantiate "env" module in our runtime.
 			_, err := env.Instantiate(context.Background())

vendor/codeberg.org/gruf/go-ffmpreg/embed/ffmpeg/lib.go

@@ -5,7 +5,6 @@
 	"os"
 
 	"github.com/tetratelabs/wazero/api"
-	"github.com/tetratelabs/wazero/experimental"
 )
 
 func init() {
@@ -31,8 +30,7 @@ func init() {
 	api.CoreFeatureNonTrappingFloatToIntConversion |
 	api.CoreFeatureMutableGlobal |
 	api.CoreFeatureReferenceTypes |
-	api.CoreFeatureSignExtensionOps |
+	api.CoreFeatureSignExtensionOps
-	experimental.CoreFeaturesThreads
 
 //go:embed ffmpeg.wasm
 var B []byte

vendor/codeberg.org/gruf/go-ffmpreg/embed/ffprobe/lib.go

@@ -5,7 +5,6 @@
 	"os"
 
 	"github.com/tetratelabs/wazero/api"
-	"github.com/tetratelabs/wazero/experimental"
 )
 
 func init() {
@@ -31,8 +30,7 @@ func init() {
 	api.CoreFeatureNonTrappingFloatToIntConversion |
 	api.CoreFeatureMutableGlobal |
 	api.CoreFeatureReferenceTypes |
-	api.CoreFeatureSignExtensionOps |
+	api.CoreFeatureSignExtensionOps
-	experimental.CoreFeaturesThreads
 
 //go:embed ffprobe.wasm
 var B []byte

vendor/codeberg.org/gruf/go-ffmpreg/util/funcs.go

@@ -1,65 +0,0 @@
-package util
-
-import (
-	"context"
-	"os"
-	"path"
-	"strconv"
-	"time"
-
-	"github.com/tetratelabs/wazero/api"
-)
-
-// Wasm_Tempnam wraps Go_Tempnam to fulfill wazero's api.GoModuleFunc,
-// the argument definition is (i32, i32) and return definition is (i32).
-// NOTE: the calling module MUST have access to exported malloc / free.
-func Wasm_Tempnam(ctx context.Context, mod api.Module, stack []uint64) {
-	dirptr := api.DecodeU32(stack[0])
-	pfxptr := api.DecodeU32(stack[1])
-	dir := readString(ctx, mod, dirptr, 0)
-	pfx := readString(ctx, mod, pfxptr, 0)
-	tmpstr := Go_Tempnam(dir, pfx)
-	tmpptr := writeString(ctx, mod, tmpstr)
-	stack[0] = api.EncodeU32(tmpptr)
-}
-
-// Go_Tempname is functionally similar to C's tempnam.
-func Go_Tempnam(dir, prefix string) string {
-	now := time.Now().Unix()
-	prefix = path.Join(dir, prefix)
-	for i := 0; i < 1000; i++ {
-		n := murmur2(uint32(now + int64(i)))
-		name := prefix + strconv.FormatUint(uint64(n), 10)
-		_, err := os.Stat(name)
-		if err == nil {
-			continue
-		} else if os.IsNotExist(err) {
-			return name
-		} else {
-			panic(err)
-		}
-	}
-	panic("too many attempts")
-}
-
-// murmur2 is a simple uint32 murmur2 hash
-// impl with fixed seed and input size.
-func murmur2(k uint32) (h uint32) {
-	const (
-		//  seed ^ bitlen
-		s = uint32(2147483647) ^ 8
-
-		M = 0x5bd1e995
-		R = 24
-	)
-	h = s
-	k *= M
-	k ^= k >> R
-	k *= M
-	h *= M
-	h ^= k
-	h ^= h >> 13
-	h *= M
-	h ^= h >> 15
-	return
-}

vendor/codeberg.org/gruf/go-ffmpreg/util/wasm.go

@@ -1,81 +0,0 @@
-package util
-
-import (
-	"bytes"
-	"context"
-
-	"github.com/tetratelabs/wazero/api"
-)
-
-// NOTE:
-// the below functions are not very well optimized
-// for repeated calls. this is relying on the fact
-// that the only place they get used (tempnam), is
-// not called very often, should only be once per run
-// so calls to ExportedFunction() and Call() instead
-// of caching api.Function and using CallWithStack()
-// will work out the same (if only called once).
-
-// maxaddr is the maximum
-// wasm32 memory address.
-const maxaddr = ^uint32(0)
-
-func malloc(ctx context.Context, mod api.Module, sz uint32) uint32 {
-	stack, err := mod.ExportedFunction("malloc").Call(ctx, uint64(sz))
-	if err != nil {
-		panic(err)
-	}
-	ptr := api.DecodeU32(stack[0])
-	if ptr == 0 {
-		panic("out of memory")
-	}
-	return ptr
-}
-
-func free(ctx context.Context, mod api.Module, ptr uint32) {
-	if ptr != 0 {
-		mod.ExportedFunction("free").Call(ctx, uint64(ptr))
-	}
-}
-
-func view(ctx context.Context, mod api.Module, ptr uint32, n uint32) []byte {
-	if n == 0 {
-		n = maxaddr - ptr
-	}
-	mem := mod.Memory()
-	b, ok := mem.Read(ptr, n)
-	if !ok {
-		panic("out of range")
-	}
-	return b
-}
-
-func read(ctx context.Context, mod api.Module, ptr, n uint32) []byte {
-	return bytes.Clone(view(ctx, mod, ptr, n))
-}
-
-func readString(ctx context.Context, mod api.Module, ptr, n uint32) string {
-	return string(view(ctx, mod, ptr, n))
-}
-
-func write(ctx context.Context, mod api.Module, b []byte) uint32 {
-	mem := mod.Memory()
-	len := uint32(len(b))
-	ptr := malloc(ctx, mod, len)
-	ok := mem.Write(ptr, b)
-	if !ok {
-		panic("out of range")
-	}
-	return ptr
-}
-
-func writeString(ctx context.Context, mod api.Module, str string) uint32 {
-	mem := mod.Memory()
-	len := uint32(len(str) + 1)
-	ptr := malloc(ctx, mod, len)
-	ok := mem.WriteString(ptr, str)
-	if !ok {
-		panic("out of range")
-	}
-	return ptr
-}

vendor/modules.txt

@@ -30,11 +30,10 @@ codeberg.org/gruf/go-fastcopy
 # codeberg.org/gruf/go-fastpath/v2 v2.0.0
 ## explicit; go 1.14
 codeberg.org/gruf/go-fastpath/v2
-# codeberg.org/gruf/go-ffmpreg v0.2.2
+# codeberg.org/gruf/go-ffmpreg v0.2.3
 ## explicit; go 1.22.0
 codeberg.org/gruf/go-ffmpreg/embed/ffmpeg
 codeberg.org/gruf/go-ffmpreg/embed/ffprobe
-codeberg.org/gruf/go-ffmpreg/util
 codeberg.org/gruf/go-ffmpreg/wasm
 # codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf
 ## explicit; go 1.21