From bd76fc3449f780d2d58193e5feb5fa4ce0a4c8fb Mon Sep 17 00:00:00 2001 From: Trek H Date: Sat, 13 Mar 2021 02:33:59 +1030 Subject: [PATCH 1/3] revid: check the error returned from mtsEnc --- revid/pipeline.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/revid/pipeline.go b/revid/pipeline.go index 097978e4..13226ead 100644 --- a/revid/pipeline.go +++ b/revid/pipeline.go @@ -227,7 +227,10 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io. // as a destination. if len(mtsSenders) != 0 { mw := multiWriter(mtsSenders...) - e, _ := mtsEnc(mw, float64(r.cfg.FrameRate)) + e, err := mtsEnc(mw, float64(r.cfg.FrameRate)) + if err != nil { + return err + } encoders = append(encoders, e) } From 24a4a8d2029cf571b23ff2d783970873c8e560a9 Mon Sep 17 00:00:00 2001 From: Trek H Date: Mon, 15 Mar 2021 11:26:41 +1030 Subject: [PATCH 2/3] revid: make codec strings for vidgrind match av codecs --- revid/config/variables.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revid/config/variables.go b/revid/config/variables.go index 726faf16..b66ffc26 100644 --- a/revid/config/variables.go +++ b/revid/config/variables.go @@ -297,7 +297,7 @@ var Variables = []struct { }, { Name: KeyInputCodec, - Type_: "enum:H264,H265,MJPEG,JPEG,PCM,ADPCM", + Type_: "enum:h264,h265,mjpeg,jpeg,pcm,adpcm", Update: func(c *Config, v string) { c.InputCodec = v }, From 1a90a1dbdaf0d0f21bfd965f2fdd380ee908936e Mon Sep 17 00:00:00 2001 From: Trek H Date: Mon, 15 Mar 2021 11:47:48 +1030 Subject: [PATCH 3/3] revid: wrap error from mtsEnc with more info --- revid/pipeline.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/revid/pipeline.go b/revid/pipeline.go index 13226ead..575516c5 100644 --- a/revid/pipeline.go +++ b/revid/pipeline.go @@ -229,7 +229,7 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io. mw := multiWriter(mtsSenders...) e, err := mtsEnc(mw, float64(r.cfg.FrameRate)) if err != nil { - return err + return fmt.Errorf("error from setting up MTS encoder: %w", err) } encoders = append(encoders, e) } @@ -241,7 +241,7 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io. mw := multiWriter(flvSenders...) e, err := flvEnc(mw, int(r.cfg.FrameRate)) if err != nil { - return err + return fmt.Errorf("error from setting up FLV encoder: %w", err) } encoders = append(encoders, e) }