#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_("Scale audio tempo in sync with playback rate") );
- set_shortname( N_("Scaletempo") );
- set_capability( "audio filter", 0 );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_AFILTER );
+vlc_module_begin ()
+ set_description( N_("Audio tempo scaler synched with rate") )
+ set_shortname( N_("Scaletempo") )
+ set_capability( "audio filter", 0 )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
add_integer_with_range( "scaletempo-stride", 30, 1, 2000, NULL,
- N_("Stride Length"), N_("Length in milliseconds to output each stride"), true );
+ N_("Stride Length"), N_("Length in milliseconds to output each stride"), true )
add_float_with_range( "scaletempo-overlap", .20, 0.0, 1.0, NULL,
- N_("Overlap Length"), N_("Percentage of stride to overlap"), true );
+ N_("Overlap Length"), N_("Percentage of stride to overlap"), true )
add_integer_with_range( "scaletempo-search", 14, 0, 200, NULL,
- N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true );
+ N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true )
- set_callbacks( Open, Close );
-vlc_module_end();
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*
* Scaletempo works by producing audio in constant sized chunks (a "stride") but
* frame: a single set of samples, one for each channel
* VLC uses these terms differently
*/
-typedef struct aout_filter_sys_t
+struct filter_sys_t
{
/* Filter static config */
double scale;
/* parameters */
- uint ms_stride;
+ unsigned ms_stride;
double percent_overlap;
- uint ms_search;
+ unsigned ms_search;
/* audio format */
- uint samples_per_frame; /* AKA number of channels */
- uint bytes_per_sample;
- uint bytes_per_frame;
- uint sample_rate;
+ unsigned samples_per_frame; /* AKA number of channels */
+ unsigned bytes_per_sample;
+ unsigned bytes_per_frame;
+ unsigned sample_rate;
/* stride */
double frames_stride_scaled;
double frames_stride_error;
- uint bytes_stride;
+ unsigned bytes_stride;
double bytes_stride_scaled;
- uint bytes_queue_max;
- uint bytes_queued;
- uint bytes_to_slide;
+ unsigned bytes_queue_max;
+ unsigned bytes_queued;
+ unsigned bytes_to_slide;
uint8_t *buf_queue;
/* overlap */
- uint samples_overlap;
- uint samples_standing;
- uint bytes_overlap;
- uint bytes_standing;
+ unsigned samples_overlap;
+ unsigned samples_standing;
+ unsigned bytes_overlap;
+ unsigned bytes_standing;
void *buf_overlap;
void *table_blend;
- void (*output_overlap)( aout_filter_t *p_filter, void *p_out_buf, uint bytes_off );
+ void (*output_overlap)( filter_t *p_filter, void *p_out_buf, unsigned bytes_off );
/* best overlap */
- uint frames_search;
+ unsigned frames_search;
void *buf_pre_corr;
void *table_window;
- uint (*best_overlap_offset)( aout_filter_t *p_filter );
- /* for "audio filter" only, manage own buffers */
- int i_buf;
- uint8_t *p_buffers[2];
-} aout_filter_sys_t;
+ unsigned(*best_overlap_offset)( filter_t *p_filter );
+};
/*****************************************************************************
* best_overlap_offset: calculate best offset for overlap
*****************************************************************************/
-static uint 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;
- uint best_off = 0;
- uint i, off;
+ unsigned best_off = 0;
+ unsigned i, off;
pw = p->table_window;
po = p->buf_overlap;
/*****************************************************************************
* 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,
- uint bytes_off )
+ 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;
float *pin = (float *)( p->buf_queue + bytes_off );
- uint i;
+ unsigned i;
for( i = 0; i < p->samples_overlap; i++ ) {
*pout++ = *po - *pb++ * ( *po - *pin++ ); po++;
}
/*****************************************************************************
* 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;
- uint bytes_in = i_buffer - offset;
+ filter_sys_t *p = p_filter->p_sys;
+ unsigned bytes_in = i_buffer - offset;
size_t offset_unchanged = offset;
if( p->bytes_to_slide > 0 ) {
if( p->bytes_to_slide < p->bytes_queued ) {
- uint bytes_in_move = p->bytes_queued - p->bytes_to_slide;
+ unsigned bytes_in_move = p->bytes_queued - p->bytes_to_slide;
memmove( p->buf_queue,
p->buf_queue + p->bytes_to_slide,
bytes_in_move );
p->bytes_to_slide = 0;
p->bytes_queued = bytes_in_move;
} else {
- uint bytes_in_skip;
+ unsigned bytes_in_skip;
p->bytes_to_slide -= p->bytes_queued;
bytes_in_skip = __MIN( p->bytes_to_slide, bytes_in );
p->bytes_queued = 0;
}
if( bytes_in > 0 ) {
- uint bytes_in_copy = __MIN( p->bytes_queue_max - p->bytes_queued, bytes_in );
+ unsigned bytes_in_copy = __MIN( p->bytes_queue_max - p->bytes_queued, bytes_in );
memcpy( p->buf_queue + p->bytes_queued,
p_buffer + offset,
bytes_in_copy );
/*****************************************************************************
* 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 );
- uint bytes_out = 0;
+ unsigned bytes_out = 0;
while( p->bytes_queued >= p->bytes_queue_max ) {
- uint bytes_off = 0;
+ unsigned bytes_off = 0;
// output stride
if( p->output_overlap ) {
p->buf_queue + bytes_off + p->bytes_stride,
p->bytes_overlap );
double frames_to_slide = p->frames_stride_scaled + p->frames_stride_error;
- uint frames_to_stride_whole = (int)frames_to_slide;
+ unsigned frames_to_stride_whole = (int)frames_to_slide;
p->bytes_to_slide = frames_to_stride_whole * p->bytes_per_frame;
p->frames_stride_error = frames_to_slide - frames_to_stride_whole;
/*****************************************************************************
* 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 ) {
/* while (total_buffered - stride_length * n >= queue_max) n++ */
- bytes_out = p->bytes_stride * ( (uint)(
+ bytes_out = p->bytes_stride * ( (unsigned)(
( bytes_to_out - p->bytes_queue_max + /* rounding protection */ p->bytes_per_frame )
/ p->bytes_stride_scaled ) + 1 );
}
/*****************************************************************************
* 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;
- uint i,j;
+ filter_sys_t *p = p_filter->p_sys;
+ unsigned i,j;
- uint frames_stride = p->ms_stride * p->sample_rate / 1000.0;
+ unsigned frames_stride = p->ms_stride * p->sample_rate / 1000.0;
p->bytes_stride = frames_stride * p->bytes_per_frame;
/* overlap */
- uint frames_overlap = frames_stride * p->percent_overlap;
- if( frames_overlap < 1 ) { /* if no overlap */
+ unsigned frames_overlap = frames_stride * p->percent_overlap;
+ if( frames_overlap < 1 )
+ { /* if no overlap */
p->bytes_overlap = 0;
p->bytes_standing = p->bytes_stride;
p->samples_standing = p->bytes_standing / p->bytes_per_sample;
p->output_overlap = NULL;
- } else {
- uint prev_overlap = p->bytes_overlap;
+ }
+ else
+ {
+ unsigned prev_overlap = p->bytes_overlap;
p->bytes_overlap = frames_overlap * p->bytes_per_frame;
p->samples_overlap = frames_overlap * p->samples_per_frame;
p->bytes_standing = p->bytes_stride - p->bytes_overlap;
p->samples_standing = p->bytes_standing / p->bytes_per_sample;
p->buf_overlap = malloc( p->bytes_overlap );
p->table_blend = malloc( p->samples_overlap * 4 ); /* sizeof (int32|float) */
- if( ! p->buf_overlap || ! p->table_blend ) {
+ if( !p->buf_overlap || !p->table_blend )
return VLC_ENOMEM;
- }
- if( p->bytes_overlap > prev_overlap ) {
+ if( p->bytes_overlap > prev_overlap )
memset( (uint8_t *)p->buf_overlap + prev_overlap, 0, p->bytes_overlap - prev_overlap );
- }
+
float *pb = p->table_blend;
float t = (float)frames_overlap;
- for( i = 0; i<frames_overlap; i++ ) {
+ for( i = 0; i<frames_overlap; i++ )
+ {
float v = i / t;
- for( j = 0; j < p->samples_per_frame; j++ ) {
+ for( j = 0; j < p->samples_per_frame; j++ )
*pb++ = v;
- }
}
p->output_overlap = output_overlap_float;
}
/* best overlap */
p->frames_search = ( frames_overlap <= 1 ) ? 0 : p->ms_search * p->sample_rate / 1000.0;
- if( p->frames_search < 1 ) { /* if no search */
+ if( p->frames_search < 1 )
+ { /* if no search */
p->best_overlap_offset = NULL;
- } else {
- uint bytes_pre_corr = ( p->samples_overlap - p->samples_per_frame ) * 4; /* sizeof (int32|float) */
+ }
+ else
+ {
+ unsigned bytes_pre_corr = ( p->samples_overlap - p->samples_per_frame ) * 4; /* sizeof (int32|float) */
p->buf_pre_corr = malloc( bytes_pre_corr );
p->table_window = malloc( bytes_pre_corr );
- if( ! p->buf_pre_corr || ! p->table_window ) {
+ if( ! p->buf_pre_corr || ! p->table_window )
return VLC_ENOMEM;
- }
float *pw = p->table_window;
- for( i = 1; i<frames_overlap; i++ ) {
+ for( i = 1; i<frames_overlap; i++ )
+ {
float v = i * ( frames_overlap - i );
- for( j = 0; j < p->samples_per_frame; j++ ) {
+ for( j = 0; j < p->samples_per_frame; j++ )
*pw++ = v;
- }
}
p->best_overlap_offset = best_overlap_offset_float;
}
- uint new_size = ( p->frames_search + frames_stride + frames_overlap ) * p->bytes_per_frame;
- if( p->bytes_queued > new_size ) {
- if( p->bytes_to_slide > p->bytes_queued ) {
+ unsigned new_size = ( p->frames_search + frames_stride + frames_overlap ) * p->bytes_per_frame;
+ if( p->bytes_queued > new_size )
+ {
+ if( p->bytes_to_slide > p->bytes_queued )
+ {
p->bytes_to_slide -= p->bytes_queued;
p->bytes_queued = 0;
- } else {
- uint new_queued = __MIN( p->bytes_queued - p->bytes_to_slide, new_size );
+ }
+ else
+ {
+ unsigned new_queued = __MIN( p->bytes_queued - p->bytes_to_slide, new_size );
memmove( p->buf_queue,
p->buf_queue + p->bytes_queued - new_queued,
new_queued );
}
p->bytes_queue_max = new_size;
p->buf_queue = malloc( p->bytes_queue_max );
- if( ! p->buf_queue ) {
+ if( ! p->buf_queue )
return VLC_ENOMEM;
- }
p->bytes_stride_scaled = p->bytes_stride * p->scale;
p->frames_stride_scaled = p->bytes_stride_scaled / p->bytes_per_frame;
*****************************************************************************/
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_FOURCC('f','l','3','2' ) ||
- p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+ 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_FOURCC('f','l','3','2');
+ 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;
p_sys->bytes_queued = 0;
p_sys->bytes_to_slide = 0;
p_sys->frames_stride_error = 0;
- return reinit_buffers( p_filter );
+
+ if( reinit_buffers( p_filter ) != VLC_SUCCESS )
+ {
+ Close( p_this );
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
}
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;
}