* all: added s16tofixed32 filter, so that we decode flac with iPaq !

diff --git a/configure.ac.in b/configure.ac.in
index 9ba5f2ca1c3db84b0ad741f00015fa0b40517c19..59c11e7a647529821f91300347c28c455ea68138 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -804,7 +804,7 @@ PLUGINS="${PLUGINS} dummy rc logger gestures access_file memcpy"
 PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
 PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
 PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur"
-PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
+PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
 PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler bandlimited_resampler"
 PLUGINS="${PLUGINS} trivial_channel_mixer headphone_channel_mixer"
 PLUGINS="${PLUGINS} trivial_mixer spdif_mixer float32_mixer"

diff --git a/modules/audio_filter/converter/Modules.am b/modules/audio_filter/converter/Modules.am
index bdc2919e2f7636b5b1aaede98ab63a3a3af7d2c8..b8d2e8b126634a6df2c48279fcffd9a6e43ddf8e 100644 (file)
--- a/modules/audio_filter/converter/Modules.am
+++ b/modules/audio_filter/converter/Modules.am
@@ -6,6 +6,7 @@ SOURCES_a52tospdif = modules/audio_filter/converter/a52tospdif.c
 SOURCES_a52tofloat32 = modules/audio_filter/converter/a52tofloat32.c
 SOURCES_dtstospdif = modules/audio_filter/converter/dtstospdif.c
 SOURCES_fixed32tos16 = modules/audio_filter/converter/fixed32tos16.c
+SOURCES_s16tofixed32 = modules/audio_filter/converter/s16tofixed32.c
 SOURCES_fixed32tofloat32 = modules/audio_filter/converter/fixed32tofloat32.c
 SOURCES_s16tofloat32 = modules/audio_filter/converter/s16tofloat32.c
 SOURCES_s16tofloat32swab = modules/audio_filter/converter/s16tofloat32swab.c

diff --git a/modules/audio_filter/converter/s16tofixed32.c b/modules/audio_filter/converter/s16tofixed32.c
new file mode 100644 (file)
index 0000000..8fe67ee
--- /dev/null
+++ b/modules/audio_filter/converter/s16tofixed32.c
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * s16tofixed32.c : converter from signed 16 bits integer to fixed 32
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: s16tofixed32.c,v 1.1 2003/03/12 23:59:19 marcari Exp $
+ *
+ * Authors: Marc Ariberti <marcari@videolan.ord>
+ *
+ * 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 <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 s16->fixed32 conversion") );
+    set_capability( "audio filter", 15 );
+    set_callbacks( Create, NULL );
+vlc_module_end();
+
+/*****************************************************************************
+ * Create: allocate filter
+ *****************************************************************************
+ * This function allocates and initializes a s16->fixed32 audio filter.
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+    aout_filter_t * p_filter = (aout_filter_t *)p_this;
+
+    if ( p_filter->output.i_format != VLC_FOURCC('f','i','3','2')
+          || p_filter->input.i_format != AOUT_FMT_S16_NE )
+    {
+        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 = 1;
+
+    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 */
+    s16 * p_in = (s16 *)p_in_buf->p_buffer + i - 1;
+    vlc_fixed_t * p_out = (vlc_fixed_t *)p_out_buf->p_buffer + i - 1;
+
+    while( i-- )
+    {
+        *p_out = (vlc_fixed_t)( (int32_t)(*p_in) * (FIXED32_ONE >> 16) );
+        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(vlc_fixed_t) / sizeof(s16);
+}