/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
-#include <vlc/vlc.h>
-#include <vlc_interface.h>
+#include <vlc_common.h>
+#include <vlc_dialog.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#include <vlc_aout.h>
#include "aout_internal.h"
+#include <libvlc.h>
/*****************************************************************************
* FindFilter: find an audio filter for a specific transformation
const audio_sample_format_t * p_input_format,
const audio_sample_format_t * p_output_format )
{
- aout_filter_t * p_filter = vlc_object_create( p_aout,
- sizeof(aout_filter_t) );
+ static const char typename[] = "audio output";
+ aout_filter_t * p_filter;
+
+ p_filter = vlc_custom_create( p_aout, sizeof(*p_filter),
+ VLC_OBJECT_GENERIC, typename );
if ( p_filter == NULL ) return NULL;
vlc_object_attach( p_filter, p_aout );
memcpy( &p_filter->input, p_input_format, sizeof(audio_sample_format_t) );
memcpy( &p_filter->output, p_output_format,
sizeof(audio_sample_format_t) );
- p_filter->p_module = module_Need( p_filter, "audio filter", NULL, 0 );
+ p_filter->p_module = module_need( p_filter, "audio filter", NULL, false );
if ( p_filter->p_module == NULL )
{
vlc_object_detach( p_filter );
- vlc_object_destroy( p_filter );
+ vlc_object_release( p_filter );
return NULL;
}
- p_filter->b_continuity = VLC_FALSE;
+ p_filter->b_continuity = false;
return p_filter;
}
const audio_sample_format_t * p_output_format,
audio_sample_format_t * p_middle_format )
{
- vlc_bool_t b_format =
+ bool b_format =
(p_input_format->i_format != p_output_format->i_format);
- vlc_bool_t b_rate = (p_input_format->i_rate != p_output_format->i_rate);
- vlc_bool_t b_channels =
+ bool b_rate = (p_input_format->i_rate != p_output_format->i_rate);
+ bool b_channels =
(p_input_format->i_physical_channels
!= p_output_format->i_physical_channels)
|| (p_input_format->i_original_channels
static void ReleaseFilter( aout_filter_t * p_filter )
{
- module_Unneed( p_filter, p_filter->p_module );
+ module_unneed( p_filter, p_filter->p_module );
vlc_object_detach( p_filter );
- vlc_object_destroy( p_filter );
+ vlc_object_release( p_filter );
}
/*****************************************************************************
if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS )
{
msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
- intf_UserFatal( p_aout, VLC_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, VLC_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, VLC_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,
for ( i = 0; i < i_nb_filters; i++ )
{
- module_Unneed( pp_filters[i], pp_filters[i]->p_module );
- vlc_object_detach( pp_filters[i] );
- vlc_object_destroy( pp_filters[i] );
+ aout_filter_t *p_filter = pp_filters[i];
+
+ module_unneed( p_filter, p_filter->p_module );
+ free( p_filter->p_owner );
+ vlc_object_detach( p_filter );
+ vlc_object_release( p_filter );
}
}
aout_filter_t * p_filter = pp_filters[i];
int i_output_size = p_filter->output.i_bytes_per_frame
- * p_filter->output.i_rate
+ * p_filter->output.i_rate * AOUT_MAX_INPUT_RATE
/ p_filter->output.i_frame_length;
int i_input_size = p_filter->input.i_bytes_per_frame
- * p_filter->input.i_rate
+ * p_filter->input.i_rate * AOUT_MAX_INPUT_RATE
/ p_filter->input.i_frame_length;
p_first_alloc->i_bytes_per_sec = __MAX( p_first_alloc->i_bytes_per_sec,
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;
}
}
{
int i;
- for ( i = 0; i < i_nb_filters; i++ )
+ for( i = 0; i < i_nb_filters; i++ )
{
aout_filter_t * p_filter = pp_filters[i];
aout_buffer_t * p_output_buffer;
/* 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 );
- if ( p_output_buffer == NULL )
- {
- msg_Err( p_aout, "out of memory" );
+ 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->start_date = (*pp_input_buffer)->start_date;
+ p_output_buffer->end_date = (*pp_input_buffer)->end_date;
+
/* Please note that p_output_buffer->i_nb_samples & i_nb_bytes
* shall be set by the filter plug-in. */
+ if( (*pp_input_buffer)->i_nb_samples > 0 )
+ {
+ p_filter->pf_do_work( p_aout, p_filter, *pp_input_buffer,
+ p_output_buffer );
+ }
+ else
+ {
+ p_output_buffer->i_nb_bytes = 0;
+ p_output_buffer->i_nb_samples = 0;
+ }
- p_filter->pf_do_work( p_aout, p_filter, *pp_input_buffer,
- p_output_buffer );
-
- if ( !p_filter->b_in_place )
+ if( !p_filter->b_in_place )
{
aout_BufferFree( *pp_input_buffer );
*pp_input_buffer = p_output_buffer;
}
}
+/*****************************************************************************
+ * 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, true );
+}
+
projects / vlc / blobdiff