* ugly.c : ugly resampler (changes pitch)
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: ugly.c,v 1.4 2002/10/15 23:10:54 massiot Exp $
+ * $Id: ugly.c,v 1.9 2003/03/04 03:27:40 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
if ( p_filter->input.i_rate == p_filter->output.i_rate
|| p_filter->input.i_format != p_filter->output.i_format
- || p_filter->input.i_channels != p_filter->output.i_channels
+ || p_filter->input.i_physical_channels
+ != p_filter->output.i_physical_channels
+ || p_filter->input.i_original_channels
+ != p_filter->output.i_original_channels
|| (p_filter->input.i_format != VLC_FOURCC('f','l','3','2')
&& p_filter->input.i_format != VLC_FOURCC('f','i','3','2')) )
{
}
p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = VLC_FALSE;
+
+ /* We don't want a new buffer to be created because we're not sure we'll
+ * actually need to resample anything. */
+ p_filter->b_in_place = VLC_TRUE;
return VLC_SUCCESS;
}
static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
- s32* p_in = (s32*)p_in_buf->p_buffer;
- s32* p_out = (s32*)p_out_buf->p_buffer;
+ int32_t *p_in, *p_out = (int32_t*)p_out_buf->p_buffer;
- int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
- int i_in_nb = p_in_buf->i_nb_samples;
- int i_out_nb = i_in_nb * p_filter->output.i_rate
- / p_filter->input.i_rate;
- int i_frame_bytes = i_nb_channels * sizeof(s32);
- int i_out, i_chan, i_remainder = 0;
+ unsigned int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
+ unsigned int i_in_nb = p_in_buf->i_nb_samples;
+ unsigned int i_out_nb = i_in_nb * p_filter->output.i_rate
+ / p_filter->input.i_rate;
+ unsigned int i_sample_bytes = i_nb_channels * sizeof(int32_t);
+ unsigned int i_out, i_chan, i_remainder = 0;
+
+ /* Check if we really need to run the resampler */
+ if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate )
+ {
+ return;
+ }
+
+#ifdef HAVE_ALLOCA
+ p_in = (int32_t *)alloca( p_in_buf->i_nb_bytes );
+#else
+ p_in = (int32_t *)malloc( p_in_buf->i_nb_bytes );
+#endif
+ if( p_in == NULL )
+ {
+ return;
+ }
+
+ p_aout->p_vlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
for( i_out = i_out_nb ; i_out-- ; )
{
}
p_out_buf->i_nb_samples = i_out_nb;
- p_out_buf->i_nb_bytes = i_out_nb * i_frame_bytes;
+ p_out_buf->i_nb_bytes = i_out_nb * i_sample_bytes;
+ p_out_buf->start_date = p_in_buf->start_date;
+ p_out_buf->end_date = p_out_buf->start_date + p_out_buf->i_nb_samples *
+ 1000000 / p_filter->output.i_rate;
}
-