#include <vlc_common.h>
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
#include <vlc_aout.h>
#include <vlc_input.h>
duration = (1000000 * (mtime_t)i_nb_samples) / p_input->input.i_rate;
/* This necessarily allocates in the heap. */
- aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer );
+ p_buffer = aout_BufferAlloc( &p_input->input_alloc, duration, NULL );
if( p_buffer != NULL )
- p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
+ p_buffer->i_buffer = i_nb_samples * p_input->input.i_bytes_per_frame
/ p_input->input.i_frame_length;
/* Suppose the decoder doesn't have more than one buffered buffer */
return NULL;
p_buffer->i_nb_samples = i_nb_samples;
- p_buffer->start_date = p_buffer->end_date = 0;
+ p_buffer->i_pts = p_buffer->i_length = 0;
return p_buffer;
}
assert( i_input_rate >= INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE &&
i_input_rate <= INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE );
- assert( p_buffer->start_date > 0 );
+ assert( p_buffer->i_pts > 0 );
- p_buffer->end_date = p_buffer->start_date
- + (mtime_t)p_buffer->i_nb_samples * 1000000
+ p_buffer->i_length = (mtime_t)p_buffer->i_nb_samples * 1000000
/ p_input->input.i_rate;
+ aout_lock_mixer( p_aout );
aout_lock_input( p_aout, p_input );
if( p_input->b_error )
{
aout_unlock_input( p_aout, p_input );
+ aout_unlock_mixer( p_aout );
+
aout_BufferFree( p_buffer );
return -1;
}
mtime_t duration = (1000000 * (mtime_t)p_buffer->i_nb_samples)
/ p_input->input.i_rate;
- aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer );
+ p_new_buffer = aout_BufferAlloc( &p_input->input_alloc, duration, NULL);
vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
- p_buffer->i_nb_bytes );
+ p_buffer->i_buffer );
p_new_buffer->i_nb_samples = p_buffer->i_nb_samples;
- p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes;
- p_new_buffer->start_date = p_buffer->start_date;
- p_new_buffer->end_date = p_buffer->end_date;
+ p_new_buffer->i_buffer = p_buffer->i_buffer;
+ p_new_buffer->i_pts = p_buffer->i_pts;
+ p_new_buffer->i_length = p_buffer->i_length;
aout_BufferFree( p_buffer );
p_buffer = p_new_buffer;
p_input->b_changed = false;
}
+ aout_InputCheckAndRestart( p_aout, p_input );
+ aout_unlock_mixer( p_aout );
+
int i_ret = aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate );
aout_unlock_input( p_aout, p_input );
aout_lock_mixer( p_aout );
for( aout_buffer_t *p = p_input->mixer.fifo.p_first; p != NULL; p = p->p_next )
{
- p->start_date += i_duration;
- p->end_date += i_duration;
+ p->i_pts += i_duration;
}
aout_unlock_mixer( p_aout );
}