#include <vlc_plugin.h>
#include <vlc_aout.h>
+#include <vlc_filter.h>
/*****************************************************************************
* Local prototypes
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 * );
-struct aout_filter_sys_t
+struct filter_sys_t
{
/* TODO: Cleanup and optimise */
int i_cumulative;
vlc_module_begin ()
set_description( N_("Sound Delay") )
- set_shortname( N_("delay") )
+ set_shortname( N_("Delay") )
+ set_help( N_("Add a delay effect to the sound") )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
add_shortcut( "delay" )
*/
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;
- if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+ if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
{
msg_Err( p_filter, "input and output formats are not similar" );
return VLC_EGENERIC;
}
- 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 )
{
- p_filter->input.i_format = VLC_CODEC_FL32;
- p_filter->output.i_format = VLC_CODEC_FL32;
+ p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32;
+ p_filter->fmt_out.audio.i_format = VLC_CODEC_FL32;
msg_Warn( p_filter, "bad input or output format" );
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = true;
+ p_filter->pf_audio_filter = DoWork;
- 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_sys->i_channels = aout_FormatNbChannels( &p_filter->input );
+ p_sys->i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
p_sys->f_delayTime = var_CreateGetFloat( p_this, "delay-time" );
p_sys->f_sweepDepth = var_CreateGetFloat( p_this, "sweep-depth" );
p_sys->f_sweepRate = var_CreateGetFloat( p_this, "sweep-rate" );
/* Max delay = delay + depth. Min = delay - depth */
p_sys->i_bufferLength = p_sys->i_channels * ( (int)( ( p_sys->f_delayTime
- + p_sys->f_sweepDepth ) * p_filter->input.i_rate/1000 ) + 1 );
+ + p_sys->f_sweepDepth ) * p_filter->fmt_in.audio.i_rate/1000 ) + 1 );
msg_Dbg( p_filter , "Buffer length:%d, Channels:%d, Sweep Depth:%f, Delay "
"time:%f, Sweep Rate:%f, Sample Rate: %d", p_sys->i_bufferLength,
p_sys->i_channels, p_sys->f_sweepDepth, p_sys->f_delayTime,
- p_sys->f_sweepRate, p_filter->input.i_rate );
+ p_sys->f_sweepRate, p_filter->fmt_in.audio.i_rate );
if( p_sys->i_bufferLength <= 0 )
{
msg_Err( p_filter, "Delay-time, Sampl rate or Channels was incorrect" );
p_sys->pf_write = p_sys->pf_delayLineStart;
if( p_sys->f_sweepDepth < small_value() ||
- p_filter->input.i_rate < small_value() ) {
+ p_filter->fmt_in.audio.i_rate < small_value() ) {
p_sys->f_sinMultiplier = 0.0;
}
else {
p_sys->f_sinMultiplier = 11 * p_sys->f_sweepRate /
- ( 7 * p_sys->f_sweepDepth * p_filter->input.i_rate ) ;
+ ( 7 * p_sys->f_sweepDepth * p_filter->fmt_in.audio.i_rate ) ;
}
- p_sys->i_sampleRate = p_filter->input.i_rate;
+ p_sys->i_sampleRate = p_filter->fmt_in.audio.i_rate;
return VLC_SUCCESS;
}
/**
* DoWork : delays and finds the value of the current frame
- * @param p_aout Audio output object
* @param p_filter This filter object
* @param p_in_buf Input buffer
- * @param p_out_buf Output buffer
+ * @return Output 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 )
{
- struct aout_filter_sys_t *p_sys = p_filter->p_sys;
- int i, i_chan;
- int i_samples = p_in_buf->i_nb_samples; /* Gives the number of samples */
- int i_maxOffset = (int)floor( p_sys->f_sweepDepth * p_sys->i_sampleRate /
- 1000 ); /*maximum number of samples to offset in buffer */
- float *p_out = (float*)p_out_buf->p_buffer;
+ struct filter_sys_t *p_sys = p_filter->p_sys;
+ int i_chan;
+ unsigned i_samples = p_in_buf->i_nb_samples; /* number of samples */
+ /* maximum number of samples to offset in buffer */
+ int i_maxOffset = floor( p_sys->f_sweepDepth * p_sys->i_sampleRate / 1000 );
+ float *p_out = (float*)p_in_buf->p_buffer;
float *p_in = (float*)p_in_buf->p_buffer;
float *pf_ptr, f_diff = 0, f_frac = 0, f_temp = 0 ;
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
-
/* Process each sample */
- for( i = 0; i < i_samples ; i++ )
+ for( unsigned i = 0; i < i_samples ; i++ )
{
/* Use a sine function as a oscillator wave. TODO */
/* f_offset = sinf( ( p_sys->i_cumulative ) * p_sys->f_sinMultiplier ) *
}
}
/* Calculate position in delay */
+ int offset = floor( p_sys->f_offset );
pf_ptr = p_sys->pf_write + i_maxOffset * p_sys->i_channels +
- (int)( floor( p_sys->f_offset ) ) * p_sys->i_channels;
+ offset * p_sys->i_channels;
/* Handle Overflow */
if( pf_ptr < p_sys->pf_delayLineStart )
}
}
- return;
+ return p_in_buf;
}
/**
*/
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->pf_delayLineStart );
free( p_sys );
projects / vlc / blobdiff