/*****************************************************************************
* 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-2009 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"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
+#include <vlc_filter.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Create ( vlc_object_t * );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
- aout_buffer_t * );
+static block_t *DoWork( filter_t *, block_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("audio filter for trivial resampling") );
- set_capability( "audio filter", 1 );
- set_callbacks( Create, NULL );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Audio filter for trivial resampling") )
+ set_capability( "audio filter2", 1 )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_callbacks( Create, NULL )
+vlc_module_end ()
/*****************************************************************************
* Create: allocate trivial resampler
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
- aout_filter_t * p_filter = (aout_filter_t *)p_this;
+ filter_t * p_filter = (filter_t *)p_this;
- 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_format != VLC_FOURCC('f','l','3','2')
- && p_filter->input.i_format != VLC_FOURCC('f','i','3','2')) )
+ if ( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate
+ || p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format
+ || p_filter->fmt_in.audio.i_physical_channels
+ != p_filter->fmt_out.audio.i_physical_channels
+ || p_filter->fmt_in.audio.i_original_channels
+ != p_filter->fmt_out.audio.i_original_channels
+ || (p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32
+ && p_filter->fmt_in.audio.i_format != VLC_CODEC_FI32) )
{
- return -1;
+ return VLC_EGENERIC;
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 1;
-
- return 0;
+ p_filter->pf_audio_filter = DoWork;
+ return VLC_SUCCESS;
}
/*****************************************************************************
* DoWork: convert a buffer
*****************************************************************************/
-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 )
+static block_t *DoWork( filter_t * p_filter, block_t * p_block )
{
- 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);
+ /* Check if we really need to run the resampler */
+ if( p_filter->fmt_out.audio.i_rate == p_filter->fmt_in.audio.i_rate )
+ return p_block;
- 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 );
- }
+ int i_in_nb = p_block->i_nb_samples;
+ int i_out_nb = i_in_nb * p_filter->fmt_out.audio.i_rate
+ / p_filter->fmt_in.audio.i_rate;
+ int i_sample_bytes = aout_FormatNbChannels( &p_filter->fmt_in.audio )
+ * sizeof(int32_t);
+
+ p_block = block_Realloc( p_block, 0, i_out_nb * i_sample_bytes );
+ if( !p_block )
+ return NULL;
- if ( i_out_nb > i_in_nb )
+ 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_block->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_block->i_nb_samples = i_out_nb;
+ p_block->i_length = p_block->i_nb_samples *
+ CLOCK_FREQ / p_filter->fmt_out.audio.i_rate;
+ return p_block;
}
-