Skip to content

V
vlc
Commit bab44e26 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

input: do not bypass demux when setting pause state

parent 2237ed70
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 17 deletions
src/input/input.c
View file @ bab44e26
...@@ -1532,19 +1532,13 @@ static void ControlRelease( int i_type, vlc_value_t val ) ...@@ -1532,19 +1532,13 @@ static void ControlRelease( int i_type, vlc_value_t val )
/* Pause input */ /* Pause input */
static void ControlPause( input_thread_t *p_input, mtime_t i_control_date ) static void ControlPause( input_thread_t *p_input, mtime_t i_control_date )
{ {
int i_ret = VLC_SUCCESS;
int i_state = PAUSE_S; int i_state = PAUSE_S;
if( p_input->p->b_can_pause ) if( p_input->p->b_can_pause )
{ {
demux_t *p_demux = p_input->p->input.p_demux; demux_t *p_demux = p_input->p->input.p_demux;
if( p_demux->s != NULL ) if( demux_Control( p_demux, DEMUX_SET_PAUSE_STATE, true ) )
i_ret = stream_Control( p_demux->s, STREAM_SET_PAUSE_STATE, true );
else
i_ret = demux_Control( p_demux, DEMUX_SET_PAUSE_STATE, true );
if( i_ret )
{ {
msg_Warn( p_input, "cannot set pause state" ); msg_Warn( p_input, "cannot set pause state" );
return; return;
...@@ -1552,10 +1546,8 @@ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date ) ...@@ -1552,10 +1546,8 @@ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date )
} }
/* */ /* */
i_ret = es_out_SetPauseState( p_input->p->p_es_out, if( es_out_SetPauseState( p_input->p->p_es_out, p_input->p->b_can_pause,
p_input->p->b_can_pause, true, true, i_control_date ) )
i_control_date );
if( i_ret )
{ {
msg_Warn( p_input, "cannot set pause state at es_out level" ); msg_Warn( p_input, "cannot set pause state at es_out level" );
return; return;
...@@ -1570,13 +1562,8 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date ) ...@@ -1570,13 +1562,8 @@ static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date )
if( p_input->p->b_can_pause ) if( p_input->p->b_can_pause )
{ {
demux_t *p_demux = p_input->p->input.p_demux; demux_t *p_demux = p_input->p->input.p_demux;
int ret;
if( p_demux->s != NULL ) if( demux_Control( p_demux, DEMUX_SET_PAUSE_STATE, false ) )
ret = stream_Control( p_demux->s, STREAM_SET_PAUSE_STATE, false );
else
ret = demux_Control( p_demux, DEMUX_SET_PAUSE_STATE, false );
if( ret != VLC_SUCCESS )
{ {
msg_Err( p_input, "cannot resume" ); msg_Err( p_input, "cannot resume" );
input_ChangeState( p_input, ERROR_S ); input_ChangeState( p_input, ERROR_S );
......
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