From 9d7077813a7d358c38860e81e3b055c2a25faaa3 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Sat, 11 Feb 2023 21:32:36 +0100 Subject: [PATCH] use timescale 10000000 --- machinery/go.mod | 2 +- machinery/go.sum | 4 ++-- machinery/src/utils/main.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/machinery/go.mod b/machinery/go.mod index b0204f5..71cc474 100644 --- a/machinery/go.mod +++ b/machinery/go.mod @@ -20,7 +20,7 @@ require ( github.com/golang-module/carbon/v2 v2.2.3 github.com/gorilla/websocket v1.5.0 github.com/kellydunn/golang-geo v0.7.0 - github.com/kerberos-io/joy4 v1.0.51 + github.com/kerberos-io/joy4 v1.0.53 github.com/kerberos-io/onvif v0.0.5 github.com/minio/minio-go/v6 v6.0.57 github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e diff --git a/machinery/go.sum b/machinery/go.sum index 7014b1d..0bc8f4c 100644 --- a/machinery/go.sum +++ b/machinery/go.sum @@ -175,8 +175,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kellydunn/golang-geo v0.7.0 h1:A5j0/BvNgGwY6Yb6inXQxzYwlPHc6WVZR+MrarZYNNg= github.com/kellydunn/golang-geo v0.7.0/go.mod h1:YYlQPJ+DPEzrHx8kT3oPHC/NjyvCCXE+IuKGKdrjrcU= -github.com/kerberos-io/joy4 v1.0.51 h1:RxpXVkZIw1cfJEBPbfqdlwHfZtuDiLb/U25Na7jvPgo= -github.com/kerberos-io/joy4 v1.0.51/go.mod h1:nZp4AjvKvTOXRrmDyAIOw+Da+JA5OcSo/JundGfOlFU= +github.com/kerberos-io/joy4 v1.0.53 h1:DfVptCUzo/77xLUIwnp1/dbcVffmT0DKPDduQBcu26Y= +github.com/kerberos-io/joy4 v1.0.53/go.mod h1:nZp4AjvKvTOXRrmDyAIOw+Da+JA5OcSo/JundGfOlFU= github.com/kerberos-io/onvif v0.0.5 h1:kq9mnHZkih9Jl4DyIJ4Rzt++Y3DDKy3nI8S2ESEfZ5w= github.com/kerberos-io/onvif v0.0.5/go.mod h1:Hr2dJOH2LM5SpYKk17gYZ1CMjhGhUl+QlT5kwYogrW0= github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs= diff --git a/machinery/src/utils/main.go b/machinery/src/utils/main.go index 11d3890..cd05f67 100644 --- a/machinery/src/utils/main.go +++ b/machinery/src/utils/main.go @@ -253,7 +253,7 @@ func CreateFragmentedMP4(fullName string, fragmentedDuration int64) { path, _ := os.Getwd() duration := fragmentedDuration * 1000 // This timescale is crucial, as it should be the same as the one defined in JOY4. - cmd := exec.Command("mp4fragment", "--timescale", "90000", "--fragment-duration", strconv.FormatInt(duration, 10), fullName, fullName+"f.mp4") + cmd := exec.Command("mp4fragment", "--timescale", "10000000", "--fragment-duration", strconv.FormatInt(duration, 10), fullName, fullName+"f.mp4") cmd.Dir = path log.Log.Info(cmd.String()) var out bytes.Buffer