#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
+#include <vlc_filter.h>
#include <string.h> /* for memset */
#include <limits.h> /* form INT_MIN */
*****************************************************************************/
static int Open( vlc_object_t * );
static void Close( 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 * );
vlc_module_begin ()
set_description( N_("Audio tempo scaler synched with rate") )
* frame: a single set of samples, one for each channel
* VLC uses these terms differently
*/
-struct aout_filter_sys_t
+struct filter_sys_t
{
/* Filter static config */
double scale;
unsigned bytes_standing;
void *buf_overlap;
void *table_blend;
- void (*output_overlap)( aout_filter_t *p_filter, void *p_out_buf, unsigned bytes_off );
+ void (*output_overlap)( filter_t *p_filter, void *p_out_buf, unsigned bytes_off );
/* best overlap */
unsigned frames_search;
void *buf_pre_corr;
void *table_window;
- unsigned(*best_overlap_offset)( aout_filter_t *p_filter );
- /* for "audio filter" only, manage own buffers */
- int i_buf;
- uint8_t *p_buffers[2];
+ unsigned(*best_overlap_offset)( filter_t *p_filter );
};
/*****************************************************************************
* best_overlap_offset: calculate best offset for overlap
*****************************************************************************/
-static unsigned best_overlap_offset_float( aout_filter_t *p_filter )
+static unsigned best_overlap_offset_float( filter_t *p_filter )
{
- aout_filter_sys_t *p = p_filter->p_sys;
+ filter_sys_t *p = p_filter->p_sys;
float *pw, *po, *ppc, *search_start;
float best_corr = INT_MIN;
unsigned best_off = 0;
/*****************************************************************************
* output_overlap: blend end of previous stride with beginning of current stride
*****************************************************************************/
-static void output_overlap_float( aout_filter_t *p_filter,
+static void output_overlap_float( filter_t *p_filter,
void *buf_out,
unsigned bytes_off )
{
- aout_filter_sys_t *p = p_filter->p_sys;
+ filter_sys_t *p = p_filter->p_sys;
float *pout = buf_out;
float *pb = p->table_blend;
float *po = p->buf_overlap;
/*****************************************************************************
* fill_queue: fill p_sys->buf_queue as much possible, skipping samples as needed
*****************************************************************************/
-static size_t fill_queue( aout_filter_t *p_filter,
+static size_t fill_queue( filter_t *p_filter,
uint8_t *p_buffer,
size_t i_buffer,
size_t offset )
{
- aout_filter_sys_t *p = p_filter->p_sys;
+ filter_sys_t *p = p_filter->p_sys;
unsigned bytes_in = i_buffer - offset;
size_t offset_unchanged = offset;
/*****************************************************************************
* transform_buffer: main filter loop
*****************************************************************************/
-static size_t transform_buffer( aout_filter_t *p_filter,
+static size_t transform_buffer( filter_t *p_filter,
uint8_t *p_buffer,
size_t i_buffer,
uint8_t *pout )
{
- aout_filter_sys_t *p = p_filter->p_sys;
+ filter_sys_t *p = p_filter->p_sys;
size_t offset_in = fill_queue( p_filter, p_buffer, i_buffer, 0 );
unsigned bytes_out = 0;
/*****************************************************************************
* calculate_output_buffer_size
*****************************************************************************/
-static size_t calculate_output_buffer_size( aout_filter_t *p_filter,
+static size_t calculate_output_buffer_size( filter_t *p_filter,
size_t bytes_in )
{
- aout_filter_sys_t *p = p_filter->p_sys;
+ filter_sys_t *p = p_filter->p_sys;
size_t bytes_out = 0;
int bytes_to_out = bytes_in + p->bytes_queued - p->bytes_to_slide;
if( bytes_to_out >= (int)p->bytes_queue_max ) {
/*****************************************************************************
* reinit_buffers: reinitializes buffers in p_filter->p_sys
*****************************************************************************/
-static int reinit_buffers( aout_filter_t *p_filter )
+static int reinit_buffers( filter_t *p_filter )
{
- aout_filter_sys_t *p = p_filter->p_sys;
+ filter_sys_t *p = p_filter->p_sys;
unsigned i,j;
unsigned frames_stride = p->ms_stride * p->sample_rate / 1000.0;
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- aout_filter_t *p_filter = (aout_filter_t *)p_this;
- aout_filter_sys_t *p_sys;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys;
bool b_fit = true;
- if( p_filter->input.i_format != VLC_CODEC_FL32 ||
- p_filter->output.i_format != VLC_CODEC_FL32 )
+ if( p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 ||
+ p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
{
b_fit = false;
- p_filter->input.i_format = p_filter->output.i_format = VLC_CODEC_FL32;
+ p_filter->fmt_in.audio.i_format = p_filter->fmt_out.audio.i_format = VLC_CODEC_FL32;
msg_Warn( p_filter, "bad input or output format" );
}
- if( ! AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+ if( ! AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
{
b_fit = false;
- memcpy( &p_filter->output, &p_filter->input, sizeof(audio_sample_format_t) );
+ memcpy( &p_filter->fmt_out.audio, &p_filter->fmt_in.audio, sizeof(audio_sample_format_t) );
msg_Warn( p_filter, "input and output formats are not similar" );
}
if( ! b_fit )
return VLC_EGENERIC;
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = false;
-
/* Allocate structure */
- p_sys = p_filter->p_sys = malloc( sizeof(aout_filter_sys_t) );
+ p_sys = p_filter->p_sys = malloc( sizeof(*p_sys) );
if( ! p_sys )
return VLC_ENOMEM;
+ p_filter->pf_audio_filter = DoWork;
+
p_sys->scale = 1.0;
- p_sys->sample_rate = p_filter->input.i_rate;
- p_sys->samples_per_frame = aout_FormatNbChannels( &p_filter->input );
+ p_sys->sample_rate = p_filter->fmt_in.audio.i_rate;
+ p_sys->samples_per_frame = aout_FormatNbChannels( &p_filter->fmt_in.audio );
p_sys->bytes_per_sample = 4;
p_sys->bytes_per_frame = p_sys->samples_per_frame * p_sys->bytes_per_sample;
p_sys->bytes_per_sample,
"fl32" );
- p_sys->ms_stride = config_GetInt( p_this, "scaletempo-stride" );
- p_sys->percent_overlap = config_GetFloat( p_this, "scaletempo-overlap" );
- p_sys->ms_search = config_GetInt( p_this, "scaletempo-search" );
+ p_sys->ms_stride = var_InheritInteger( p_this, "scaletempo-stride" );
+ p_sys->percent_overlap = var_InheritFloat( p_this, "scaletempo-overlap" );
+ p_sys->ms_search = var_InheritInteger( p_this, "scaletempo-search" );
msg_Dbg( p_this, "params: %i stride, %.3f overlap, %i search",
p_sys->ms_stride, p_sys->percent_overlap, p_sys->ms_search );
- p_sys->i_buf = 0;
- p_sys->p_buffers[0] = NULL;
- p_sys->p_buffers[1] = NULL;
-
p_sys->buf_queue = NULL;
p_sys->buf_overlap = NULL;
p_sys->table_blend = NULL;
static void Close( vlc_object_t *p_this )
{
- aout_filter_t *p_filter = (aout_filter_t *)p_this;
- aout_filter_sys_t *p_sys = p_filter->p_sys;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
free( p_sys->buf_queue );
free( p_sys->buf_overlap );
free( p_sys->table_blend );
free( p_sys->buf_pre_corr );
free( p_sys->table_window );
- free( p_sys->p_buffers[0] );
- free( p_sys->p_buffers[1] );
- free( p_filter->p_sys );
+ free( p_sys );
}
/*****************************************************************************
- * DoWork: aout_filter wrapper for transform_buffer
+ * DoWork: filter wrapper for transform_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_in_buf )
{
- VLC_UNUSED(p_aout);
- aout_filter_sys_t *p = p_filter->p_sys;
-
- if( p_filter->input.i_rate == p->sample_rate ) {
- memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
- p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- return;
- }
+ filter_sys_t *p = p_filter->p_sys;
+
+ if( p_filter->fmt_in.audio.i_rate == p->sample_rate )
+ return p_in_buf;
- double scale = p_filter->input.i_rate / (double)p->sample_rate;
+ double scale = p_filter->fmt_in.audio.i_rate / (double)p->sample_rate;
if( scale != p->scale ) {
p->scale = scale;
p->bytes_stride_scaled = p->bytes_stride * p->scale;
(int)( p->bytes_stride / p->bytes_per_frame ) );
}
- size_t i_outsize = calculate_output_buffer_size ( p_filter, p_in_buf->i_nb_bytes );
- if( i_outsize > p_out_buf->i_size ) {
- void *temp = realloc( p->p_buffers[ p->i_buf ], i_outsize );
- if( temp == NULL )
- {
- return;
- }
- p->p_buffers[ p->i_buf ] = temp;
- p_out_buf->p_buffer = p->p_buffers[ p->i_buf ];
- p->i_buf = ! p->i_buf;
- }
+ size_t i_outsize = calculate_output_buffer_size ( p_filter, p_in_buf->i_buffer );
+ block_t *p_out_buf = filter_NewAudioBuffer( p_filter, i_outsize );
+ if( p_out_buf == NULL )
+ return NULL;
size_t bytes_out = transform_buffer( p_filter,
- p_in_buf->p_buffer, p_in_buf->i_nb_bytes,
+ p_in_buf->p_buffer, p_in_buf->i_buffer,
p_out_buf->p_buffer );
- p_out_buf->i_nb_bytes = bytes_out;
+ p_out_buf->i_buffer = bytes_out;
p_out_buf->i_nb_samples = bytes_out / p->bytes_per_frame;
+ p_out_buf->i_dts = p_in_buf->i_dts;
+ p_out_buf->i_pts = p_in_buf->i_pts;
+ p_out_buf->i_length = p_in_buf->i_length;
+
+ block_Release( p_in_buf );
+ return p_out_buf;
}