/*****************************************************************************
* trivial.c : trivial resampler (skips samples or pads with zeroes)
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.7 2002/10/15 23:10:54 massiot Exp $
+ * Copyright (C) 2002, 2006 the VideoLAN team
+ * $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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
#include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
/*****************************************************************************
* Local prototypes
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("audio filter for trivial resampling") );
+ set_description( _("Audio filter for trivial resampling") );
set_capability( "audio filter", 1 );
+ set_category( CAT_AUDIO );
+ set_subcategory( SUBCAT_AUDIO_MISC );
set_callbacks( Create, NULL );
vlc_module_end();
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 = 1;
+ p_filter->b_in_place = VLC_TRUE;
return 0;
}
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 = aout_FormatNbChannels( &p_filter->input ) * sizeof(s32);
+ int i_sample_bytes = aout_FormatNbChannels( &p_filter->input )
+ * sizeof(int32_t);
+
+ /* Check if we really need to run the resampler */
+ if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate )
+ {
+ return;
+ }
if ( p_out_buf != p_in_buf )
{
/* For whatever reason the buffer allocator decided to allocate
* a new buffer. Currently, this never happens. */
- p_aout->p_vlc->pf_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer,
- __MIN(i_out_nb, i_in_nb) * i_frame_bytes );
+ p_aout->p_libvlc->pf_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer,
+ __MIN(i_out_nb, i_in_nb) * i_sample_bytes );
}
if ( i_out_nb > i_in_nb )
{
/* Pad with zeroes. */
- memset( p_out_buf->p_buffer + i_in_nb * i_frame_bytes,
- 0, (i_out_nb - i_in_nb) * i_frame_bytes );
+ memset( p_out_buf->p_buffer + i_in_nb * i_sample_bytes,
+ 0, (i_out_nb - i_in_nb) * i_sample_bytes );
}
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;
}
-