/*****************************************************************************
* linear.c : linear interpolation resampler
*****************************************************************************
- * Copyright (C) 2002 the VideoLAN team
+ * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
-#include "vlc_filter.h"
-#include "vlc_block.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>
+#include <vlc_block.h>
/*****************************************************************************
* Local prototypes
unsigned int i_remainder; /* remainder of previous sample */
- audio_date_t end_date;
+ date_t end_date;
};
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("audio filter for linear interpolation resampling") );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_MISC );
- set_capability( "audio filter", 5 );
- set_callbacks( Create, Close );
-
- add_submodule();
- set_description( _("audio filter for linear interpolation resampling") );
- set_capability( "audio filter2", 5 );
- set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Audio filter for linear interpolation resampling") )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_capability( "audio filter", 5 )
+ set_callbacks( Create, Close )
+
+ add_submodule ()
+ set_description( N_("Audio filter for linear interpolation resampling") )
+ set_capability( "audio filter2", 5 )
+ set_callbacks( OpenFilter, CloseFilter )
+vlc_module_end ()
/*****************************************************************************
* Create: allocate linear resampler
{
aout_filter_t * p_filter = (aout_filter_t *)p_this;
struct filter_sys_t * p_sys;
-
+
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_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_CODEC_FL32 )
{
return VLC_EGENERIC;
}
p_sys = malloc( sizeof(filter_sys_t) );
p_filter->p_sys = (struct aout_filter_sys_t *)p_sys;
if( p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_sys->p_prev_sample = malloc(
- aout_FormatNbChannels( &p_filter->input ) * sizeof(int32_t) );
+ p_filter->input.i_channels * sizeof(int32_t) );
if( p_sys->p_prev_sample == NULL )
{
- msg_Err( p_filter, "out of memory" );
+ free( p_sys );
return VLC_ENOMEM;
}
+ date_Init( &p_sys->end_date, p_filter->output.i_rate, 1 );
p_filter->pf_do_work = DoWork;
/* 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;
+ p_filter->b_in_place = true;
return VLC_SUCCESS;
}
{
aout_filter_t * p_filter = (aout_filter_t *)p_this;
filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
-
+
free( p_sys->p_prev_sample );
free( p_sys );
}
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
- float *p_in, *p_out = (float *)p_out_buf->p_buffer;
+ float *p_out = (float *)p_out_buf->p_buffer;
float *p_prev_sample = (float *)p_sys->p_prev_sample;
- int i_nb_channels = aout_FormatNbChannels( &p_filter->input );
+ int i_nb_channels = p_filter->input.i_channels;
int i_in_nb = p_in_buf->i_nb_samples;
int i_chan, i_in, i_out = 0;
/* Check if we really need to run the resampler */
- if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate )
+ if( p_aout->mixer_format.i_rate == p_filter->input.i_rate )
{
if( p_filter->b_continuity &&
p_in_buf->i_size >=
memcpy( p_in_buf->p_buffer, p_prev_sample,
i_nb_channels * sizeof(float) );
}
- p_filter->b_continuity = VLC_FALSE;
+ p_filter->b_continuity = false;
return;
}
-#ifdef HAVE_ALLOCA
- p_in = (float *)alloca( p_in_buf->i_nb_bytes );
-#else
- p_in_orig = p_in = (float *)malloc( p_in_buf->i_nb_bytes );
-#endif
- if( p_in == NULL )
- {
- return;
- }
+ float p_in_orig[p_in_buf->i_nb_bytes / 4], *p_in = p_in_orig;
- p_aout->p_vlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
+ vlc_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
/* Take care of the previous input sample (if any) */
if( !p_filter->b_continuity )
{
- p_filter->b_continuity = VLC_TRUE;
+ p_filter->b_continuity = true;
p_sys->i_remainder = 0;
- aout_DateInit( &p_sys->end_date, p_filter->output.i_rate );
+ date_Init( &p_sys->end_date, p_filter->output.i_rate, 1 );
}
else
{
}
p_out_buf->i_nb_samples = i_out;
- p_out_buf->start_date = p_in_buf->start_date;
+ p_out_buf->i_pts = p_in_buf->i_pts;
- if( p_in_buf->start_date !=
- aout_DateGet( &p_sys->end_date ) )
+ if( p_in_buf->i_pts !=
+ date_Get( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, p_in_buf->start_date );
+ date_Set( &p_sys->end_date, p_in_buf->i_pts );
}
- p_out_buf->end_date = aout_DateIncrement( &p_sys->end_date,
+ p_out_buf->end_date = date_Increment( &p_sys->end_date,
p_out_buf->i_nb_samples );
p_out_buf->i_nb_bytes = p_out_buf->i_nb_samples *
i_nb_channels * sizeof(int32_t);
-
-#ifndef HAVE_ALLOCA
- free( p_in_orig );
-#endif
-
}
/*****************************************************************************
int i_out_rate = p_filter->fmt_out.audio.i_rate;
if( p_filter->fmt_in.audio.i_rate == p_filter->fmt_out.audio.i_rate ||
- p_filter->fmt_in.i_codec != VLC_FOURCC('f','l','3','2') )
+ p_filter->fmt_in.i_codec != VLC_CODEC_FL32 )
{
return VLC_EGENERIC;
}
-
+
/* Allocate the memory needed to store the module's structure */
p_filter->p_sys = p_sys = malloc( sizeof(struct filter_sys_t) );
if( p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_sys->p_prev_sample = malloc(
p_filter->fmt_in.audio.i_channels * sizeof(int32_t) );
if( p_sys->p_prev_sample == NULL )
{
- msg_Err( p_filter, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
+ date_Init( &p_sys->end_date, p_filter->fmt_in.audio.i_rate, 1 );
p_filter->pf_audio_filter = Resample;
int i_out_size;
int i_bytes_per_frame;
- if( !p_block || !p_block->i_samples )
+ if( !p_block || !p_block->i_nb_samples )
{
- if( p_block ) p_block->pf_release( p_block );
+ if( p_block )
+ block_Release( p_block );
return NULL;
}
-
+
i_bytes_per_frame = p_filter->fmt_out.audio.i_channels *
p_filter->fmt_out.audio.i_bitspersample / 8;
-
- i_out_size = i_bytes_per_frame * ( 1 + (p_block->i_samples *
+
+ i_out_size = i_bytes_per_frame * ( 1 + (p_block->i_nb_samples *
p_filter->fmt_out.audio.i_rate / p_filter->fmt_in.audio.i_rate));
p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
if( !p_out )
{
msg_Warn( p_filter, "can't get output buffer" );
- p_block->pf_release( p_block );
+ block_Release( p_block );
return NULL;
}
- p_out->i_samples = i_out_size / i_bytes_per_frame;
+ p_out->i_nb_samples = i_out_size / i_bytes_per_frame;
p_out->i_dts = p_block->i_dts;
p_out->i_pts = p_block->i_pts;
p_out->i_length = p_block->i_length;
aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
aout_filter.input = p_filter->fmt_in.audio;
aout_filter.output = p_filter->fmt_out.audio;
- aout_filter.b_continuity = VLC_FALSE;
+ aout_filter.b_continuity = false;
in_buf.p_buffer = p_block->p_buffer;
in_buf.i_nb_bytes = p_block->i_buffer;
- in_buf.i_nb_samples = p_block->i_samples;
+ in_buf.i_nb_samples = p_block->i_nb_samples;
out_buf.p_buffer = p_out->p_buffer;
out_buf.i_nb_bytes = p_out->i_buffer;
- out_buf.i_nb_samples = p_out->i_samples;
+ out_buf.i_nb_samples = p_out->i_nb_samples;
DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
- p_block->pf_release( p_block );
-
+ block_Release( p_block );
+
p_out->i_buffer = out_buf.i_nb_bytes;
- p_out->i_samples = out_buf.i_nb_samples;
+ p_out->i_nb_samples = out_buf.i_nb_samples;
return p_out;
}
projects / vlc / blobdiff