#include <vlc_vout.h> /* for vout_Request */
#include <vlc_aout.h>
+#include <vlc_filter.h>
#include <libvlc.h>
#include "aout_internal.h"
while( psz_parser && *psz_parser )
{
- aout_filter_t * p_filter = NULL;
+ filter_t * p_filter = NULL;
if( p_input->i_nb_filters >= AOUT_MAX_FILTERS )
{
/* request format */
memcpy( &p_filter->fmt_in.audio, &chain_output_format,
sizeof(audio_sample_format_t) );
+ p_filter->fmt_in.i_codec = chain_output_format.i_format;
memcpy( &p_filter->fmt_out.audio, &chain_output_format,
sizeof(audio_sample_format_t) );
-
+ p_filter->fmt_out.i_codec = chain_output_format.i_format;
+ p_filter->pf_audio_buffer_new = aout_FilterBufferNew;
/* try to find the requested filter */
if( i_visual == 2 ) /* this can only be a visualization module */
{
- p_filter->p_module = module_need( p_filter, "visualization",
+ p_filter->p_module = module_need( p_filter, "visualization2",
psz_parser, true );
}
else /* this can be a audio filter module as well as a visualization module */
memcpy( &p_filter->fmt_out.audio, &chain_output_format,
sizeof(audio_sample_format_t) );
p_filter->p_module = module_need( p_filter,
- "visualization",
+ "visualization2",
psz_parser, true );
}
}
psz_parser );
free( p_filter->p_owner );
- vlc_object_detach( p_filter );
vlc_object_release( p_filter );
psz_parser = psz_next;
module_unneed( p_filter, p_filter->p_module );
free( p_filter->p_owner );
- vlc_object_detach( p_filter );
vlc_object_release( p_filter );
psz_parser = psz_next;
/* Success */
p_input->b_error = false;
- p_input->b_restart = false;
p_input->i_last_input_rate = INPUT_RATE_DEFAULT;
return 0;
}
/*****************************************************************************
- * aout_InputPlay : play a buffer
+ * aout_InputCheckAndRestart : restart an input
*****************************************************************************
- * This function must be entered with the input lock.
+ * This function must be entered with the input and mixer lock.
*****************************************************************************/
-/* XXX Do not activate it !! */
-//#define AOUT_PROCESS_BEFORE_CHEKS
-int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
- aout_buffer_t * p_buffer, int i_input_rate )
+void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input )
{
- mtime_t start_date;
+ AOUT_ASSERT_MIXER_LOCKED;
AOUT_ASSERT_INPUT_LOCKED;
- if( p_input->b_restart )
- {
- aout_fifo_t fifo;
- uint8_t *p_first_byte_to_mix;
- bool b_paused;
- mtime_t i_pause_date;
+ if( !p_input->b_restart )
+ return;
- aout_lock_mixer( p_aout );
- aout_lock_input_fifos( p_aout );
+ aout_lock_input_fifos( p_aout );
- /* A little trick to avoid loosing our input fifo and properties */
+ /* A little trick to avoid loosing our input fifo and properties */
- p_first_byte_to_mix = p_input->mixer.begin;
- fifo = p_input->mixer.fifo;
- b_paused = p_input->b_paused;
- i_pause_date = p_input->i_pause_date;
+ uint8_t *p_first_byte_to_mix = p_input->mixer.begin;
+ aout_fifo_t fifo = p_input->mixer.fifo;
+ bool b_paused = p_input->b_paused;
+ mtime_t i_pause_date = p_input->i_pause_date;
- aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->mixer_format.i_rate );
+ aout_FifoInit( p_aout, &p_input->mixer.fifo, p_aout->mixer_format.i_rate );
- aout_InputDelete( p_aout, p_input );
+ aout_InputDelete( p_aout, p_input );
- aout_InputNew( p_aout, p_input, &p_input->request_vout );
- p_input->mixer.begin = p_first_byte_to_mix;
- p_input->mixer.fifo = fifo;
- p_input->b_paused = b_paused;
- p_input->i_pause_date = i_pause_date;
+ aout_InputNew( p_aout, p_input, &p_input->request_vout );
+ p_input->mixer.begin = p_first_byte_to_mix;
+ p_input->mixer.fifo = fifo;
+ p_input->b_paused = b_paused;
+ p_input->i_pause_date = i_pause_date;
- aout_unlock_input_fifos( p_aout );
- aout_unlock_mixer( p_aout );
- }
+ p_input->b_restart = false;
+
+ aout_unlock_input_fifos( p_aout );
+}
+/*****************************************************************************
+ * aout_InputPlay : play a buffer
+ *****************************************************************************
+ * This function must be entered with the input lock.
+ *****************************************************************************/
+/* XXX Do not activate it !! */
+//#define AOUT_PROCESS_BEFORE_CHEKS
+int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
+ aout_buffer_t * p_buffer, int i_input_rate )
+{
+ mtime_t start_date;
+ AOUT_ASSERT_INPUT_LOCKED;
if( i_input_rate != INPUT_RATE_DEFAULT && p_input->p_playback_rate_filter == NULL )
{
/* Run pre-filters. */
aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
&p_buffer );
+ if( !p_buffer )
+ return 0;
/* Actually run the resampler now. */
if ( p_input->i_nb_resamplers > 0 )
&p_buffer );
}
+ if( !p_buffer )
+ return 0;
if( p_buffer->i_nb_samples <= 0 )
{
- aout_BufferFree( p_buffer );
+ block_Release( p_buffer );
return 0;
}
#endif
#ifndef AOUT_PROCESS_BEFORE_CHEKS
/* Run pre-filters. */
- aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
- &p_buffer );
+ aout_FiltersPlay( p_input->pp_filters, p_input->i_nb_filters, &p_buffer );
+ if( !p_buffer )
+ return 0;
#endif
/* Run the resampler if needed.
/* Actually run the resampler now. */
if ( p_input->i_nb_resamplers > 0 )
{
- aout_FiltersPlay( p_aout, p_input->pp_resamplers,
- p_input->i_nb_resamplers,
+ aout_FiltersPlay( p_input->pp_resamplers, p_input->i_nb_resamplers,
&p_buffer );
}
+ if( !p_buffer )
+ return 0;
if( p_buffer->i_nb_samples <= 0 )
{
- aout_BufferFree( p_buffer );
+ block_Release( p_buffer );
return 0;
}
#endif
{
aout_instance_t *p_aout = p_private;
VLC_UNUSED(b_recycle);
- return vout_Request( p_aout, p_vout, p_fmt );
+ vout_configuration_t cfg = {
+ .vout = p_vout,
+ .fmt = p_fmt,
+ };
+ return vout_Request( p_aout, &cfg );
}
-vout_thread_t *aout_filter_RequestVout( aout_filter_t *p_filter,
+vout_thread_t *aout_filter_RequestVout( filter_t *p_filter,
vout_thread_t *p_vout, video_format_t *p_fmt )
{
aout_input_t *p_input = p_filter->p_owner->p_input;
projects / vlc / blobdiff