Commit c691d369 authored by Laurent Aimar's avatar Laurent Aimar

Fixed b_out_pace_control value when using record.

parent cbe863f7
...@@ -1744,20 +1744,6 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block ) ...@@ -1744,20 +1744,6 @@ static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block )
p_sout_block = p_next; p_sout_block = p_next;
} }
/* For now it's enough, as only sout impact on this flag */
if( p_owner->p_sout->i_out_pace_nocontrol > 0 &&
p_owner->p_input->p->b_out_pace_control )
{
msg_Dbg( p_dec, "switching to sync mode" );
p_owner->p_input->p->b_out_pace_control = false;
}
else if( p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
!p_owner->p_input->p->b_out_pace_control )
{
msg_Dbg( p_dec, "switching to async mode" );
p_owner->p_input->p->b_out_pace_control = true;
}
} }
} }
......
...@@ -1874,6 +1874,24 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block ) ...@@ -1874,6 +1874,24 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/* Check for sout mode */
if( out->b_sout )
{
/* FIXME review this, proper lock may be missing */
if( p_input->p->p_sout->i_out_pace_nocontrol > 0 &&
p_input->p->b_out_pace_control )
{
msg_Dbg( p_input, "switching to sync mode" );
p_input->p->b_out_pace_control = false;
}
else if( p_input->p->p_sout->i_out_pace_nocontrol <= 0 &&
!p_input->p->b_out_pace_control )
{
msg_Dbg( p_input, "switching to async mode" );
p_input->p->b_out_pace_control = true;
}
}
/* Decode */ /* Decode */
if( es->p_dec_record ) if( es->p_dec_record )
{ {
......
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