# include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_interface.h>
+#include <assert.h>
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
+#include <vlc_common.h>
+#include <vlc_dialog.h>
#include <vlc_aout.h>
#include "aout_internal.h"
if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS )
{
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
- intf_UserFatal( p_aout, false, _("Audio filtering failed"),
- _("The maximum number of filters (%d) was reached."),
- AOUT_MAX_FILTERS );
+ dialog_Fatal( p_aout, _("Audio filtering failed"),
+ _("The maximum number of filters (%d) was reached."),
+ AOUT_MAX_FILTERS );
return -1;
}
{
ReleaseFilter( pp_filters[0] );
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
- intf_UserFatal( p_aout, false, _("Audio filtering failed"),
- _("The maximum number of filters (%d) was reached."),
- AOUT_MAX_FILTERS );
+ dialog_Fatal( p_aout, _("Audio filtering failed"),
+ _("The maximum number of filters (%d) was reached."),
+ AOUT_MAX_FILTERS );
return -1;
}
pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
{
ReleaseFilter( pp_filters[0] );
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
- intf_UserFatal( p_aout, false, _("Audio filtering failed"),
- _("The maximum number of filters (%d) was reached."),
- AOUT_MAX_FILTERS );
+ dialog_Fatal( p_aout, _("Audio filtering failed"),
+ _("The maximum number of filters (%d) was reached."),
+ AOUT_MAX_FILTERS );
return -1;
}
pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
p_first_alloc->i_bytes_per_sec = __MAX(
p_first_alloc->i_bytes_per_sec,
i_input_size );
- p_filter->output_alloc.i_alloc_type = AOUT_ALLOC_NONE;
+ p_filter->output_alloc.b_alloc = false;
}
else
{
/* We're gonna need a buffer allocation. */
memcpy( &p_filter->output_alloc, p_first_alloc,
sizeof(aout_alloc_t) );
- p_first_alloc->i_alloc_type = AOUT_ALLOC_STACK;
+ p_first_alloc->b_alloc = true;
p_first_alloc->i_bytes_per_sec = i_input_size;
}
}
/* Resamplers can produce slightly more samples than (i_in_nb *
* p_filter->output.i_rate / p_filter->input.i_rate) so we need
* slightly bigger buffers. */
- aout_BufferAlloc( &p_filter->output_alloc,
- ((mtime_t)(*pp_input_buffer)->i_nb_samples + 2)
- * 1000000 / p_filter->input.i_rate,
- *pp_input_buffer, p_output_buffer );
+ p_output_buffer = aout_BufferAlloc( &p_filter->output_alloc,
+ ((mtime_t)(*pp_input_buffer)->i_nb_samples + 2)
+ * 1000000 / p_filter->input.i_rate,
+ *pp_input_buffer );
if( p_output_buffer == NULL )
return;
+ p_output_buffer->i_pts = (*pp_input_buffer)->i_pts;
+ p_output_buffer->i_length = (*pp_input_buffer)->i_length;
- /* Please note that p_output_buffer->i_nb_samples & i_nb_bytes
+ /* Please note that p_output_buffer->i_nb_samples & i_buffer
* shall be set by the filter plug-in. */
if( (*pp_input_buffer)->i_nb_samples > 0 )
{
}
else
{
- p_output_buffer->i_nb_bytes = 0;
+ p_output_buffer->i_buffer = 0;
p_output_buffer->i_nb_samples = 0;
}
*pp_input_buffer = p_output_buffer;
}
}
-
- assert( (*pp_input_buffer) == NULL || (*pp_input_buffer)->i_alloc_type != AOUT_ALLOC_STACK );
-}
-
-/*****************************************************************************
- * aout_filter_RequestVout
- *****************************************************************************/
-vout_thread_t *aout_filter_RequestVout( aout_filter_t *p_filter,
- vout_thread_t *p_vout, video_format_t *p_fmt )
-{
- if( !p_filter->request_vout.pf_request_vout )
- return NULL;
- return p_filter->request_vout.pf_request_vout( p_filter->request_vout.p_private, p_vout, p_fmt );
}