*****************************************************************************/
static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
audio_sample_format_t *p_format,
- audio_replay_gain_t *p_replay_gain )
+ const audio_replay_gain_t *p_replay_gain,
+ const aout_request_vout_t *p_request_vout )
{
aout_input_t * p_input;
goto error;
}
- p_input = malloc(sizeof(aout_input_t));
- if ( p_input == NULL )
+ p_input = calloc( 1, sizeof(aout_input_t));
+ if( !p_input )
goto error;
- memset( p_input, 0, sizeof(aout_input_t) );
vlc_mutex_init( &p_input->lock );
- p_input->b_changed = 0;
- p_input->b_error = 1;
+ p_input->b_changed = false;
+ p_input->b_error = true;
+ p_input->b_paused = false;
+ p_input->i_pause_date = 0;
aout_FormatPrepare( p_format );
/* Create other input streams. */
for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ )
{
- aout_lock_input( p_aout, p_aout->pp_inputs[i] );
- aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
- aout_InputNew( p_aout, p_aout->pp_inputs[i] );
- aout_unlock_input( p_aout, p_aout->pp_inputs[i] );
+ aout_input_t *p_input = p_aout->pp_inputs[i];
+
+ aout_lock_input( p_aout, p_input );
+ aout_InputDelete( p_aout, p_input );
+ aout_InputNew( p_aout, p_input, &p_input->request_vout );
+ aout_unlock_input( p_aout, p_input );
}
}
else
goto error;
}
- aout_InputNew( p_aout, p_input );
+ aout_InputNew( p_aout, p_input, p_request_vout );
aout_unlock_input_fifos( p_aout );
aout_unlock_mixer( p_aout );
aout_input_t * __aout_DecNew( vlc_object_t * p_this,
aout_instance_t ** pp_aout,
audio_sample_format_t * p_format,
- audio_replay_gain_t *p_replay_gain )
+ const audio_replay_gain_t *p_replay_gain,
+ const aout_request_vout_t *p_request_video )
{
aout_instance_t *p_aout = *pp_aout;
if ( p_aout == NULL )
*pp_aout = p_aout;
}
- return DecNew( p_this, p_aout, p_format, p_replay_gain );
+ return DecNew( p_this, p_aout, p_format, p_replay_gain, p_request_video );
}
/*****************************************************************************
/ p_input->input.i_frame_length;
/* Suppose the decoder doesn't have more than one buffered buffer */
- p_input->b_changed = 0;
+ p_input->b_changed = false;
aout_unlock_input( NULL, p_input );
p_new_buffer->end_date = p_buffer->end_date;
aout_BufferFree( p_buffer );
p_buffer = p_new_buffer;
- p_input->b_changed = 0;
+ p_input->b_changed = false;
}
int i_ret = aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate );
return i_value;
}
+void aout_DecChangePause( aout_instance_t *p_aout, aout_input_t *p_input, bool b_paused, mtime_t i_date )
+{
+ mtime_t i_duration = 0;
+ aout_lock_input( p_aout, p_input );
+ assert( !p_input->b_paused || !b_paused );
+ if( p_input->b_paused )
+ {
+ i_duration = i_date - p_input->i_pause_date;
+ }
+ p_input->b_paused = b_paused;
+ p_input->i_pause_date = i_date;
+ aout_unlock_input( p_aout, p_input );
+
+ if( i_duration != 0 )
+ {
+ aout_lock_mixer( p_aout );
+ for( aout_buffer_t *p = p_input->fifo.p_first; p != NULL; p = p->p_next )
+ {
+ p->start_date += i_duration;
+ p->end_date += i_duration;
+ }
+ aout_unlock_mixer( p_aout );
+ }
+}
+
+void aout_DecFlush( aout_instance_t *p_aout, aout_input_t *p_input )
+{
+ aout_lock_input_fifos( p_aout );
+
+ aout_FifoSet( p_aout, &p_input->fifo, 0 );
+ p_input->p_first_byte_to_mix = NULL;
+
+ aout_unlock_input_fifos( p_aout );
+}
+