release: updated probe by adding the format with the actual duration

p4xx07 · May 30, 2023 · acc48dc · acc48dc
1 parent a414de7
commit acc48dc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/ffprobe/extensions.go b/ffprobe/extensions.go
@@ -38,20 +38,8 @@ func (p *Probe) GetResolution() (width int, height int) {
 	return videoStream.Width, videoStream.Height
 }
 
-func (p *Probe) GetStreamDuration(codecType ...string) (float64, error) {
-	selectedCodec := "video"
-	if len(codecType) > 0 {
-		selectedCodec = codecType[0]
-	}
-	var selected Stream
-	for _, stream := range p.Streams {
-		if stream.CodecType == selectedCodec {
-			selected = stream
-			break
-		}
-	}
-
-	duration, err := strconv.ParseFloat(selected.Duration, 64)
+func (p *Probe) GetStreamDuration() (float64, error) {
+	duration, err := strconv.ParseFloat(p.Format.Duration, 64)
 	if err != nil {
 		return -1, err
 	}

diff --git a/ffprobe/ffprobe.go b/ffprobe/ffprobe.go
@@ -44,6 +44,7 @@ func (p *ffprobe) GetProbe(args ...string) (*Probe, error) {
 	cmd := exec.Command(p.configuration.FfprobePath)
 	cArgs := []string{
 		"-show_streams",
+		"-show_format",
 		"-print_format", "json",
 	}
 

diff --git a/ffprobe/probe.go b/ffprobe/probe.go
@@ -6,8 +6,21 @@ import (
 
 type Probe struct {
 	Streams []Stream `json:"streams"`
+	Format  Format   `json:"format"`
 }
 
+type Format struct {
+	Filename       string `json:"filename"`
+	NbStreams      int    `json:"nb_streams"`
+	NbPrograms     int    `json:"nb_programs"`
+	FormatName     string `json:"format_name"`
+	FormatLongName string `json:"format_long_name"`
+	StartTime      string `json:"start_time"`
+	Duration       string `json:"duration"`
+	Size           string `json:"size"`
+	BitRate        string `json:"bit_rate"`
+	ProbeScore     int    `json:"probe_score"`
+}
 type Stream struct {
 	Index              int         `json:"index"`
 	CodecName          string      `json:"codec_name"`

diff --git a/test/ffprobe_test.go b/test/ffprobe_test.go
@@ -36,6 +36,23 @@ func Test_FfprobeVideoStreams(t *testing.T) {
 	}
 }
 
+func Test_FfprobeVideoStreamsGetDuration(t *testing.T) {
+	ffprobe := GetFfprobe()
+	probe, err := ffprobe.GetProbe(input)
+	if err != nil {
+		panic(fmt.Sprintf("could not probe %s", err.Error()))
+	}
+
+	d, err := probe.GetStreamDuration()
+	if err != nil {
+		panic(fmt.Sprintf("could not get duration %s", err.Error()))
+	}
+
+	if d < 0 {
+		panic(fmt.Sprintf("could not get duration -1 %s", err.Error()))
+	}
+}
+
 func Test_FfprobeAudioStreams(t *testing.T) {
 	expected := 1
 	expectedAudio := "audio"