From e3d7e3c2b7da0b4d0a1741c3a2eaaf80dc2d4aa2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 16 May 2015 22:30:18 +0200 Subject: [PATCH] IPTV RTSP: fix periodic options call (full URL + timeout) for another IPTV source --- src/input/mpegts/iptv/iptv_rtsp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/input/mpegts/iptv/iptv_rtsp.c b/src/input/mpegts/iptv/iptv_rtsp.c index 04ec64515..17d82ff8d 100644 --- a/src/input/mpegts/iptv/iptv_rtsp.c +++ b/src/input/mpegts/iptv/iptv_rtsp.c @@ -48,8 +48,9 @@ iptv_rtsp_alive_cb ( void *aux ) iptv_mux_t *im = aux; rtsp_priv_t *rp = im->im_data; - rtsp_options(rp->hc); - gtimer_arm(&rp->alive_timer, iptv_rtsp_alive_cb, im, rp->hc->hc_rtp_timeout / 2); + rtsp_send(rp->hc, RTSP_CMD_OPTIONS, rp->path, rp->query, NULL); + gtimer_arm(&rp->alive_timer, iptv_rtsp_alive_cb, im, + MAX(1, (rp->hc->hc_rtp_timeout / 2) - 1)); } /* @@ -91,7 +92,8 @@ iptv_rtsp_header ( http_client_t *hc ) hc->hc_cmd = HTTP_CMD_NONE; pthread_mutex_lock(&global_lock); iptv_input_mux_started(hc->hc_aux); - gtimer_arm(&rp->alive_timer, iptv_rtsp_alive_cb, im, hc->hc_rtp_timeout / 2); + gtimer_arm(&rp->alive_timer, iptv_rtsp_alive_cb, im, + MAX(1, (hc->hc_rtp_timeout / 2) - 1)); pthread_mutex_unlock(&global_lock); break; default: -- 2.47.2