/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <math.h> /* sqrt */
-
-#ifdef HAVE_STDINT_H
-# include <stdint.h> /* int16_t .. */
-#elif defined(HAVE_INTTYPES_H)
-# include <inttypes.h> /* int16_t .. */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
+#include <math.h> /* sqrt */
+#include <stdint.h> /* int16_t .. */
+
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_es.h>
#include <vlc_block.h>
#define MONO_DOWNMIX_TEXT N_("Use downmix algorithm")
#define MONO_DOWNMIX_LONGTEXT N_("This option selects a stereo to mono " \
- "downmix algorithm that is used in the headphone channel mixer. It" \
+ "downmix algorithm that is used in the headphone channel mixer. It " \
"gives the effect of standing in a room full of speakers." )
#define MONO_CHANNEL_TEXT N_("Select channel to keep")
"2=rear left, 3=rear right, 4=center, 5=left front)")
static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 };
-static const char *ppsz_pos_descriptions[] =
+static const char *const ppsz_pos_descriptions[] =
{ N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"),
N_("Left front") };
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Audio filter for stereo to mono conversion") );
- set_capability( "audio filter2", 0 );
+vlc_module_begin ()
+ set_description( N_("Audio filter for stereo to mono conversion") )
+ set_capability( "audio filter2", 2 )
- add_bool( MONO_CFG "downmix", false, NULL, MONO_DOWNMIX_TEXT,
- MONO_DOWNMIX_LONGTEXT, false );
+ add_bool( MONO_CFG "downmix", true, NULL, MONO_DOWNMIX_TEXT,
+ MONO_DOWNMIX_LONGTEXT, false )
add_integer( MONO_CFG "channel", -1, NULL, MONO_CHANNEL_TEXT,
- MONO_CHANNEL_LONGTEXT, false );
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+ MONO_CHANNEL_LONGTEXT, false )
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_MISC );
- set_callbacks( OpenFilter, CloseFilter );
- set_shortname( "Mono" );
-vlc_module_end();
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_callbacks( OpenFilter, CloseFilter )
+ set_shortname( "Mono" )
+vlc_module_end ()
/* Init() and ComputeChannelOperations() -
* Code taken from modules/audio_filter/channel_mixer/headphone.c
int i_source_channel_offset;
unsigned int i;
- if( p_data == NULL )
- {
- msg_Dbg( p_this, "passing a null pointer as argument" );
- return 0;
- }
-
if( config_GetInt( p_this, "headphone-compensate" ) )
{
/* minimal distance to any speaker */
p_data->p_atomic_operations = malloc( sizeof(struct atomic_operation_t)
* p_data->i_nb_atomic_operations );
if( p_data->p_atomic_operations == NULL )
- {
- msg_Err( p_this, "out of memory" );
return -1;
- }
/* For each virtual speaker, computes elementary wave propagation time
* to each ear */
}
}
p_data->p_overflow_buffer = malloc( p_data->i_overflow_buffer_size );
- if( p_data->p_atomic_operations == NULL )
+ if( p_data->p_overflow_buffer == NULL )
{
- msg_Err( p_this, "out of memory" );
+ free( p_data->p_atomic_operations );
return -1;
}
memset( p_data->p_overflow_buffer, 0, p_data->i_overflow_buffer_size );
if( aout_FormatNbChannels( &(p_filter->fmt_in.audio) ) == 1 )
{
- msg_Dbg( p_filter, "filter discarded (incompatible format)" );
+ /*msg_Dbg( p_filter, "filter discarded (incompatible format)" );*/
return VLC_EGENERIC;
}
- if( (p_filter->fmt_in.i_codec != AOUT_FMT_S16_NE) ||
- (p_filter->fmt_out.i_codec != AOUT_FMT_S16_NE) )
+ if( (p_filter->fmt_in.i_codec != VLC_CODEC_S16N) ||
+ (p_filter->fmt_out.i_codec != VLC_CODEC_S16N) )
{
- msg_Err( p_this, "filter discarded (invalid format)" );
- return -1;
+ /*msg_Err( p_this, "filter discarded (invalid format)" );*/
+ return VLC_EGENERIC;
}
if( (p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format) &&
(p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate) &&
- (p_filter->fmt_in.audio.i_format != AOUT_FMT_S16_NE) &&
- (p_filter->fmt_out.audio.i_format != AOUT_FMT_S16_NE) &&
+ (p_filter->fmt_in.audio.i_format != VLC_CODEC_S16N) &&
+ (p_filter->fmt_out.audio.i_format != VLC_CODEC_S16N) &&
(p_filter->fmt_in.audio.i_bitspersample !=
p_filter->fmt_out.audio.i_bitspersample))
{
- msg_Err( p_this, "couldn't load mono filter" );
+ /*msg_Err( p_this, "couldn't load mono filter" );*/
return VLC_EGENERIC;
}
/* Allocate the memory needed to store the module's structure */
p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );
if( p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
- }
var_Create( p_this, MONO_CFG "downmix",
VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
p_filter->fmt_in.audio.i_physical_channels,
p_filter->fmt_in.audio.i_rate ) < 0 )
{
+ var_Destroy( p_this, MONO_CFG "channel" );
+ var_Destroy( p_this, MONO_CFG "downmix" );
+ free( p_sys );
return VLC_EGENERIC;
}
var_Destroy( p_this, MONO_CFG "channel" );
var_Destroy( p_this, MONO_CFG "downmix" );
+ free( p_sys->p_atomic_operations );
+ free( p_sys->p_overflow_buffer );
free( p_sys );
}
if( !p_block || !p_block->i_samples )
{
if( p_block )
- p_block->pf_release( p_block );
+ block_Release( p_block );
return NULL;
}
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 = (p_block->i_samples / p_filter->p_sys->i_nb_channels) *
p_out->i_buffer = out_buf.i_nb_bytes;
p_out->i_samples = out_buf.i_nb_samples;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_out;
}
projects / vlc / blobdiff