Changeset 036c9c52326be9a14c439ffe5b7e04861779a31d

Timestamp:

09/25/05 18:49:40 (3 years ago)

Author:

Boris Dorès <babal@videolan.org>

git-committer:

Boris Dorès <babal@videolan.org> 1127666980 +0000

git-parent:

[880f95fd6fd6cbeeb9734f0ab72bc4d77b84b273]

git-author:

Boris Dorès <babal@videolan.org> 1127666980 +0000

Message:

- the creation of the audio filter pipeline when specifying user audio

channel mixers was broken (again) in 0.8.1 and 0.8.2; hopefully this
will fix it for good, by allowing audio filters to request a specific
format rather than imposing them an arbitrary one

- various other small fixes in the audio output core
- option to force detection of Dolby Surround
- simple module to decode Dolby Surround
- increase spatialization with two center speakers and fix channel

order for 7.1 streams in the headphone channel mixer

Files:

• configure.ac (modified) (1 diff)
• modules/LIST (modified) (1 diff)
• modules/audio_filter/channel_mixer/Modules.am (modified) (1 diff)
• modules/audio_filter/channel_mixer/dolby.c (added)
• modules/audio_filter/channel_mixer/headphone.c (modified) (10 diffs)
• modules/audio_filter/equalizer.c (modified) (1 diff)
• modules/audio_filter/normvol.c (modified) (2 diffs)
• modules/gui/macosx/extended.m (modified) (1 diff)
• modules/gui/wxwidgets/extrapanel.cpp (modified) (1 diff)
• src/audio_output/filters.c (modified) (6 diffs)
• src/audio_output/input.c (modified) (23 diffs)
• src/audio_output/output.c (modified) (1 diff)
• src/input/decoder.c (modified) (1 diff)
• src/libvlc.h (modified) (4 diffs)
• vlc.spec.mdk (modified) (1 diff)

configure.ac

@@ -1016 +1016 @@
-  VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
-  VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])
-
+dolby_surround_decoder 
-  VLC_ADD_PLUGINS([fixed32tofloat32 float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif s16tofloat32 s16tofloat32swab s8tofloat32 u8tofloat32 audio_format])
-fi

modules/LIST

@@ -110 +110 @@
- * dmo: a DirectMediaObject decoder that uses DirectMedia to decode video (WMV3)
-
+ * dolby_surround_decoder: simple decoder for dolby surround encoded streams
+
- * dshow: DirectShow access plugin for encoding cards under Windows
-

modules/audio_filter/channel_mixer/Modules.am

@@ -2 +2 @@
-SOURCES_simple_channel_mixer = simple.c
-SOURCES_headphone_channel_mixer = headphone.c
+SOURCES_dolby_surround_decoder = dolby.c

modules/audio_filter/channel_mixer/headphone.c

@@ -3 +3 @@
- *               -> gives the feeling of a real room with a simple headphone
- *****************************************************************************
-
+-2005
- * $Id$
- *
@@ -48 +48 @@
-#define MODULE_DESCRIPTION N_ ( \
-     "This effect gives you the feeling that you are standing in a room " \
-5
+7
-     "providing a more realistic sound experience. It should also be " \
-     "more comfortable and less tiring when listening to music for " \
-     "long periods of time.\nIt works with any source format from mono " \
-5
+7
-
-#define HEADPHONE_DIM_TEXT N_("Characteristic dimension")
@@ -185 +185 @@
-    /* Number of elementary operations */
-    p_data->i_nb_atomic_operations = i_nb_channels * 2;
+    if ( i_physical_channels & AOUT_CHAN_CENTER )
+    {
+        p_data->i_nb_atomic_operations += 2;
+    }
-    p_data->p_atomic_operations = malloc ( sizeof(struct atomic_operation_t)
-            * p_data->i_nb_atomic_operations );
@@ -213 +217 @@
-        i_source_channel_offset++;
-    }
+    if ( i_physical_channels & AOUT_CHAN_MIDDLELEFT )
+    {
+        ComputeChannelOperations ( p_data , i_rate
+                , i_next_atomic_operation , i_source_channel_offset
+                , -d_x , 0 , 1.5 / i_nb_channels );
+        i_next_atomic_operation += 2;
+        i_source_channel_offset++;
+    }
+    if ( i_physical_channels & AOUT_CHAN_MIDDLERIGHT )
+    {
+        ComputeChannelOperations ( p_data , i_rate
+                , i_next_atomic_operation , i_source_channel_offset
+                , d_x , 0 , 1.5 / i_nb_channels );
+        i_next_atomic_operation += 2;
+        i_source_channel_offset++;
+    }
-    if ( i_physical_channels & AOUT_CHAN_REARLEFT )
-    {
@@ -239 +259 @@
-    if ( i_physical_channels & AOUT_CHAN_CENTER )
-    {
-
-
-
+
+
+
+
+
+
+
+
-        i_next_atomic_operation += 2;
-        i_source_channel_offset++;
@@ -250 +275 @@
-                , i_next_atomic_operation , i_source_channel_offset
-                , 0 , d_z_rear , 5.0 / i_nb_channels );
-        i_next_atomic_operation += 2;
-        i_source_channel_offset++;
-    }
-    if ( i_physical_channels & AOUT_CHAN_MIDDLELEFT )
-    {
-        ComputeChannelOperations ( p_data , i_rate
-                , i_next_atomic_operation , i_source_channel_offset
-                , -d_x , 0 , 1.5 / i_nb_channels );
-        i_next_atomic_operation += 2;
-        i_source_channel_offset++;
-    }
-    if ( i_physical_channels & AOUT_CHAN_MIDDLERIGHT )
-    {
-        ComputeChannelOperations ( p_data , i_rate
-                , i_next_atomic_operation , i_source_channel_offset
-                , d_x , 0 , 1.5 / i_nb_channels );
-        i_next_atomic_operation += 2;
-        i_source_channel_offset++;
@@ -302 +311 @@
-{
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -317 +357 @@
-    if ( p_filter->p_sys == NULL )
-    {
-o
--1
+O
+VLC_EGENERIC
-    }
-    p_filter->p_sys->i_overflow_buffer_size = 0;
@@ -330 +370 @@
-                ,  p_filter->input.i_rate ) < 0 )
-    {
--1
+VLC_EGENERIC
-    }
-
@@ -336 +376 @@
-    p_filter->b_in_place = 0;
-
-0
+VLC_SUCCESS
-}
-

modules/audio_filter/equalizer.c

@@ -137 +137 @@
-    aout_filter_t     *p_filter = (aout_filter_t *)p_this;
-    aout_filter_sys_t *p_sys;
+    vlc_bool_t         b_fit = VLC_TRUE;
-
-    if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) ||
-        p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
-    {
+        b_fit = VLC_FALSE;
+        p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
+        p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
-        msg_Warn( p_filter, "Bad input or output format" );
-        return VLC_EGENERIC;
-    }
-    if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
-    {
+        b_fit = VLC_FALSE;
+        memcpy( &p_filter->output, &p_filter->input,
+                sizeof(audio_sample_format_t) );
-        msg_Warn( p_filter, "input and output formats are not similar" );
+    }
+
+    if ( ! b_fit )
+    {
-        return VLC_EGENERIC;
-    }

modules/audio_filter/normvol.c

@@ -99 +99 @@
-{
-    aout_filter_t *p_filter = (aout_filter_t*)p_this;
+    vlc_bool_t b_fit = VLC_TRUE;
-    int i_channels;
-    aout_filter_sys_t *p_sys = p_filter->p_sys =
@@ -106 +107 @@
-        p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
-    {
-
-
+
+
+
+
-    }
-
-    if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
-    {
+        b_fit = VLC_FALSE;
+        memcpy( &p_filter->output, &p_filter->input,
+                sizeof(audio_sample_format_t) );
-        msg_Warn( p_filter, "input and output formats are not similar" );
+    }
+
+    if ( ! b_fit )
+    {
-        return VLC_EGENERIC;
-    }

modules/gui/macosx/extended.m

@@ -367 +367 @@
-    if ([o_ckb_hdphnVirt state] == NSOnState)
-    {
-
+_channel_mixer
-    }else{
-
+_channel_mixer
-    }
-}

modules/gui/wxwidgets/extrapanel.cpp

@@ -820 +820 @@
-    aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
-                                 VLC_OBJECT_AOUT, FIND_ANYWHERE);
-
+_channel_mixer
-                         event.IsChecked() ? VLC_TRUE : VLC_FALSE );
-    if( p_aout != NULL )

src/audio_output/filters.c

@@ -117 +117 @@
-}
-
+static void ReleaseFilter( aout_filter_t * p_filter )
+{
+    module_Unneed( p_filter, p_filter->p_module );
+    vlc_object_detach( p_filter );
+    vlc_object_destroy( p_filter );
+}
+
-/*****************************************************************************
- * aout_FiltersCreatePipeline: create a filters pipeline to transform a sample
- *                             format to another
- *****************************************************************************
-TODO : allow the user to add/remove specific filters
+pi_nb_filters must be initialized before calling this function
- *****************************************************************************/
-int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
-
+_start
-                                int * pi_nb_filters,
-                                const audio_sample_format_t * p_input_format,
-                                const audio_sample_format_t * p_output_format )
-{
+    aout_filter_t** pp_filters = pp_filters_start + *pi_nb_filters;
-    audio_sample_format_t temp_format;
-    int i_nb_conversions;
@@ -135 +143 @@
-    {
-        msg_Dbg( p_aout, "no need for any filter" );
-        *pi_nb_filters = 0;
-        return 0;
-    }
-
-    aout_FormatsPrint( p_aout, "filter(s)", p_input_format, p_output_format );
+
+    if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS )
+    {
+        msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
+        return -1;
+    }
-
-    /* Try to find a filter to do the whole conversion. */
@@ -146 +159 @@
-    {
-        msg_Dbg( p_aout, "found a filter for the whole conversion" );
-*pi_nb_filters = 1
+++*pi_nb_filters
-        return 0;
-    }
@@ -178 +191 @@
-    /* We have the first stage of the conversion. Find a filter for
-     * the rest. */
+    if( *pi_nb_filters + 2 > AOUT_MAX_FILTERS )
+    {
+        ReleaseFilter( pp_filters[0] );
+        msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
+        return -1;
+    }
-    pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
-                                p_output_format );
@@ -187 +206 @@
-        if ( !i_nb_conversions )
-        {
-
-
+
-            msg_Err( p_aout,
-              "couldn't find a filter for the second part of the conversion" );
+            return -1;
+        }
+        if( *pi_nb_filters + 3 > AOUT_MAX_FILTERS )
+        {
+            ReleaseFilter( pp_filters[0] );
+            msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
+            return -1;
-        }
-        pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
@@ -199 +224 @@
-        if ( pp_filters[1] == NULL || pp_filters[2] == NULL )
-        {
-
-
+
-            if ( pp_filters[1] != NULL )
-            {
-
-
+
-            }
-            if ( pp_filters[2] != NULL )
-            {
-
-
+
-            }
-            msg_Err( p_aout,
-               "couldn't find filters for the second part of the conversion" );
-
-
+
+
+
+
-    }
-    else
-    {
-
-
-
-
-
-
+
+
+
+
-    return 0;
-}

src/audio_output/input.c

@@ -38 +38 @@
-#include "aout_internal.h"
-
+static void inputFailure( aout_instance_t *, aout_input_t *, char * );
-static int VisualizationCallback( vlc_object_t *, char const *,
-                                  vlc_value_t, vlc_value_t, void * );
-static int EqualizerCallback( vlc_object_t *, char const *,
-                              vlc_value_t, vlc_value_t, void * );
-static aout_filter_t * allocateUserChannelMixer( aout_instance_t *,
-                                                 audio_sample_format_t *,
-                                                 audio_sample_format_t * );
-
-/*****************************************************************************
@@ -51 +49 @@
-int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
-{
-user_filter
-intermediate_format;/* input of resampler */
+chain_input
+chain_output_format;
-    vlc_value_t val, text;
-    char * psz_filters, *psz_visual;
-    aout_filter_t * p_user_channel_mixer;
-
-    aout_FormatPrint( p_aout, "input", &p_input->input );
+
+    p_input->i_nb_filters = 0;
-
-    /* Prepare FIFO. */
@@ -64 +63 @@
-
-    /* Prepare format structure */
-intermediate_format, &p_aout->mixer.mixer
+chain_input_format, &p_input->input
-            sizeof(audio_sample_format_t) );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /* Now add user filters */
@@ -199 +170 @@
-    }
-
+    /* parse user filter list */
-    if( psz_filters && *psz_filters )
-    {
@@ -205 +177 @@
-        while( psz_parser && *psz_parser )
-        {
-
+ = NULL
-
-            if( p_input->i_nb_filters >= AOUT_MAX_FILTERS )
@@ -225 +197 @@
-                break;
-            }
-
-            msg_Dbg( p_aout, "user filter \"%s\"", psz_parser );
-
-            /* Create a VLC object */
@@ -239 +209 @@
-
-            vlc_object_attach( p_filter , p_aout );
-
+
+
+
-                    sizeof(audio_sample_format_t) );
-user_filter
+chain_output
-                    sizeof(audio_sample_format_t) );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-                    msg_Err( p_aout, "cannot add user filter %s (skipped)",
-                             psz_parser );
-
+                    module_Unneed( p_filter, p_filter->p_module );
-                    vlc_object_detach( p_filter );
-                    vlc_object_destroy( p_filter );
+
-                    psz_parser = psz_next;
-                    continue;
-                }
-            }
+
+            /* success */
-            p_filter->b_continuity = VLC_FALSE;
-
-            p_input->pp_filters[p_input->i_nb_filters++] = p_filter;
+            memcpy( &chain_input_format, &p_filter->output,
+                    sizeof( audio_sample_format_t ) );
-
-            /* next filter if any */
@@ -274 +291 @@
-    if( psz_visual ) free( psz_visual );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -284 +308 @@
-    p_input->input_alloc.i_bytes_per_sec = -1;
-
+    /* Create resamplers. */
-    if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
-    {
@@ -290 +315 @@
-    else
-    {
-
-
+
-                                            p_aout->mixer.mixer.i_rate)
-                                 * (100 + AOUT_MAX_RESAMPLING)) / 100;
-intermediate
+chain_output
-        {
-            /* Just in case... */
-
-
+
+
+
-        if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers,
-                                         &p_input->i_nb_resamplers,
-intermediate
+chain_output
-                                         &p_aout->mixer.mixer ) < 0 )
-        {
-
-
-
-
-
-
-
-
+
-            return -1;
-        }
@@ -318 +336 @@
-                                 p_input->i_nb_resamplers,
-                                 &p_input->input_alloc );
+        p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
-
-        /* Setup the initial rate of the resampler */
@@ -324 +343 @@
-    p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
-
-    p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
-    aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
-                             p_input->i_nb_filters,
-                             &p_input->input_alloc );
+    p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
-
-    /* i_bytes_per_sec is still == -1 if no filters */
@@ -335 +354 @@
-                                     * p_input->input.i_rate
-                                     / p_input->input.i_frame_length) );
-
-
-
+
+
-    p_input->b_error = VLC_FALSE;
-    p_input->b_restart = VLC_FALSE;
@@ -355 +373 @@
-    aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
-                                 p_input->i_nb_filters );
+    p_input->i_nb_filters = 0;
-    aout_FiltersDestroyPipeline( p_aout, p_input->pp_resamplers,
-                                 p_input->i_nb_resamplers );
+    p_input->i_nb_resamplers = 0;
-    aout_FifoDestroy( p_aout, &p_input->fifo );
-
@@ -573 +593 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                 char *psz_name, vlc_bool_t b_add )
-{
@@ -579 +624 @@
-    char *psz_parser;
-
-"audio-filter"
+psz_variable
-
-    if( !val.psz_string ) val.psz_string = strdup("");
@@ -614 +659 @@
-    }
-
-"audio-filter"
+psz_variable
-    free( val.psz_string );
-    return 1;
@@ -629 +674 @@
-    if( !psz_mode || !*psz_mode )
-    {
-
-
-
+audio-visual", "
+audio-visual", "
+audio-visual", "
-    }
-    else
@@ -637 +682 @@
-        if( !strcmp( "goom", psz_mode ) )
-        {
-
-
-galaktos", VLC_FALSE 
+audio-visual", "
+audio-visual", "
+audio-visual", "galaktos", VLC_FALSE
-        }
-        else if( !strcmp( "galaktos", psz_mode ) )
-        {
-
-
-
+audio-visual", "
+audio-visual", "
+audio-visual", "
-        }
-        else
@@ -653 +698 @@
-            var_Set( p_aout, "effect-list", val );
-
-
-
-galaktos", VLC_FALSE 
+audio-visual", "
+audio-visual", "
+audio-visual", "galaktos", VLC_FALSE
-        }
-    }
@@ -679 +724 @@
-    if( !psz_mode || !*psz_mode )
-    {
-
+
+
-    }
-    else
@@ -686 +732 @@
-        var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING );
-        var_Set( p_aout, "equalizer-preset", val );
-
+
+
-
-    }
@@ -701 +748 @@
-    return VLC_SUCCESS;
-}
-
-static aout_filter_t * allocateUserChannelMixer( aout_instance_t * p_aout,
-                                     audio_sample_format_t * p_input_format,
-                                     audio_sample_format_t * p_output_format )
-{
-    aout_filter_t * p_channel_mixer;
-
-    /* Retreive user preferred channel mixer */
-    char * psz_name = config_GetPsz( p_aout, "audio-channel-mixer" );
-
-    /* Not specified => let the main pipeline do the mixing */
-    if ( ! psz_name ) return NULL;
-
-    /* Debug information */
-    aout_FormatsPrint( p_aout, "channel mixer", p_input_format,
-                       p_output_format );
-
-    /* Create a VLC object */
-    p_channel_mixer = vlc_object_create( p_aout, sizeof(aout_filter_t) );
-    if( p_channel_mixer == NULL )
-    {
-        msg_Err( p_aout, "cannot add user channel mixer %s", psz_name );
-        return NULL;
-    }
-    vlc_object_attach( p_channel_mixer , p_aout );
-
-    /* Attach the suitable module */
-    memcpy( &p_channel_mixer->input, p_input_format,
-                    sizeof(audio_sample_format_t) );
-    memcpy( &p_channel_mixer->output, p_output_format,
-                    sizeof(audio_sample_format_t) );
-    p_