Commit 6ef6e5c6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

rtp: remove constant thread_ready flag

parent ced9254b
...@@ -141,12 +141,8 @@ static void Close (vlc_object_t *obj) ...@@ -141,12 +141,8 @@ static void Close (vlc_object_t *obj)
demux_t *demux = (demux_t *)obj; demux_t *demux = (demux_t *)obj;
demux_sys_t *p_sys = demux->p_sys; demux_sys_t *p_sys = demux->p_sys;
if (p_sys->thread_ready) vlc_cancel(p_sys->thread);
{ vlc_join(p_sys->thread, NULL);
vlc_cancel (p_sys->thread);
vlc_join (p_sys->thread, NULL);
}
#ifdef HAVE_SRTP #ifdef HAVE_SRTP
if (p_sys->srtp) if (p_sys->srtp)
srtp_destroy (p_sys->srtp); srtp_destroy (p_sys->srtp);
...@@ -190,7 +186,6 @@ static int OpenSDP(vlc_object_t *obj) ...@@ -190,7 +186,6 @@ static int OpenSDP(vlc_object_t *obj)
#ifdef HAVE_SRTP #ifdef HAVE_SRTP
sys->srtp = NULL; sys->srtp = NULL;
#endif #endif
sys->thread_ready = false;
struct vlc_sdp *sdp = vlc_sdp_parse((const char *)peek, sdplen); struct vlc_sdp *sdp = vlc_sdp_parse((const char *)peek, sdplen);
if (sdp == NULL) { if (sdp == NULL) {
...@@ -322,8 +317,6 @@ static int OpenSDP(vlc_object_t *obj) ...@@ -322,8 +317,6 @@ static int OpenSDP(vlc_object_t *obj)
rtp_session_destroy(demux, sys->session); rtp_session_destroy(demux, sys->session);
goto error; goto error;
} }
sys->thread_ready = true;
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
...@@ -447,7 +440,6 @@ static int OpenURL(vlc_object_t *obj) ...@@ -447,7 +440,6 @@ static int OpenURL(vlc_object_t *obj)
p_sys->timeout = vlc_tick_from_sec( var_CreateGetInteger (obj, "rtp-timeout") ); p_sys->timeout = vlc_tick_from_sec( var_CreateGetInteger (obj, "rtp-timeout") );
p_sys->max_dropout = var_CreateGetInteger (obj, "rtp-max-dropout"); p_sys->max_dropout = var_CreateGetInteger (obj, "rtp-max-dropout");
p_sys->max_misorder = var_CreateGetInteger (obj, "rtp-max-misorder"); p_sys->max_misorder = var_CreateGetInteger (obj, "rtp-max-misorder");
p_sys->thread_ready = false;
p_sys->autodetect = true; p_sys->autodetect = true;
demux->pf_demux = NULL; demux->pf_demux = NULL;
...@@ -487,7 +479,6 @@ static int OpenURL(vlc_object_t *obj) ...@@ -487,7 +479,6 @@ static int OpenURL(vlc_object_t *obj)
if (vlc_clone (&p_sys->thread, rtp_dgram_thread, if (vlc_clone (&p_sys->thread, rtp_dgram_thread,
demux, VLC_THREAD_PRIORITY_INPUT)) demux, VLC_THREAD_PRIORITY_INPUT))
goto error; goto error;
p_sys->thread_ready = true;
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
......
...@@ -75,7 +75,6 @@ typedef struct ...@@ -75,7 +75,6 @@ typedef struct
uint16_t max_dropout; /**< Max packet forward misordering */ uint16_t max_dropout; /**< Max packet forward misordering */
uint16_t max_misorder; /**< Max packet backward misordering */ uint16_t max_misorder; /**< Max packet backward misordering */
uint8_t max_src; /**< Max simultaneous RTP sources */ uint8_t max_src; /**< Max simultaneous RTP sources */
bool thread_ready;
bool autodetect; /**< Payload type autodetection pending */ bool autodetect; /**< Payload type autodetection pending */
} demux_sys_t; } demux_sys_t;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment