Add OR to RTSP Server codecs filter

2023-01-27 17:05:01 +03:00
parent e8e43f9d68
commit decd3af941
2 changed files with 48 additions and 12 deletions
@@ -164,7 +164,13 @@ func tcpHandler(conn *rtsp.Conn) {

 			conn.SessionName = app.UserAgent

-			initMedias(conn)
+			conn.Medias = streamer.ParseQuery(conn.URL.Query())
+			if conn.Medias == nil {
+				conn.Medias = []*streamer.Media{
+					{Kind: streamer.KindVideo, Direction: streamer.DirectionRecvonly},
+					{Kind: streamer.KindAudio, Direction: streamer.DirectionRecvonly},
+				}
+			}

 			if err := stream.AddConsumer(conn); err != nil {
 				log.Warn().Err(err).Str("stream", name).Msg("[rtsp]")
@@ -261,12 +267,4 @@ func initMedias(conn *rtsp.Conn) {
 			}
 		}
 	}
-
-	// set default media candidates if query is empty
-	if conn.Medias == nil {
-		conn.Medias = []*streamer.Media{
-			{Kind: streamer.KindVideo, Direction: streamer.DirectionRecvonly},
-			{Kind: streamer.KindAudio, Direction: streamer.DirectionRecvonly},
-		}
-	}
 }