satip server: fix the PLAY/SETUP state machine, filter stream in DESCRIBE, fixes...

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index ee3fdca3d64f10cfb82b502caefe7a11d3ed0da8..ac5672293a020bd08c1ecdf525bfd5272eb277b3 100644 (file)
--- 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;