apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-10-05 16:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow add Input param without codecs changes.

Browse Source 
Correct the Input Template to delete the 'input' parameter to allow set the copy codecs option, otherwise the '-vn -an' codecs option is selected.
This commit is contained in:
Galindo, Alex
2023-07-06 10:25:09 +02:00
parent 9e65f18e08
commit f6936f7cee
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ffmpeg/ffmpeg.go
View File

@@ -2,6 +2,9 @@ package ffmpeg
import ( import (
"errors" "errors"
"net/url"
"strings"
"github.com/AlexxIT/go2rtc/internal/app" "github.com/AlexxIT/go2rtc/internal/app"
"github.com/AlexxIT/go2rtc/internal/ffmpeg/device" "github.com/AlexxIT/go2rtc/internal/ffmpeg/device"
"github.com/AlexxIT/go2rtc/internal/ffmpeg/hardware" "github.com/AlexxIT/go2rtc/internal/ffmpeg/hardware"
@@ -9,8 +12,6 @@ import (
"github.com/AlexxIT/go2rtc/internal/streams" "github.com/AlexxIT/go2rtc/internal/streams"
"github.com/AlexxIT/go2rtc/pkg/core" "github.com/AlexxIT/go2rtc/pkg/core"
"github.com/AlexxIT/go2rtc/pkg/ffmpeg" "github.com/AlexxIT/go2rtc/pkg/ffmpeg"
"net/url"
"strings"
) )
func Init() { func Init() {
@@ -103,8 +104,9 @@ var defaults = map[string]string{
} }
// inputTemplate - select input template from YAML config by template name // inputTemplate - select input template from YAML config by template name
// if query has input param - select another tempalte by this name // if query has input param - select another template by this name
// if there is no another template - use input param as template // if there is no another template - use input param as template
// After input param processed - remove it to allow a correct parseArgs Codec selection
func inputTemplate(name, s string, query url.Values) string { func inputTemplate(name, s string, query url.Values) string {
var template string var template string
if input := query.Get("input"); input != "" { if input := query.Get("input"); input != "" {
@@ -114,6 +116,7 @@ func inputTemplate(name, s string, query url.Values) string {
} else { } else {
template = defaults[name] template = defaults[name]
} }
query.Del("input")
return strings.Replace(template, "{input}", s, 1) return strings.Replace(template, "{input}", s, 1)
} }
@@ -188,7 +191,7 @@ func parseArgs(s string) *ffmpeg.Args {
// 3. `video` params (support multiple) // 3. `video` params (support multiple)
// 4. `audio` params (support multiple) // 4. `audio` params (support multiple)
// 5. `hardware` param // 5. `hardware` param
if query != nil { if len(query) != 0 {
// 1. Process raw params for FFmpeg // 1. Process raw params for FFmpeg
for _, raw := range query["raw"] { for _, raw := range query["raw"] {
args.AddCodec(raw) args.AddCodec(raw)