u8tofloat32.c converter.
* modules/codec/araw.c: modified to also decode u8 pcm audio samples.
#PLUGINS="${PLUGINS} a52old imdct downmix"
PLUGINS="${PLUGINS} lpcm a52"
PLUGINS="${PLUGINS} deinterlace invert yuv wall transform distort clone crop motionblur"
-PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab"
+PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofloat32"
PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler"
PLUGINS="${PLUGINS} trivial_channel_mixer"
PLUGINS="${PLUGINS} trivial_mixer spdif_mixer"
SOURCES_fixed32tofloat32 = modules/audio_filter/converter/fixed32tofloat32.c
SOURCES_s16tofloat32 = modules/audio_filter/converter/s16tofloat32.c
SOURCES_s16tofloat32swab = modules/audio_filter/converter/s16tofloat32swab.c
+SOURCES_s8tofloat32 = modules/audio_filter/converter/s8tofloat32.c
+SOURCES_u8tofloat32 = modules/audio_filter/converter/u8tofloat32.c
--- /dev/null
+/*****************************************************************************
+ * s8tofloat32.c : converter from signed 8 bits integer to float32.
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: s8tofloat32.c,v 1.1 2002/11/08 14:23:49 gbazin Exp $
+ *
+ * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <errno.h>
+#include <stdlib.h> /* malloc(), free() */
+#include <string.h>
+
+#include <vlc/vlc.h>
+#include "audio_output.h"
+#include "aout_internal.h"
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Create ( vlc_object_t * );
+
+static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+ aout_buffer_t * );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+ set_description( _("audio filter for s8->float32 conversion") );
+ set_capability( "audio filter", 1 );
+ set_callbacks( Create, NULL );
+vlc_module_end();
+
+/*****************************************************************************
+ * Create: create and initialize converter
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+ aout_filter_t * p_filter = (aout_filter_t *)p_this;
+
+ if ( p_filter->input.i_format != VLC_FOURCC('s','8',' ',' ')
+ || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+ {
+ return -1;
+ }
+
+ if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+ {
+ return -1;
+ }
+
+ p_filter->pf_do_work = DoWork;
+ p_filter->b_in_place = VLC_TRUE;
+
+ return 0;
+}
+
+/*****************************************************************************
+ * DoWork: convert a 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 )
+{
+ int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
+
+ /* We start from the end because b_in_place is true */
+ s8 * p_in = (s8 *)p_in_buf->p_buffer + i - 1;
+ float * p_out = (float *)p_out_buf->p_buffer + i - 1;
+
+ while( i-- )
+ {
+ *p_out = (float)(*p_in) / 128.0;
+ p_in--; p_out--;
+ }
+
+ p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
+ p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * sizeof(float);
+}
--- /dev/null
+/*****************************************************************************
+ * u8tofloat32.c : converter from unsigned 8 bits integer to float32.
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: u8tofloat32.c,v 1.1 2002/11/08 14:23:49 gbazin Exp $
+ *
+ * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <errno.h>
+#include <stdlib.h> /* malloc(), free() */
+#include <string.h>
+
+#include <vlc/vlc.h>
+#include "audio_output.h"
+#include "aout_internal.h"
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Create ( vlc_object_t * );
+
+static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+ aout_buffer_t * );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+ set_description( _("audio filter for s8->float32 conversion") );
+ set_capability( "audio filter", 1 );
+ set_callbacks( Create, NULL );
+vlc_module_end();
+
+/*****************************************************************************
+ * Create: create and initialize converter
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+ aout_filter_t * p_filter = (aout_filter_t *)p_this;
+
+ if ( p_filter->input.i_format != VLC_FOURCC('u','8',' ',' ')
+ || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+ {
+ return -1;
+ }
+
+ if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+ {
+ return -1;
+ }
+
+ p_filter->pf_do_work = DoWork;
+ p_filter->b_in_place = VLC_TRUE;
+
+ return 0;
+}
+
+/*****************************************************************************
+ * DoWork: convert a 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 )
+{
+ int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
+
+ /* We start from the end because b_in_place is true */
+ u8 * p_in = (u8 *)p_in_buf->p_buffer + i - 1;
+ float * p_out = (float *)p_out_buf->p_buffer + i - 1;
+
+ while( i-- )
+ {
+ *p_out = ((float)*p_in -128) / 128.0;
+ p_in--; p_out--;
+ }
+
+ p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
+ p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * sizeof(float);
+}
* araw.c: Pseudo audio decoder; for raw pcm data
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: araw.c,v 1.5 2002/10/27 16:58:14 gbazin Exp $
+ * $Id: araw.c,v 1.6 2002/11/08 14:23:49 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
case( 4 ):
p_adec->output_format.i_format = VLC_FOURCC('s','3','2','l');
break;
-
case( 1 ):
+ p_adec->output_format.i_format = VLC_FOURCC('u','8',' ',' ');
+ break;
default:
msg_Err( p_adec->p_fifo, "bad parameters(bits/sample)" );
return( -1 );
projects / vlc / commitdiff