/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc_aout.h>
-#include <vlc_block.h>
-#include "vlc_filter.h"
-
-#ifdef WORDS_BIGENDIAN
-# define AOUT_FMT_S24_IE VLC_FOURCC('s','2','4','l')
-# define AOUT_FMT_S16_IE VLC_FOURCC('s','1','6','l')
-# define AOUT_FMT_U16_IE VLC_FOURCC('u','1','6','l')
-#else
-# define AOUT_FMT_S24_IE VLC_FOURCC('s','2','4','b')
-# define AOUT_FMT_S16_IE VLC_FOURCC('s','1','6','b')
-# define AOUT_FMT_U16_IE VLC_FOURCC('u','1','6','b')
+#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>
/*****************************************************************************
* Local prototypes
static block_t *Swap16( filter_t *, block_t * );
static block_t *Swap24( filter_t *, block_t * );
-static struct
+static const struct
{
vlc_fourcc_t i_src;
vlc_fourcc_t i_dst;
} ConvertTable[] =
{
/* From fl32 */
- { VLC_FOURCC('f','l','3','2'), AOUT_FMT_S24_NE, Float32toS24 },
- { VLC_FOURCC('f','l','3','2'), AOUT_FMT_S16_NE, Float32toS16 },
- { VLC_FOURCC('f','l','3','2'), AOUT_FMT_U16_NE, Float32toU16 },
- { VLC_FOURCC('f','l','3','2'), AOUT_FMT_S24_IE, Float32toS24Invert },
- { VLC_FOURCC('f','l','3','2'), AOUT_FMT_S16_IE, Float32toS16Invert },
- { VLC_FOURCC('f','l','3','2'), AOUT_FMT_U16_IE, Float32toU16Invert },
- { VLC_FOURCC('f','l','3','2'), VLC_FOURCC('s','8',' ',' '), Float32toS8 },
- { VLC_FOURCC('f','l','3','2'), VLC_FOURCC('u','8',' ',' '), Float32toU8 },
+ { VLC_CODEC_FL32, VLC_CODEC_S24N, Float32toS24 },
+ { VLC_CODEC_FL32, VLC_CODEC_S16N, Float32toS16 },
+ { VLC_CODEC_FL32, VLC_CODEC_U16N, Float32toU16 },
+ { VLC_CODEC_FL32, VLC_CODEC_S24I, Float32toS24Invert },
+ { VLC_CODEC_FL32, VLC_CODEC_S16I, Float32toS16Invert },
+ { VLC_CODEC_FL32, VLC_CODEC_U16I, Float32toU16Invert },
+ { VLC_CODEC_FL32, VLC_CODEC_S8, Float32toS8 },
+ { VLC_CODEC_FL32, VLC_CODEC_U8, Float32toU8 },
/* From s24 invert */
- { AOUT_FMT_S24_NE, VLC_FOURCC('f','l','3','2'), S24toFloat32 },
- { AOUT_FMT_S24_NE, AOUT_FMT_S24_IE, Swap24 },
- { AOUT_FMT_S24_NE, AOUT_FMT_S16_NE, S24toS16 },
- { AOUT_FMT_S24_NE, AOUT_FMT_S16_IE, S24toS16Invert },
+ { VLC_CODEC_S24N, VLC_CODEC_FL32, S24toFloat32 },
+ { VLC_CODEC_S24N, VLC_CODEC_S24I, Swap24 },
+ { VLC_CODEC_S24N, VLC_CODEC_S16N, S24toS16 },
+ { VLC_CODEC_S24N, VLC_CODEC_S16I, S24toS16Invert },
/* From s16 */
- { AOUT_FMT_S16_NE, VLC_FOURCC('f','l','3','2'), S16toFloat32 },
- { AOUT_FMT_S16_NE, AOUT_FMT_S24_NE, S16toS24 },
- { AOUT_FMT_S16_NE, AOUT_FMT_S24_IE, S16toS24Invert },
- { AOUT_FMT_S16_NE, AOUT_FMT_S16_IE, Swap16 },
- { AOUT_FMT_S16_NE, AOUT_FMT_U16_IE, S16toU16 },
- { AOUT_FMT_S16_NE, VLC_FOURCC('s','8',' ',' '), S16toS8 },
- { AOUT_FMT_S16_NE, VLC_FOURCC('u','8',' ',' '), S16toU8 },
+ { VLC_CODEC_S16N, VLC_CODEC_FL32, S16toFloat32 },
+ { VLC_CODEC_S16N, VLC_CODEC_S24N, S16toS24 },
+ { VLC_CODEC_S16N, VLC_CODEC_S24I, S16toS24Invert },
+ { VLC_CODEC_S16N, VLC_CODEC_S16I, Swap16 },
+ { VLC_CODEC_S16N, VLC_CODEC_U16I, S16toU16 },
+ { VLC_CODEC_S16N, VLC_CODEC_S8, S16toS8 },
+ { VLC_CODEC_S16N, VLC_CODEC_U8, S16toU8 },
/* From u16 */
- { AOUT_FMT_U16_NE, VLC_FOURCC('f','l','3','2'), U16toFloat32 },
- { AOUT_FMT_U16_NE, AOUT_FMT_U16_IE, Swap16 },
- { AOUT_FMT_U16_NE, AOUT_FMT_S16_IE, U16toS16 },
- { AOUT_FMT_U16_NE, VLC_FOURCC('s','8',' ',' '), U16toS8 },
- { AOUT_FMT_U16_NE, VLC_FOURCC('u','8',' ',' '), U16toU8 },
+ { VLC_CODEC_U16N, VLC_CODEC_FL32, U16toFloat32 },
+ { VLC_CODEC_U16N, VLC_CODEC_U16I, Swap16 },
+ { VLC_CODEC_U16N, VLC_CODEC_S16I, U16toS16 },
+ { VLC_CODEC_U16N, VLC_CODEC_S8, U16toS8 },
+ { VLC_CODEC_U16N, VLC_CODEC_U8, U16toU8 },
/* From s8 */
- { VLC_FOURCC('s','8',' ',' '), VLC_FOURCC('f','l','3','2'), S8toFloat32 },
- { VLC_FOURCC('s','8',' ',' '), AOUT_FMT_S16_NE, S8toS16 },
- { VLC_FOURCC('s','8',' ',' '), AOUT_FMT_S16_IE, S8toS16Invert },
- { VLC_FOURCC('s','8',' ',' '), AOUT_FMT_U16_NE, S8toU16 },
- { VLC_FOURCC('s','8',' ',' '), AOUT_FMT_U16_IE, S8toU16Invert },
- { VLC_FOURCC('s','8',' ',' '), VLC_FOURCC('u','8',' ',' '), S8toU8 },
-
+ { VLC_CODEC_S8, VLC_CODEC_FL32, S8toFloat32 },
+ { VLC_CODEC_S8, VLC_CODEC_S16N, S8toS16 },
+ { VLC_CODEC_S8, VLC_CODEC_S16I, S8toS16Invert },
+ { VLC_CODEC_S8, VLC_CODEC_U16N, S8toU16 },
+ { VLC_CODEC_S8, VLC_CODEC_U16I, S8toU16Invert },
+ { VLC_CODEC_S8, VLC_CODEC_U8, S8toU8 },
+
/* From u8 */
- { VLC_FOURCC('u','8',' ',' '), VLC_FOURCC('f','l','3','2'), U8toFloat32 },
- { VLC_FOURCC('u','8',' ',' '), AOUT_FMT_S16_NE, U8toS16 },
- { VLC_FOURCC('u','8',' ',' '), AOUT_FMT_S16_IE, U8toS16Invert },
- { VLC_FOURCC('u','8',' ',' '), AOUT_FMT_U16_NE, U8toU16 },
- { VLC_FOURCC('u','8',' ',' '), AOUT_FMT_U16_IE, U8toU16Invert },
- { VLC_FOURCC('u','8',' ',' '), VLC_FOURCC('s','8',' ',' '), U8toS8 },
+ { VLC_CODEC_U8, VLC_CODEC_FL32, U8toFloat32 },
+ { VLC_CODEC_U8, VLC_CODEC_S16N, U8toS16 },
+ { VLC_CODEC_U8, VLC_CODEC_S16I, U8toS16Invert },
+ { VLC_CODEC_U8, VLC_CODEC_U16N, U8toU16 },
+ { VLC_CODEC_U8, VLC_CODEC_U16I, U8toU16Invert },
+ { VLC_CODEC_U8, VLC_CODEC_S8, U8toS8 },
/* From s24 invert */
- { AOUT_FMT_S24_IE, VLC_FOURCC('f','l','3','2'), S24InverttoFloat32 },
- { AOUT_FMT_S24_IE, AOUT_FMT_S24_NE, Swap24 },
- { AOUT_FMT_S24_IE, AOUT_FMT_S16_NE, S24InverttoS16 },
- { AOUT_FMT_S24_IE, AOUT_FMT_S16_IE, S24InverttoS16Invert },
+ { VLC_CODEC_S24I, VLC_CODEC_FL32, S24InverttoFloat32 },
+ { VLC_CODEC_S24I, VLC_CODEC_S24N, Swap24 },
+ { VLC_CODEC_S24I, VLC_CODEC_S16N, S24InverttoS16 },
+ { VLC_CODEC_S24I, VLC_CODEC_S16I, S24InverttoS16Invert },
/* From s16 invert */
- { AOUT_FMT_S16_IE, VLC_FOURCC('f','l','3','2'), S16InverttoFloat32 },
- { AOUT_FMT_S16_IE, AOUT_FMT_S24_NE, S16InverttoS24 },
- { AOUT_FMT_S16_IE, AOUT_FMT_S24_IE, S16InverttoS24Invert },
- { AOUT_FMT_S16_IE, AOUT_FMT_S16_NE, Swap16 },
- { AOUT_FMT_S16_IE, AOUT_FMT_U16_NE, S16InverttoU16 },
- { AOUT_FMT_S16_IE, VLC_FOURCC('s','8',' ',' '), S16InverttoS8 },
- { AOUT_FMT_S16_IE, VLC_FOURCC('u','8',' ',' '), S16InverttoU8 },
+ { VLC_CODEC_S16I, VLC_CODEC_FL32, S16InverttoFloat32 },
+ { VLC_CODEC_S16I, VLC_CODEC_S24N, S16InverttoS24 },
+ { VLC_CODEC_S16I, VLC_CODEC_S24I, S16InverttoS24Invert },
+ { VLC_CODEC_S16I, VLC_CODEC_S16N, Swap16 },
+ { VLC_CODEC_S16I, VLC_CODEC_U16N, S16InverttoU16 },
+ { VLC_CODEC_S16I, VLC_CODEC_S8, S16InverttoS8 },
+ { VLC_CODEC_S16I, VLC_CODEC_U8, S16InverttoU8 },
/* From u16 invert */
- { AOUT_FMT_U16_IE, VLC_FOURCC('f','l','3','2'), U16InverttoFloat32 },
- { AOUT_FMT_U16_IE, AOUT_FMT_U16_NE, Swap16 },
- { AOUT_FMT_U16_IE, AOUT_FMT_S16_NE, U16InverttoS16 },
- { AOUT_FMT_U16_IE, VLC_FOURCC('s','8',' ',' '), U16InverttoS8 },
- { AOUT_FMT_U16_IE, VLC_FOURCC('u','8',' ',' '), U16InverttoU8 },
+ { VLC_CODEC_U16I, VLC_CODEC_FL32, U16InverttoFloat32 },
+ { VLC_CODEC_U16I, VLC_CODEC_U16N, Swap16 },
+ { VLC_CODEC_U16I, VLC_CODEC_S16N, U16InverttoS16 },
+ { VLC_CODEC_U16I, VLC_CODEC_S8, U16InverttoS8 },
+ { VLC_CODEC_U16I, VLC_CODEC_U8, U16InverttoU8 },
{ 0, 0, NULL },
};
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Audio filter for PCM format conversion") );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_MISC );
- set_capability( "audio filter2", 1 );
- set_callbacks( Open, NULL );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Audio filter for PCM format conversion") )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_capability( "audio filter2", 1 )
+ set_callbacks( Open, NULL )
+vlc_module_end ()
/*****************************************************************************
* Open:
p_filter->pf_audio_filter = ConvertTable[i].pf_convert;
p_filter->fmt_out.audio = p_filter->fmt_in.audio;
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 );
- msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
+ msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i->%i",
(char *)&p_filter->fmt_in.i_codec,
(char *)&p_filter->fmt_out.i_codec,
- p_filter->fmt_in.audio.i_bitspersample );
+ p_filter->fmt_in.audio.i_bitspersample,
+ p_filter->fmt_out.audio.i_bitspersample );
return VLC_SUCCESS;
}
*****************************************************************************/
static block_t *Float32toS24( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
float *p_in = (float *)p_block->p_buffer;
uint8_t *p_out = (uint8_t *)p_in;
else out = *p_in * 8388608.0;
#ifdef WORDS_BIGENDIAN
- *((int16_t *)p_out) = out >> 8;
- p_out[2] = out & 0xFF;
+ *((int16_t *)p_out) = out >> 8;
+ p_out[2] = out & 0xFF;
#else
- *((int16_t *)(p_out+1)) = out >> 8;
- p_out[0] = out & 0xFF;
+ *((int16_t *)(p_out+1)) = out >> 8;
+ p_out[0] = out & 0xFF;
#endif
p_in++; p_out += 3;
static block_t *Float32toS16( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
float *p_in = (float *)p_block->p_buffer;
int16_t *p_out = (int16_t *)p_in;
static block_t *Float32toU16( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
float *p_in = (float *)p_block->p_buffer;
uint16_t *p_out = (uint16_t *)p_in;
p_in += 3; p_out++;
}
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
static block_t *S24toS16( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
uint8_t *p_in = (uint8_t *)p_block->p_buffer;
uint8_t *p_out = (uint8_t *)p_in;
p_in++; p_out++;
}
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
*p_out++ = (float)(*p_in++ - 32768) / 32768.0;
}
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
#endif
}
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
static block_t *S16toS8( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
int16_t *p_in = (int16_t *)p_block->p_buffer;
int8_t *p_out = (int8_t *)p_in;
}
static block_t *S16toU8( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
int16_t *p_in = (int16_t *)p_block->p_buffer;
uint8_t *p_out = (uint8_t *)p_in;
}
static block_t *S16toU16( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
int16_t *p_in = (int16_t *)p_block->p_buffer;
uint16_t *p_out = (uint16_t *)p_in;
static block_t *U16toS8( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
uint16_t *p_in = (uint16_t *)p_block->p_buffer;
int8_t *p_out = (int8_t *)p_in;
}
static block_t *U16toU8( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
uint16_t *p_in = (uint16_t *)p_block->p_buffer;
uint8_t *p_out = (uint8_t *)p_in;
}
static block_t *U16toS16( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
uint16_t *p_in = (uint16_t *)p_block->p_buffer;
int16_t *p_out = (int16_t *)p_in;
static block_t *S8toU8( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
int8_t *p_in = (int8_t *)p_block->p_buffer;
uint8_t *p_out = (uint8_t *)p_in;
}
static block_t *U8toS8( filter_t *p_filter, block_t *p_block )
{
+ VLC_UNUSED(p_filter);
int i;
uint8_t *p_in = (uint8_t *)p_block->p_buffer;
int8_t *p_out = (int8_t *)p_in;
for( i = p_block->i_buffer; i--; )
*p_out++ = ((*p_in++) + 128) << 8;
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
for( i = p_block->i_buffer; i--; )
*p_out++ = ((*p_in++) - 128) << 8;
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
for( i = p_block->i_buffer; i--; )
*p_out++ = (*p_in++) << 8;
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
for( i = p_block->i_buffer; i--; )
*p_out++ = (*p_in++) << 8;
- p_block_out->i_samples = p_block->i_samples;
+ p_block_out->i_nb_samples = p_block->i_nb_samples;
p_block_out->i_dts = p_block->i_dts;
p_block_out->i_pts = p_block->i_pts;
p_block_out->i_length = p_block->i_length;
p_block_out->i_rate = p_block->i_rate;
- p_block->pf_release( p_block );
+ block_Release( p_block );
return p_block_out;
}
*****************************************************************************/
static block_t *Swap16( filter_t *p_filter, block_t *p_block )
{
- int i;
+ VLC_UNUSED(p_filter);
+ size_t i;
uint8_t *p_in = (uint8_t *)p_block->p_buffer;
uint8_t tmp;
static block_t *Swap24( filter_t *p_filter, block_t *p_block )
{
- int i;
+ VLC_UNUSED(p_filter);
+ size_t i;
uint8_t *p_in = (uint8_t *)p_block->p_buffer;
uint8_t tmp;
projects / vlc / blobdiff