/*****************************************************************************
* filters.c : audio output filters management
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: filters.c,v 1.7 2002/08/28 22:25:39 massiot Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include <vlc/vlc.h>
#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
+# include <alloca.h>
#endif
#include "audio_output.h"
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 );
+ p_filter->p_module = module_Need( p_filter, "audio filter", NULL, 0 );
if ( p_filter->p_module == NULL )
{
vlc_object_detach( p_filter );
return NULL;
}
+ p_filter->b_continuity = VLC_FALSE;
+
return p_filter;
}
/*****************************************************************************
- * SplitConversion: split a conversion in two parts
+ * SplitConversion: split a conversion in two parts
*****************************************************************************
* Returns the number of conversions required by the first part - 0 if only
* one conversion was asked.
* developer passed SplitConversion( toto, titi, titi, ... ). That is legal.
* SplitConversion( toto, titi, toto, ... ) isn't.
*****************************************************************************/
-static int SplitConversion( aout_instance_t * p_aout,
- const audio_sample_format_t * p_input_format,
- const audio_sample_format_t * p_output_format,
- audio_sample_format_t * p_middle_format,
- vlc_bool_t b_format_first,
- vlc_bool_t b_rate_first )
+static int SplitConversion( const audio_sample_format_t * p_input_format,
+ const audio_sample_format_t * p_output_format,
+ audio_sample_format_t * p_middle_format )
{
vlc_bool_t 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 =
- (p_input_format->i_channels != p_output_format->i_channels);
+ (p_input_format->i_physical_channels
+ != p_output_format->i_physical_channels)
+ || (p_input_format->i_original_channels
+ != p_output_format->i_original_channels);
int i_nb_conversions = b_format + b_rate + b_channels;
if ( i_nb_conversions <= 1 ) return 0;
if ( i_nb_conversions == 2 )
{
- if ( !b_format )
- {
- if ( b_rate_first )
- {
- p_middle_format->i_channels = p_input_format->i_channels;
- }
- else
- {
- p_middle_format->i_rate = p_input_format->i_rate;
- }
- return 1;
- }
-
- if ( !b_rate )
+ if ( !b_format || !b_channels )
{
- if ( b_format_first )
- {
- p_middle_format->i_channels = p_input_format->i_channels;
- }
- else
- {
- p_middle_format->i_format = p_input_format->i_format;
- }
+ p_middle_format->i_rate = p_input_format->i_rate;
+ aout_FormatPrepare( p_middle_format );
return 1;
}
- /* !b_channels */
- if ( b_format_first )
- {
- p_middle_format->i_rate = p_input_format->i_rate;
- }
- else
- {
- p_middle_format->i_format = p_input_format->i_format;
- }
+ /* !b_rate */
+ p_middle_format->i_physical_channels
+ = p_input_format->i_physical_channels;
+ p_middle_format->i_original_channels
+ = p_input_format->i_original_channels;
+ aout_FormatPrepare( p_middle_format );
return 1;
}
/* i_nb_conversion == 3 */
- if ( !b_format_first )
- {
- p_middle_format->i_format = p_input_format->i_format;
- }
- else if ( !b_rate_first )
- {
- p_middle_format->i_channels = p_input_format->i_channels;
- }
- else
- {
- p_middle_format->i_rate = p_input_format->i_rate;
- }
-
+ p_middle_format->i_rate = p_input_format->i_rate;
+ aout_FormatPrepare( p_middle_format );
return 2;
}
const audio_sample_format_t * p_output_format )
{
audio_sample_format_t temp_format;
- vlc_bool_t b_format_first, b_rate_first;
+ int i_nb_conversions;
if ( AOUT_FMTS_IDENTICAL( p_input_format, p_output_format ) )
{
return 0;
}
- msg_Dbg( p_aout, "filter(s) format=%d->%d rate=%d->%d channels=%d->%d",
- p_input_format->i_format, p_output_format->i_format,
- p_input_format->i_rate, p_output_format->i_rate,
- p_input_format->i_channels, p_output_format->i_channels );
+ aout_FormatsPrint( p_aout, "filter(s)", p_input_format, p_output_format );
/* Try to find a filter to do the whole conversion. */
pp_filters[0] = FindFilter( p_aout, p_input_format, p_output_format );
return 0;
}
- /* We'll have to split the conversion. We always to the downmixing
- * before the resampling, and the upmixing after the resampling (to
- * maximize the resampling efficiency). */
- b_rate_first = (p_input_format->i_channels < p_output_format->i_channels);
-
- for ( b_format_first = 1; b_format_first >= 0; b_format_first-- )
+ /* We'll have to split the conversion. We always do the downmixing
+ * before the resampling, because the audio decoder can probably do it
+ * for us. */
+ i_nb_conversions = SplitConversion( p_input_format,
+ p_output_format, &temp_format );
+ if ( !i_nb_conversions )
{
- int i_nb_conversions = SplitConversion( p_aout, p_input_format,
- p_output_format, &temp_format,
- b_format_first, b_rate_first );
- if ( !i_nb_conversions )
- {
- /* There was only one conversion to do, and we already failed. */
- msg_Err( p_aout, "couldn't find a filter for the conversion" );
- return -1;
- }
+ /* There was only one conversion to do, and we already failed. */
+ msg_Err( p_aout, "couldn't find a filter for the conversion" );
+ return -1;
+ }
+ pp_filters[0] = FindFilter( p_aout, p_input_format, &temp_format );
+ if ( pp_filters[0] == NULL && i_nb_conversions == 2 )
+ {
+ /* Try with only one conversion. */
+ SplitConversion( p_input_format, &temp_format, &temp_format );
pp_filters[0] = FindFilter( p_aout, p_input_format, &temp_format );
- if ( pp_filters[0] == NULL && i_nb_conversions == 2 )
- {
- /* Try with only one conversion. */
- SplitConversion( p_aout, p_input_format, &temp_format,
- &temp_format, b_format_first, b_rate_first );
- pp_filters[0] = FindFilter( p_aout, p_input_format,
- &temp_format );
- }
- if ( pp_filters[0] == NULL )
+ }
+ if ( pp_filters[0] == NULL )
+ {
+ msg_Err( p_aout,
+ "couldn't find a filter for the first part of the conversion" );
+ return -1;
+ }
+
+ /* We have the first stage of the conversion. Find a filter for
+ * the rest. */
+ pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
+ p_output_format );
+ if ( pp_filters[1] == NULL )
+ {
+ /* Try to split the conversion. */
+ i_nb_conversions = SplitConversion( &pp_filters[0]->output,
+ p_output_format, &temp_format );
+ if ( !i_nb_conversions )
{
- /* Retry with b_format_first = 0. */
- continue;
+ vlc_object_detach( pp_filters[0] );
+ vlc_object_destroy( pp_filters[0] );
+ msg_Err( p_aout,
+ "couldn't find a filter for the second part of the conversion" );
}
-
- /* We have the first stage of the conversion. Find a filter for
- * the rest. */
pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
+ &temp_format );
+ pp_filters[2] = FindFilter( p_aout, &temp_format,
p_output_format );
- if ( pp_filters[1] == NULL )
+
+ if ( pp_filters[1] == NULL || pp_filters[2] == NULL )
{
- /* Try to split the conversion. */
- i_nb_conversions = SplitConversion( p_aout,
- &pp_filters[0]->output,
- p_output_format, &temp_format,
- b_format_first, b_rate_first );
- if ( !i_nb_conversions )
+ vlc_object_detach( pp_filters[0] );
+ vlc_object_destroy( pp_filters[0] );
+ if ( pp_filters[1] != NULL )
{
- vlc_object_detach( pp_filters[0] );
- vlc_object_destroy( pp_filters[0] );
- continue;
+ vlc_object_detach( pp_filters[1] );
+ vlc_object_destroy( pp_filters[1] );
}
- pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
- &temp_format );
- pp_filters[2] = FindFilter( p_aout, &temp_format,
- p_output_format );
-
- if ( pp_filters[1] == NULL || pp_filters[2] == NULL )
+ if ( pp_filters[2] != NULL )
{
- vlc_object_detach( pp_filters[0] );
- vlc_object_destroy( pp_filters[0] );
- if ( pp_filters[1] != NULL )
- {
- vlc_object_detach( pp_filters[1] );
- vlc_object_destroy( pp_filters[1] );
- }
- if ( pp_filters[2] != NULL )
- {
- vlc_object_detach( pp_filters[2] );
- vlc_object_destroy( pp_filters[2] );
- }
- continue;
+ vlc_object_detach( pp_filters[2] );
+ vlc_object_destroy( pp_filters[2] );
}
- *pi_nb_filters = 3;
- }
- else
- {
- *pi_nb_filters = 2;
+ msg_Err( p_aout,
+ "couldn't find filters for the second part of the conversion" );
}
-
- /* We have enough filters. */
- msg_Dbg( p_aout, "found %d filters for the whole conversion",
- *pi_nb_filters );
- return 0;
+ *pi_nb_filters = 3;
+ }
+ else
+ {
+ *pi_nb_filters = 2;
}
- msg_Err( p_aout, "couldn't find filters for the conversion" );
- return -1;
+ /* We have enough filters. */
+ msg_Dbg( p_aout, "found %d filters for the whole conversion",
+ *pi_nb_filters );
+ return 0;
}
/*****************************************************************************
{
int i;
+ (void)p_aout; /* unused */
+
for ( i = i_nb_filters - 1; i >= 0; i-- )
{
aout_filter_t * p_filter = pp_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 * 1000000
- / p_filter->input.i_rate, *pp_input_buffer,
- p_output_buffer );
+ ((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" );
projects / vlc / blobdiff