Changeset 352b5f932f4c6b66a2c0a0b57e749cd6be7f44ee

Timestamp:

08/20/06 23:00:34 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1156107634 +0000

git-parent:

[663716c008efd7b0a6ce435d89f66b12b33caa81]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1156107634 +0000

Message:

Make headphone also an audio_filter2

Files:

• modules/audio_filter/channel_mixer/headphone.c (modified) (37 diffs)

modules/audio_filter/channel_mixer/headphone.c

@@ -31 +31 @@
-
-#include <vlc/vlc.h>
-
-
+
+
+
+
-
-/*****************************************************************************
@@ -42 +44 @@
-static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                        aout_buffer_t * );
+
+/* Audio filter2 */
+static int  OpenFilter ( vlc_object_t * );
+static void CloseFilter( vlc_object_t * );
+static block_t *Convert( filter_t *, block_t * );
-
-/*****************************************************************************
@@ -86 +93 @@
-    set_callbacks( Create, Destroy );
-    add_shortcut( "headphone" );
+
+    /* Audio filter 2 */
+    add_submodule();
+    set_description( _("Headphone virtual spatialization effect") );
+    set_capability( "audio filter2", 100 );
+    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
-
@@ -101 +114 @@
-
-struct aout_filter_sys_t
+{
+    size_t i_overflow_buffer_size;/* in bytes */
+    byte_t * p_overflow_buffer;
+    unsigned int i_nb_atomic_operations;
+    struct atomic_operation_t * p_atomic_operations;
+};
+
+struct filter_sys_t
-{
-    size_t i_overflow_buffer_size;/* in bytes */
@@ -126 +147 @@
- *          x-axis
- *  */
- 
- 
- , double d_x 
- 
+
+
+, double d_x
+
-{
-    double d_c = 340; /*sound celerity (unit: m/s)*/
@@ -142 +163 @@
-        .i_delay = (int)( sqrt( (-0.1-d_x)*(-0.1-d_x) + (0-d_z)*(0-d_z) )
-                          / d_c * i_rate - d_compensation_delay );
- 
+
-    {
-        p_data->p_atomic_operations[i_next_atomic_operation]
-            .d_amplitude_factor = d_channel_amplitude_factor * 1.1 / 2;
-    }
- 
+
-    {
-        p_data->p_atomic_operations[i_next_atomic_operation]
@@ -166 +187 @@
-        .i_delay = (int)( sqrt( (0.1-d_x)*(0.1-d_x) + (0-d_z)*(0-d_z) )
-                          / d_c * i_rate - d_compensation_delay );
- 
+
-    {
-        p_data->p_atomic_operations[i_next_atomic_operation + 1]
-            .d_amplitude_factor = d_channel_amplitude_factor * 0.9 / 2;
-    }
- 
+
-    {
-        p_data->p_atomic_operations[i_next_atomic_operation + 1]
@@ -183 +204 @@
-}
-
- ( aout_filter_t * p_filter 
- 
+( vlc_object_t *p_this
+
-        , unsigned int i_rate )
-{
- ( p_filter 
+( p_this
-    double d_z = d_x;
-    double d_z_rear = -d_x/3;
@@ -195 +216 @@
-    unsigned int i;
-
- 
-
- ( p_filter
+
+
+( p_this
-        return 0;
-    }
-
- ( config_GetInt ( p_filter 
+( config_GetInt( p_this
-    {
-        /* minimal distance to any speaker */
- 
+
-        {
-            d_min = d_z_rear;
@@ -216 +237 @@
-    /* Number of elementary operations */
-    p_data->i_nb_atomic_operations = i_nb_channels * 2;
- 
+
-    {
-        p_data->i_nb_atomic_operations += 2;
-    }
- 
+
-            * p_data->i_nb_atomic_operations );
- 
-
-filter
+
+
+this
-        return -1;
-    }
@@ -232 +253 @@
-    i_next_atomic_operation = 0;
-    i_source_channel_offset = 0;
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , -d_x , d_z , d_min , 2.0 / i_nb_channels );
@@ -240 +261 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , d_x , d_z , d_min , 2.0 / i_nb_channels );
@@ -248 +269 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , -d_x , 0 , d_min , 1.5 / i_nb_channels );
@@ -256 +277 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , d_x , 0 , d_min , 1.5 / i_nb_channels );
@@ -264 +285 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , -d_x , d_z_rear , d_min , 1.5 / i_nb_channels );
@@ -272 +293 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , d_x , d_z_rear , d_min , 1.5 / i_nb_channels );
@@ -280 +301 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , 0 , -d_z , d_min , 1.5 / i_nb_channels );
@@ -288 +309 @@
-        i_source_channel_offset++;
-    }
- 
+
-    {
-        /* having two center channels increases the spatialization effect */
- 
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , d_x / 5.0 , d_z , d_min , 0.75 / i_nb_channels );
-        i_next_atomic_operation += 2;
- 
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , -d_x / 5.0 , d_z , d_min , 0.75 / i_nb_channels );
@@ -301 +322 @@
-        i_source_channel_offset++;
-    }
- 
-
- 
+
+
+
-                , i_next_atomic_operation , i_source_channel_offset
-                , 0 , d_z_rear , d_min , 5.0 / i_nb_channels );
@@ -313 +334 @@
-     * we need it because the process induce a delay in the samples */
-    p_data->i_overflow_buffer_size = 0;
- 
-
- 
+
+
+
-                < p_data->p_atomic_operations[i].i_delay * 2 * sizeof (float) )
-        {
@@ -322 +343 @@
-        }
-    }
- 
- 
-
-filter
+
+
+
+this
-        return -1;
-    }
- ( p_data->p_overflow_buffer 
+( p_data->p_overflow_buffer
-
-    /* end */
@@ -343 +364 @@
-
-    /* Activate this filter only with stereo devices */
- 
+
-            != (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) )
-    {
@@ -351 +372 @@
-
-    /* Request a specific format if not already compatible */
- 
+
-            != p_filter->output.i_original_channels )
-    {
@@ -358 +379 @@
-                                        p_filter->output.i_original_channels;
-    }
- 
+
-          || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
-    {
@@ -365 +386 @@
-        p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
-    }
- 
+
-    {
-        b_fit = VLC_FALSE;
-        p_filter->input.i_rate = p_filter->output.i_rate;
-    }
- 
+
-          && ( p_filter->input.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
-          && ! config_GetInt ( p_filter , "headphone-dolby" ) )
@@ -380 +401 @@
-                                              AOUT_CHAN_REARRIGHT;
-    }
- 
+
-    {
-        msg_Dbg( p_filter, "requesting specific format" );
@@ -388 +409 @@
-    /* Allocate the memory needed to store the module's structure */
-    p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
- 
+
-    {
-        msg_Err( p_filter, "out of memory" );
@@ -398 +419 @@
-    p_filter->p_sys->p_atomic_operations = NULL;
-
- ( Init( p_filter 
+( Init( VLC_OBJECT(p_filter)
-                , aout_FormatNbChannels ( &p_filter->input )
-                , p_filter->input.i_physical_channels
@@ -419 +440 @@
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
+
+
+
+
+
+
+
+
+
+
+
-        p_filter->p_sys = NULL;
-    }
@@ -457 +478 @@
-    unsigned int i_delay;
-    double d_amplitude_factor;
-
-
-    /* out buffer characterisitcs */
@@ -465 +485 @@
-    i_out_size = p_out_buf->i_nb_bytes;
-
- 
+
-    {
-        /* Slide the overflow buffer */
@@ -471 +491 @@
-        i_overflow_size = p_filter->p_sys->i_overflow_buffer_size;
-
- ( p_out , 0 
+( p_out, 0
-        if ( i_out_size > i_overflow_size )
- ( p_out , p_overflow 
+( p_out, p_overflow
-        else
- ( p_out , p_overflow 
+( p_out, p_overflow
-
-        p_slide = p_filter->p_sys->p_overflow_buffer;
- 
-
- 
+
+
+
-            {
- ( p_slide , 0 
- 
- ( p_slide , p_slide + i_out_size 
+( p_slide, 0
+
+( p_slide, p_slide + i_out_size
-                else
- ( p_slide , p_slide + i_out_size
-,
+( p_slide, p_slide + i_out_size,
+     
-            }
-            else
-            {
- ( p_slide , 0 
+( p_slide, 0
-            }
-            p_slide += i_out_size;
@@ -497 +517 @@
-
-        /* apply the atomic operations */
- ( i = 0 ; i < p_filter->p_sys->i_nb_atomic_operations 
+( i = 0; i < p_filter->p_sys->i_nb_atomic_operations
-        {
-            /* shorter variable names */
@@ -508 +528 @@
-                = p_filter->p_sys->p_atomic_operations[i].d_amplitude_factor;
-
- 
+
-            {
-                /* current buffer coefficients */
- ( j = 0 ; j < p_out_buf->i_nb_samples - i_delay 
+( j = 0; j < p_out_buf->i_nb_samples - i_delay
-                {
-                    ((float*)p_out)[ (i_delay+j)*i_output_nb + i_dest_channel_offset ]
@@ -519 +539 @@
-
-                /* overflow buffer coefficients */
- ( j = 0 ; j < i_delay 
+( j = 0; j < i_delay
-                {
-                    ((float*)p_overflow)[ j*i_output_nb + i_dest_channel_offset ]
@@ -530 +550 @@
-            {
-                /* overflow buffer coefficients only */
- ( j = 0 ; j < p_out_buf->i_nb_samples 
+( j = 0; j < p_out_buf->i_nb_samples
-                {
-                    ((float*)p_overflow)[ (i_delay - p_out_buf->i_nb_samples + j)
@@ -542 +562 @@
-    else
-    {
- ( p_out , 0 
+( p_out, 0
-    }
-}
+
+/*
+ * Audio filter 2
+ */
+/*****************************************************************************
+ * OpenFilter:
+ *****************************************************************************/
+static int OpenFilter( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    vlc_bool_t b_fit = VLC_TRUE;
+
+    /* Activate this filter only with stereo devices */
+    if( p_filter->fmt_out.audio.i_physical_channels
+            != (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) )
+    {
+        msg_Dbg( p_filter, "filter discarded (incompatible format)" );
+        return VLC_EGENERIC;
+    }
+
+    /* Request a specific format if not already compatible */
+    if( p_filter->fmt_in.audio.i_original_channels
+            != p_filter->fmt_out.audio.i_original_channels )
+    {
+        b_fit = VLC_FALSE;
+        p_filter->fmt_in.audio.i_original_channels =
+                                        p_filter->fmt_out.audio.i_original_channels;
+    }
+    if( p_filter->fmt_in.audio.i_format != VLC_FOURCC('f','l','3','2')
+          || p_filter->fmt_out.audio.i_format != VLC_FOURCC('f','l','3','2') )
+    {
+        b_fit = VLC_FALSE;
+        p_filter->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
+        p_filter->fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
+    }
+    if( p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate )
+    {
+        b_fit = VLC_FALSE;
+        p_filter->fmt_in.audio.i_rate = p_filter->fmt_out.audio.i_rate;
+    }
+    if( p_filter->fmt_in.audio.i_physical_channels == (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT)
+          && ( p_filter->fmt_in.audio.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+          && !config_GetInt( p_filter, "headphone-dolby" ) )
+    {
+        b_fit = VLC_FALSE;
+        p_filter->fmt_in.audio.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+                                              AOUT_CHAN_CENTER |
+                                              AOUT_CHAN_REARLEFT |
+                                              AOUT_CHAN_REARRIGHT;
+    }
+    if( !b_fit )
+    {
+        msg_Dbg( p_filter, "requesting specific format" );
+        return VLC_EGENERIC;
+    }
+
+    /* Allocate the memory needed to store the module's structure */
+    p_filter->p_sys = malloc( sizeof(struct filter_sys_t) );
+    if( p_filter->p_sys == NULL )
+    {
+        msg_Err( p_filter, "out of memory" );
+        return VLC_EGENERIC;
+    }
+    p_filter->p_sys->i_overflow_buffer_size = 0;
+    p_filter->p_sys->p_overflow_buffer = NULL;
+    p_filter->p_sys->i_nb_atomic_operations = 0;
+    p_filter->p_sys->p_atomic_operations = NULL;
+
+    if( Init( VLC_OBJECT(p_filter), (struct aout_filter_sys_t *)p_filter->p_sys
+                , aout_FormatNbChannels ( &(p_filter->fmt_in.audio) )
+                , p_filter->fmt_in.audio.i_physical_channels
+                , p_filter->fmt_in.audio.i_rate ) < 0 )
+    {
+        return VLC_EGENERIC;
+    }
+
+    p_filter->pf_audio_filter = Convert;
+    p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
+msg_Dbg( p_this, ">> HEADPHONE filter loaded" );
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * CloseFilter : deallocate data structures
+ *****************************************************************************/
+static void CloseFilter( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    if( p_filter->p_sys != NULL )
+    {
+        if( p_filter->p_sys->p_overflow_buffer != NULL )
+        {
+            free ( p_filter->p_sys->p_overflow_buffer );
+        }
+        if( p_filter->p_sys->p_atomic_operations != NULL )
+        {
+            free ( p_filter->p_sys->p_atomic_operations );
+        }
+        free( p_filter->p_sys );
+        p_filter->p_sys = NULL;
+    }
+
+    if( p_sys) free( p_sys );
+}
+
+static block_t *Convert( filter_t *p_filter, block_t *p_block )
+{
+    aout_filter_t aout_filter;
+    aout_buffer_t in_buf, out_buf;
+    block_t *p_out;
+    int i_out_size;
+
+    if( !p_block || !p_block->i_samples )
+    {
+        if( p_block ) p_block->pf_release( p_block );
+        return NULL;
+    }
+
+    i_out_size = p_block->i_samples *
+      p_filter->fmt_out.audio.i_bitspersample *
+        p_filter->fmt_out.audio.i_channels / 8;
+
+    p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
+    if( !p_out )
+    {
+        msg_Warn( p_filter, "can't get output buffer" );
+        if( p_block ) p_block->pf_release( p_block );
+        return NULL;
+    }
+
+    p_out->i_samples = p_block->i_samples;
+    p_out->i_dts = p_block->i_dts;
+    p_out->i_pts = p_block->i_pts;
+    p_out->i_length = p_block->i_length;
+
+    aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
+    aout_filter.input = p_filter->fmt_in.audio;
+    aout_filter.input.i_format = p_filter->fmt_in.i_codec;
+    aout_filter.output = p_filter->fmt_out.audio;
+    aout_filter.output.i_format = p_filter->fmt_out.i_codec;
+    aout_filter.b_in_place = 0;
+
+    in_buf.p_buffer = p_block->p_buffer;
+    in_buf.i_nb_bytes = p_block->i_buffer;
+    in_buf.i_nb_samples = p_block->i_samples;
+    out_buf.p_buffer = p_out->p_buffer;
+    out_buf.i_nb_bytes = p_out->i_buffer;
+    out_buf.i_nb_samples = p_out->i_samples;
+
+    DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+
+    p_out->i_buffer = out_buf.i_nb_bytes;
+    p_out->i_samples = out_buf.i_nb_samples;
+
+    if( p_block ) p_block->pf_release( p_block );
+    return p_out;
+}