Code refactoring for #1956

2025-12-27 08:36:40 +03:00
parent 31962181cb
commit a3a4276c15
1 changed files with 6 additions and 11 deletions
@@ -2,7 +2,6 @@ package ffmpeg

 import (
 	"net/url"
-	"strconv"
 	"strings"

 	"github.com/AlexxIT/go2rtc/internal/api"
@@ -59,15 +58,14 @@ func Init() {
 }

 var defaults = map[string]string{
-	"bin":    "ffmpeg",
-	"global": "-hide_banner",
+	"bin":     "ffmpeg",
+	"global":  "-hide_banner",
 	"timeout": "5",

 	// inputs
-	"file":    "-re -i {input}",
-	"http":    "-fflags nobuffer -flags low_delay -i {input}",
-	"rtsp":    "-fflags nobuffer -flags low_delay -timeout {timeout} -user_agent go2rtc/ffmpeg -rtsp_flags prefer_tcp -i {input}",
-
+	"file":     "-re -i {input}",
+	"http":     "-fflags nobuffer -flags low_delay -i {input}",
+	"rtsp":     "-fflags nobuffer -flags low_delay -timeout {timeout} -user_agent go2rtc/ffmpeg -rtsp_flags prefer_tcp -i {input}",
 	"rtsp/udp": "-fflags nobuffer -flags low_delay -timeout {timeout} -user_agent go2rtc/ffmpeg -i {input}",

 	// output
@@ -176,10 +174,7 @@ func inputTemplate(name, s string, query url.Values) string {
 		if timeout == "" {
 			timeout = defaults["timeout"]
 		}
-		if i, _ := strconv.Atoi(timeout); i > 0 {
-			timeout = strconv.Itoa(i * 1000000)
-		}
-		template = strings.Replace(template, "{timeout}", timeout, 1)
+		template = strings.Replace(template, "{timeout}", timeout+"000000", 1)
 	}
 	return strings.Replace(template, "{input}", s, 1)
 }