Changeset 10e4032179794aa614cf029de90dd3d4b66f15f8

Timestamp:

19/08/08 21:13:22 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219173202 +0200

git-parent:

[1e4a18a2156a1bb3743601c0273997a08b56e50a]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219172081 +0200

Message:

Added s32l/b to float conversion support (close #1872).

Files:

• modules/audio_filter/converter/float.c (modified) (9 diffs)

modules/audio_filter/converter/float.c

@@ -77 +77 @@
-static void Do_S24ToFL32( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                           aout_buffer_t * );
+static void Do_S32ToFL32( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+                           aout_buffer_t * );
-
-static int  Create_S16ToFL32_SW( vlc_object_t * );
@@ -82 +84 @@
-                           aout_buffer_t * );
-static void Do_S24ToFL32_SW( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+                           aout_buffer_t * );
+static void Do_S32ToFL32_SW( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                           aout_buffer_t * );
-
@@ -394 +398 @@
-
-    if ( ( p_filter->input.i_format != AOUT_FMT_S16_NE &&
-
+
+
-          || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
-    {
@@ -405 +410 @@
-    }
-
-
+
+
+
-        p_filter->pf_do_work = Do_S24ToFL32;
-    else
@@ -443 +450 @@
-
-    p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
-
+4 / 
-}
-
@@ -472 +479 @@
-}
-
+static void Do_S32ToFL32( aout_instance_t * p_aout, aout_filter_t * p_filter,
+                          aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+{
+    VLC_UNUSED(p_aout);
+    int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
+
+    /* We start from the end because b_in_place is true */
+    int32_t * p_in = (int32_t *)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-- / 2147483648.0;
+    }
+
+    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 / 4;
+}
+
-/*****************************************************************************
- * S16 To Float32 with endianness conversion
@@ -505 +531 @@
-        return 0;
-    }
+
+    if ( (p_filter->input.i_format == VLC_FOURCC('s','3','2','l') ||
+         p_filter->input.i_format == VLC_FOURCC('s','3','2','b'))
+         && p_filter->output.i_format == VLC_FOURCC('f','l','3','2')
+         && p_filter->input.i_format != AOUT_FMT_S32_NE )
+    {
+        p_filter->pf_do_work = Do_S32ToFL32_SW;
+        p_filter->b_in_place = true;
+
+        return 0;
+    }
+
-    return -1;
-}
-
-static void Do_S16ToFL32_SW( aout_instance_t * p_aout, aout_filter_t * p_filter,
-
+   
-{
-    VLC_UNUSED(p_aout);
@@ -552 +590 @@
-
-    p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
-
+4 / 
-}
-
-static void Do_S24ToFL32_SW( aout_instance_t * p_aout, aout_filter_t * p_filter,
-
+  
-{
-    VLC_UNUSED(p_aout);
@@ -587 +625 @@
-}
-
+static void Do_S32ToFL32_SW( aout_instance_t * p_aout, aout_filter_t * p_filter,
+                             aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+{
+    VLC_UNUSED(p_aout);
+    int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
+
+    /* We start from the end because b_in_place is true */
+    int32_t * p_in = (int32_t *)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-- / 2147483648.0;
+    }
+
+    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 / 4;
+}
+
+
-/*****************************************************************************
- * S8 To FL32