From 412a62671ab8ebe8b00cf082869ffa0e98bab089 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 20 May 2024 01:26:58 +0200 Subject: [PATCH] Fix video miss-cut because of start offset --- transcoder/src/keyframes.go | 17 +++++++---------- transcoder/utils.go | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/transcoder/src/keyframes.go b/transcoder/src/keyframes.go index 8e54ddacf..dbd4551dd 100644 --- a/transcoder/src/keyframes.go +++ b/transcoder/src/keyframes.go @@ -119,6 +119,13 @@ func getKeyframes(path string, kf *Keyframe) error { ret := make([]float64, 0, 1000) max := 100 done := 0 + // sometimes, videos can start at a timing greater than 0:00. We need to take that into account + // and only list keyframes that come after the start of the video (without that, our segments count + // mismatch and we can have the same segment twice on the stream). + // + // We can't hardcode the first keyframe at 0 because the transcoder needs to reference durations of segments + // To handle this edge case, when we fetch the segment n0, no seeking is done but duration is computed from the + // first keyframe (instead of 0) for scanner.Scan() { frame := scanner.Text() if frame == "" { @@ -143,16 +150,6 @@ func getKeyframes(path string, kf *Keyframe) error { // the segment time and decide to cut at a random keyframe. Having every keyframe // handled as a segment prevents that. - if done == 0 && len(ret) == 0 { - // sometimes, videos can start at a timing greater than 0:00. We need to take that into account - // and only list keyframes that come after the start of the video (without that, our segments count - // mismatch and we can have the same segment twice on the stream). - - // we hardcode 0 as the first keyframe (even if this is fake) because it makes the code way easier to follow. - // this value is actually never sent to ffmpeg anyways. - ret = append(ret, 0) - continue - } ret = append(ret, fpts) if len(ret) == max { diff --git a/transcoder/utils.go b/transcoder/utils.go index 74a04a8d3..fc355174f 100644 --- a/transcoder/utils.go +++ b/transcoder/utils.go @@ -19,7 +19,7 @@ var safe_path = src.GetEnvOr("GOCODER_SAFE_PATH", "/video") // Encode the version in the hash path to update cached values. // Older versions won't be deleted (needed to allow multiples versions of the transcoder to run at the same time) // If the version changes a lot, we might want to automatically delete older versions. -var version = "v2-" +var version = "v3-" func GetPath(c echo.Context) (string, string, error) { key := c.Param("path")