Merge pull request #1450 from edenhaus/ffmpeg-codec-not-matched-error
Lower codec not matched error for ffmpeg to debug
This commit is contained in:
@@ -223,6 +223,9 @@ func parseArgs(s string) *ffmpeg.Args {
|
|||||||
s += "?video&audio"
|
s += "?video&audio"
|
||||||
}
|
}
|
||||||
s += "&source=ffmpeg:" + url.QueryEscape(source)
|
s += "&source=ffmpeg:" + url.QueryEscape(source)
|
||||||
|
for _, v := range query["query"] {
|
||||||
|
s += "&" + v
|
||||||
|
}
|
||||||
args.Input = inputTemplate("rtsp", s, query)
|
args.Input = inputTemplate("rtsp", s, query)
|
||||||
} else if i = strings.Index(s, "?"); i > 0 {
|
} else if i = strings.Index(s, "?"); i > 0 {
|
||||||
switch s[:i] {
|
switch s[:i] {
|
||||||
|
|||||||
+10
-2
@@ -147,6 +147,7 @@ func tcpHandler(conn *rtsp.Conn) {
|
|||||||
var closer func()
|
var closer func()
|
||||||
|
|
||||||
trace := log.Trace().Enabled()
|
trace := log.Trace().Enabled()
|
||||||
|
level := zerolog.WarnLevel
|
||||||
|
|
||||||
conn.Listen(func(msg any) {
|
conn.Listen(func(msg any) {
|
||||||
if trace {
|
if trace {
|
||||||
@@ -188,11 +189,18 @@ func tcpHandler(conn *rtsp.Conn) {
|
|||||||
conn.PacketSize = uint16(core.Atoi(s))
|
conn.PacketSize = uint16(core.Atoi(s))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// param name like ffmpeg style https://ffmpeg.org/ffmpeg-protocols.html
|
||||||
|
if s := query.Get("log_level"); s != "" {
|
||||||
|
if lvl, err := zerolog.ParseLevel(s); err == nil {
|
||||||
|
level = lvl
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// will help to protect looping requests to same source
|
// will help to protect looping requests to same source
|
||||||
conn.Connection.Source = query.Get("source")
|
conn.Connection.Source = query.Get("source")
|
||||||
|
|
||||||
if err := stream.AddConsumer(conn); err != nil {
|
if err := stream.AddConsumer(conn); err != nil {
|
||||||
log.Warn().Err(err).Str("stream", name).Msg("[rtsp]")
|
log.WithLevel(level).Err(err).Str("stream", name).Msg("[rtsp]")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,7 +238,7 @@ func tcpHandler(conn *rtsp.Conn) {
|
|||||||
|
|
||||||
if err := conn.Accept(); err != nil {
|
if err := conn.Accept(); err != nil {
|
||||||
if err != io.EOF {
|
if err != io.EOF {
|
||||||
log.Warn().Err(err).Caller().Send()
|
log.WithLevel(level).Err(err).Caller().Send()
|
||||||
}
|
}
|
||||||
if closer != nil {
|
if closer != nil {
|
||||||
closer()
|
closer()
|
||||||
|
|||||||
Reference in New Issue
Block a user