More

[vlc] / modules / audio_filter / converter / s16tofloat32swab.c

diff --git a/modules/audio_filter/converter/s16tofloat32swab.c b/modules/audio_filter/converter/s16tofloat32swab.c
index 07d9a2fce2677936eda4378ea335352abeec05b2..f1152a050c6278ec2f4340a1d1a9e66c606abef8 100644 (file)
--- a/modules/audio_filter/converter/s16tofloat32swab.c
+++ b/modules/audio_filter/converter/s16tofloat32swab.c
@@ -2,8 +2,8 @@
  * s16tofloat32swab.c : converter from signed 16 bits integer to float32
  *                      with endianness change
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: s16tofloat32swab.c,v 1.10 2003/10/25 00:49:13 sam Exp $
+ * Copyright (C) 2002-2006 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Henri Fallon <henri@videolan.org>
@@ -20,17 +20,16 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include <vlc/vlc.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
-#include <vlc/vlc.h>
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
@@ -49,13 +48,17 @@ static int  Create    ( vlc_object_t * );
 
 static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
                         aout_buffer_t * );
+static void DoWork24  ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+                        aout_buffer_t * );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
     set_description(
-            _("audio filter for s16->float32 with endianness conversion") );
+            _("Audio filter for s16->float32 with endianness conversion") );
     set_capability( "audio filter", 1 );
     set_callbacks( Create, NULL );
 vlc_module_end();
@@ -85,6 +88,17 @@ static int Create( vlc_object_t *p_this )
         return 0;
     }
 
+    if ( (p_filter->input.i_format == VLC_FOURCC('s','2','4','l') ||
+         p_filter->input.i_format == VLC_FOURCC('s','2','4','b'))
+         && p_filter->output.i_format == VLC_FOURCC('f','l','3','2')
+         && p_filter->input.i_format != AOUT_FMT_S24_NE )
+    {
+        p_filter->pf_do_work = DoWork24;
+        p_filter->b_in_place = VLC_TRUE;
+
+        return 0;
+    }
+
     return -1;
 }
 
@@ -137,3 +151,33 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * 2;
 }
 
+static void DoWork24( 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 */
+    uint8_t * p_in = (uint8_t *)p_in_buf->p_buffer + (i - 1) * 3;
+    float * p_out = (float *)p_out_buf->p_buffer + i - 1;
+
+    byte_t p_tmp[3];
+
+    while( i-- )
+    {
+        p_tmp[0] = p_in[2];
+        p_tmp[1] = p_in[1];
+        p_tmp[2] = p_in[0];
+
+#ifdef WORDS_BIGENDIAN
+        *p_out = ((float)( (((int32_t)*(int16_t *)(p_tmp)) << 8) + p_tmp[2]))
+#else
+        *p_out = ((float)( (((int32_t)*(int16_t *)(p_tmp+1)) << 8) + p_tmp[0]))
+#endif
+            / 8388608.0;
+
+        p_in -= 3; 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 * 4 / 3;
+}