/*****************************************************************************
- * spatializer.cpp:
+ * spatializer.cpp: sound reverberation
*****************************************************************************
* Copyright (C) 2004, 2006, 2007 the VideoLAN team
*
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include "vlc_aout.h"
#include "revmodel.hpp"
#define SPAT_AMP 0.3
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_description( _("spatializer") );
- set_shortname( _("spatializer" ) );
- set_capability( "audio filter", 0 );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_AFILTER );
-
- set_callbacks( Open, Close );
- add_shortcut( "spatializer" );
- add_float( "Roomsize", 1.05, NULL, NULL,NULL, true);
- add_float( "Width", 10.0, NULL, NULL,NULL, true);
- add_float( "Wet", 3.0, NULL, NULL,NULL, true);
- add_float( "Dry", 2.0, NULL, NULL,NULL, true);
- add_float( "Damp", 1.0, NULL, NULL,NULL, true);
-vlc_module_end();
+#define ROOMSIZE_TEXT N_("Room size")
+#define ROOMSIZE_LONGTEXT N_("Defines the virtual surface of the room" \
+ "emulated by the filter." )
+
+#define WIDTH_TEXT N_("Room width")
+#define WIDTH_LONGTEXT N_("Width of the virtual room")
+
+#define WET_TEXT N_("Wet")
+#define WET_LONGTEXT NULL
+
+#define DRY_TEXT N_("Dry")
+#define DRY_LONGTEXT NULL
+
+#define DAMP_TEXT N_("Damp")
+#define DAMP_LONGTEXT NULL
+
+vlc_module_begin ()
+ set_description( N_("Audio Spatializer") )
+ set_shortname( N_("Spatializer" ) )
+ set_capability( "audio filter", 0 )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
+
+ set_callbacks( Open, Close )
+ add_shortcut( "spatializer" )
+ add_float( "spatializer-roomsize", 1.05, NULL, ROOMSIZE_TEXT,
+ ROOMSIZE_LONGTEXT, true )
+ add_float( "spatializer-width", 10., NULL, WIDTH_TEXT,WIDTH_LONGTEXT, true )
+ add_float( "spatializer-wet", 3., NULL, WET_TEXT,WET_LONGTEXT, true )
+ add_float( "spatializer-dry", 2., NULL, DRY_TEXT,DRY_LONGTEXT, true )
+ add_float( "spatializer-damp", 1., NULL, DAMP_TEXT,DAMP_LONGTEXT, true )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-typedef struct aout_filter_sys_t
+struct aout_filter_sys_t
{
- /* reverb static config */
- bool b_first;
+ vlc_mutex_t lock;
+ revmodel *p_reverbm;
-} aout_filter_sys_t;
+};
-static revmodel reverbm;
+class CLocker
+{
+public:
+ CLocker( vlc_mutex_t *p_lock ) : p_lock(p_lock) {
+ vlc_mutex_lock( p_lock );
+ }
+ virtual ~CLocker() {
+ vlc_mutex_unlock( p_lock );
+ }
+private:
+ vlc_mutex_t *p_lock;
+};
static const char *psz_control_names[] =
{
aout_filter_t *p_filter = (aout_filter_t *)p_this;
aout_filter_sys_t *p_sys;
bool b_fit = true;
- msg_Dbg(p_this, "Opening filter spatializer %s %s %d\n", __FILE__,__func__,__LINE__);
+ msg_Dbg(p_this, "Opening filter spatializer %s %s %d", __FILE__,__func__,__LINE__);
- 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->input.i_format != VLC_CODEC_FL32 ||
+ p_filter->output.i_format != VLC_CODEC_FL32 )
{
b_fit = false;
- p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
- p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
+ p_filter->input.i_format = VLC_CODEC_FL32;
+ p_filter->output.i_format = VLC_CODEC_FL32;
msg_Warn( p_filter, "bad input or output format" );
}
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
/* Allocate structure */
p_sys = p_filter->p_sys = (aout_filter_sys_t*)malloc( sizeof( aout_filter_sys_t ) );
- reverbm.setroomsize(1.05);
- reverbm.setwet(10.0f);
- reverbm.setdry(1.0f);
- reverbm.setdamp(0.3);
- reverbm.setwidth(0.9);
+ if( !p_sys )
+ return VLC_ENOMEM;
+
+ vlc_mutex_init( &p_sys->lock );
+ p_sys->p_reverbm = new revmodel();
+ p_sys->p_reverbm->setroomsize(1.05);
+ p_sys->p_reverbm->setwet(10.0f);
+ p_sys->p_reverbm->setdry(1.0f);
+ p_sys->p_reverbm->setdamp(0.3);
+ p_sys->p_reverbm->setwidth(0.9);
SpatInit( p_filter);
return VLC_SUCCESS;
aout_filter_t *p_filter = (aout_filter_t *)p_this;
aout_filter_sys_t *p_sys = p_filter->p_sys;
SpatClean( p_filter );
+ delete p_sys->p_reverbm;
+ vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
- msg_Dbg(p_this, "Closing filter spatializer %s %s %d\n", __FILE__,__func__,__LINE__);
+ msg_Dbg(p_this, "Closing filter spatializer %s %s %d", __FILE__,__func__,__LINE__);
}
/*****************************************************************************
* DoWork: process samples 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 )
vlc_value_t val1, val2, val3, val4, val5;
aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
- for( int i = 0; i < 5 ; i ++ )
- {
- var_CreateGetFloatCommand( p_aout, psz_control_names[i] );
- }
+ for( i = 0; i < 5 ; i ++ )
+ var_Create( p_aout, psz_control_names[i], VLC_VAR_FLOAT
+ | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
/* Get initial values */
var_Get( p_aout, psz_control_names[0], &val1 );
aout_filter_t *p_filter, float *out, float *in,
int i_samples, int i_channels )
{
+ aout_filter_sys_t *p_sys = p_filter->p_sys;
+ CLocker locker( &p_sys->lock );
+
int i, ch, j;
for( i = 0; i < i_samples; i++ )
{
{
in[ch] = in[ch] * SPAT_AMP;
}
- reverbm.processreplace( in, out , 1, i_channels);
- in += i_channels;
- out += i_channels;
+ p_sys->p_reverbm->processreplace( in, out , 1, i_channels);
+ in += i_channels;
+ out += i_channels;
}
}
static void SpatClean( aout_filter_t *p_filter )
{
+ aout_instance_t *p_aout = (aout_instance_t *)p_filter->p_parent;
aout_filter_sys_t *p_sys = p_filter->p_sys;
- var_DelCallback( (aout_instance_t *)p_filter->p_parent,
- "Roomsize", RoomCallback, p_sys );
- var_DelCallback( (aout_instance_t *)p_filter->p_parent,
- "Width", WidthCallback, p_sys );
- var_DelCallback( (aout_instance_t *)p_filter->p_parent,
- "Wet", WetCallback, p_sys );
- var_DelCallback( (aout_instance_t *)p_filter->p_parent,
- "Dry", DryCallback, p_sys );
- var_DelCallback( (aout_instance_t *)p_filter->p_parent,
- "Damp", DampCallback, p_sys );
-
+ var_DelCallback( p_aout, psz_control_names[0], RoomCallback, p_sys );
+ var_DelCallback( p_aout, psz_control_names[1], WidthCallback, p_sys );
+ var_DelCallback( p_aout, psz_control_names[2], WetCallback, p_sys );
+ var_DelCallback( p_aout, psz_control_names[3], DryCallback, p_sys );
+ var_DelCallback( p_aout, psz_control_names[4], DampCallback, p_sys );
}
+/*****************************************************************************
+ * Variables callbacks
+ *****************************************************************************/
+
static int RoomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- msg_Dbg (p_this,"room callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
- reverbm.setroomsize(newval.f_float);
+ aout_filter_sys_t *p_sys = (aout_filter_sys_t*)p_data;
+ CLocker locker( &p_sys->lock );
+
+ p_sys->p_reverbm->setroomsize(newval.f_float);
+ msg_Dbg (p_this,"room callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int WidthCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- reverbm.setwidth(newval.f_float);
- msg_Dbg (p_this,"width callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
+ aout_filter_sys_t *p_sys = (aout_filter_sys_t*)p_data;
+ CLocker locker( &p_sys->lock );
+
+ p_sys->p_reverbm->setwidth(newval.f_float);
+ msg_Dbg (p_this,"width callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int WetCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- reverbm.setwet(newval.f_float);
- msg_Dbg (p_this,"wet callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
+ aout_filter_sys_t *p_sys = (aout_filter_sys_t*)p_data;
+ CLocker locker( &p_sys->lock );
+
+ p_sys->p_reverbm->setwet(newval.f_float);
+ msg_Dbg (p_this,"wet callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int DryCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- reverbm.setdry(newval.f_float);
- msg_Dbg (p_this,"dry callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
+ aout_filter_sys_t *p_sys = (aout_filter_sys_t*)p_data;
+ CLocker locker( &p_sys->lock );
+
+ p_sys->p_reverbm->setdry(newval.f_float);
+ msg_Dbg (p_this,"dry callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int DampCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- reverbm.setdamp(newval.f_float);
- msg_Dbg (p_this, "damp callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
+ aout_filter_sys_t *p_sys = (aout_filter_sys_t*)p_data;
+ CLocker locker( &p_sys->lock );
+
+ p_sys->p_reverbm->setdamp(newval.f_float);
+ msg_Dbg (p_this, "damp callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
projects / vlc / blobdiff