From a9dffb7e96d5d0269840e40575e69ec996351ec1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Jul 2017 16:26:00 +0200 Subject: [PATCH] satip server: fix the PLAY/SETUP state machine, filter stream in DESCRIBE, fixes #4474 --- src/satip/rtsp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c index e08c626d3..9b5a87df0 100644 --- a/src/satip/rtsp.c +++ b/src/satip/rtsp.c @@ -620,7 +620,9 @@ pids: rs->udp_rtp ? rs->udp_rtp->fd : hc->hc_fd, rs->udp_rtcp ? rs->udp_rtcp->fd : -1, rs->frontend, rs->findex, &rs->dmc_tuned, - &rs->pids, ocmd == RTSP_CMD_PLAY, rs->perm_lock); + &rs->pids, + ocmd == RTSP_CMD_PLAY || oldstate == STATE_PLAY, + rs->perm_lock); rs->tcp_data = rs->udp_rtp ? NULL : hc; if (!rs->pids.all && rs->pids.count == 0) mpegts_pid_add(&rs->pids, 0, MPS_WEIGHT_RAW); @@ -1310,9 +1312,9 @@ rtsp_process_describe(http_connection_t *hc) if (strcmp(hc->hc_session, rs->session)) continue; rtsp_rearm_session_timer(rs); - if (stream > 0 && rs->stream != stream) - continue; } + if (stream > 0 && rs->stream != stream) + continue; if (satip_server_conf.satip_anonymize && strcmp(hc->hc_peer_ipstr, rs->peer_ipstr)) continue; -- 2.47.3