#include <mad.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_block.h>
#include "vlc_filter.h"
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
- set_description( _("MPEG audio decoder") );
+ set_description( N_("MPEG audio decoder") );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
add_submodule();
- set_description( _("MPEG audio decoder") );
+ set_description( N_("MPEG audio decoder") );
set_capability( "audio filter2", 100 );
set_callbacks( OpenFilter, CloseFilter );
vlc_module_end();
p_sys = malloc( sizeof(filter_sys_t) );
p_filter->p_sys = (struct aout_filter_sys_t *)p_sys;
if( p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return -1;
- }
/* Initialize libmad */
mad_stream_init( &p_sys->mad_stream );
break;
case 1:
- p_filter->p_libvlc->pf_memcpy( p_samples, p_left,
- i_samples * sizeof(mad_fixed_t) );
+ vlc_memcpy( p_samples, p_left, i_samples * sizeof(mad_fixed_t) );
break;
default:
/* 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 -1;
- }
p_sys->i_reject_count = 0;
p_filter->pf_audio_filter = Convert;
else
p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
+ p_filter->fmt_out.audio.i_bitspersample =
+ aout_BitsPerSample( p_filter->fmt_out.i_codec );
p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
aout_filter.output.i_format = p_filter->fmt_out.i_codec;
in_buf.p_buffer = p_block->p_buffer;
- in_buf.b_discontinuity = VLC_FALSE;
+ in_buf.b_discontinuity = false;
in_buf.i_nb_bytes = p_block->i_buffer;
in_buf.i_nb_samples = p_block->i_samples;
out_buf.p_buffer = p_out->p_buffer;