Changeset 7a58ef70ff4c51288388703728752bce3f253c96

Timestamp:

27/09/02 00:40:27 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1033080027 +0000

git-parent:

[cc35b1d0a2f11f64d942b2637517c6b450ec8290]

git-author:

Christophe Massiot <massiot@videolan.org> 1033080027 +0000

Message:

* Major API change of the audio output. New aout_Dec* functions.
* Fixed a compile issue in s16tofloat32swab.
* Fixed a typo in demux/mpeg/ts.c.

Files:

• Makefile.old (modified) (1 diff)
• include/aout_internal.h (modified) (7 diffs)
• include/audio_output.h (modified) (4 diffs)
• include/vlc_symbols.h (modified) (6 diffs)
• modules/audio_filter/converter/s16tofloat32swab.c (modified) (2 diffs)
• modules/codec/a52.c (modified) (6 diffs)
• modules/codec/a52old/a52old.c (modified) (6 diffs)
• modules/codec/faad/decoder.c (modified) (6 diffs)
• modules/codec/lpcm.c (modified) (5 diffs)
• modules/codec/mad/libmad.c (modified) (4 diffs)
• modules/codec/mpeg_audio/decoder.c (modified) (6 diffs)
• modules/demux/mpeg/ts.c (modified) (2 diffs)
• src/audio_output/audio_output.c (deleted)
• src/audio_output/common.c (added)
• src/audio_output/dec.c (added)
• src/audio_output/input.c (modified) (8 diffs)
• src/audio_output/intf.c (modified) (9 diffs)
• src/audio_output/mixer.c (modified) (10 diffs)
• src/audio_output/output.c (modified) (5 diffs)
• src/libvlc.c (modified) (2 diffs)
• src/misc/modules_plugin.h (modified) (3 diffs)

Makefile.old

@@ -23 +23 @@
-INPUT := input input_ext-plugins input_ext-dec input_ext-intf input_dec input_programs input_clock input_info
-VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
-audio_output filters input mixer output intf
+common filters input mixer output intf dec
-STREAM_OUTPUT := stream_output
-MISC := mtime modules threads cpu configuration netutils iso_lang messages objects extras

include/aout_internal.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-0 2002/09/20 23:27:03
+1 2002/09/26 22:40:18
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -121 +121 @@
-                                         struct aout_buffer_t * );
-
+    /* If b_error == 1, there is no mixer nor audio output pipeline. */
+    vlc_bool_t              b_error;
-    /* Multiplier used to raise or lower the volume of the sound in
-     * software. Beware, this creates sound distortion and should be avoided
@@ -148 +150 @@
-    byte_t *                p_first_byte_to_mix;
-
-s the input dead ?
+f b_error == 1, there is no input pipeline.
-    vlc_bool_t              b_error;
+    /* Did we just change the output format ? (expect buffer inconsistencies) */
+    vlc_bool_t              b_changed;
-};
-
@@ -187 +191 @@
-    /* Locks : please note that if you need several of these locks, it is
-     * mandatory (to avoid deadlocks) to take them in the following order :
-p_input->lock, mixer_
+mixer_lock, p_input->
-     * --Meuuh */
-    /* When input_fifos_lock is taken, none of the p_input->fifo structures
@@ -215 +219 @@
- *****************************************************************************/
-/* From input.c : */
+int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input );
+int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input );
-int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
-                    aout_buffer_t * p_buffer );
@@ -236 +242 @@
-/* From mixer.c : */
-int aout_MixerNew( aout_instance_t * p_aout );
-void
+int
-void aout_MixerRun( aout_instance_t * p_aout );
-int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier );
@@ -248 +254 @@
-VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, vlc_bool_t ) );
-
-audio_output
+common
-VLC_EXPORT( int, aout_FormatNbChannels, ( audio_sample_format_t * p_format ) );
-void aout_FormatPrepare( audio_sample_format_t * p_format );

include/audio_output.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2002/09/20 23:27:03
+7 2002/09/26 22:40:18
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -169 +169 @@
- * Prototypes
- *****************************************************************************/
-
-
-
-
-
-
-
+
+
+
+
-VLC_EXPORT( void, aout_DateInit, ( audio_date_t *, u32 ) );
-VLC_EXPORT( void, aout_DateSet, ( audio_date_t *, mtime_t ) );
@@ -182 +179 @@
-VLC_EXPORT( mtime_t, aout_DateIncrement, ( audio_date_t *, u32 ) );
-
-
-
-
-
+
+
+
+
+
+
+
-
-/* From intf.c : */
@@ -193 +193 @@
-VLC_EXPORT( int, aout_VolumeUp, ( aout_instance_t *, int, audio_volume_t * ) );
-VLC_EXPORT( int, aout_VolumeDown, ( aout_instance_t *, int, audio_volume_t * ) );
+VLC_EXPORT( int, aout_Restart, ( aout_instance_t * p_aout ) );
-

include/vlc_symbols.h

@@ -3 +3 @@
-struct module_symbols_t
-{
-BufferNew
+DecNewBuffer
-    aout_buffer_t * (* aout_FifoPop_inner) ( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) ;
-    aout_buffer_t * (* aout_OutputNextBuffer_inner) ( aout_instance_t *, mtime_t, vlc_bool_t ) ;
-Input
-Instance
+Dec
+
-    char * (* __config_GetPsz_inner) (vlc_object_t *, const char *) ;
-    char * (* config_GetHomeDir_inner) ( void ) ;
@@ -38 +38 @@
-    int (* __vlc_threads_end_inner) ( vlc_object_t * ) ;
-    int (* __vlc_threads_init_inner) ( vlc_object_t * ) ;
-
+
+
-    int (* aout_FormatNbChannels_inner) ( audio_sample_format_t * p_format ) ;
+    int (* aout_Restart_inner) ( aout_instance_t * p_aout ) ;
-    int (* aout_VolumeDown_inner) ( aout_instance_t *, int, audio_volume_t * ) ;
-    int (* aout_VolumeGet_inner) ( aout_instance_t *, audio_volume_t * ) ;
@@ -112 +114 @@
-    void (* __vlc_thread_join_inner) ( vlc_object_t *, char *, int ) ;
-    void (* __vlc_thread_ready_inner) ( vlc_object_t * ) ;
-    void (* aout_BufferDelete_inner) ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ;
-    void (* aout_DateInit_inner) ( audio_date_t *, u32 ) ;
-    void (* aout_DateMove_inner) ( audio_date_t *, mtime_t ) ;
-    void (* aout_DateSet_inner) ( audio_date_t *, mtime_t ) ;
-leteInstance_inner) ( aout_instance
-InputDelete_inner) ( aout_instance_t *, aout_input
+cDeleteBuffer_inner) ( aout_instance_t *, aout_input_t *, aout_buffer
+Delete_inner) ( aout_instance
-    void (* aout_VolumeNoneInit_inner) ( aout_instance_t * ) ;
-    void (* aout_VolumeSoftInit_inner) ( aout_instance_t * ) ;
@@ -173 +174 @@
-#   define UnalignedRemoveBits p_symbols->UnalignedRemoveBits_inner
-#   define UnalignedShowBits p_symbols->UnalignedShowBits_inner
-InputNew p_symbols->__aout_Input
-Instance p_symbols->__aout_NewInstance
+DecNew p_symbols->__aout_Dec
+ p_symbols->__aout_New
-#   define __config_GetFloat p_symbols->__config_GetFloat_inner
-#   define __config_GetInt p_symbols->__config_GetInt_inner
@@ -223 +224 @@
-#   define __vlc_threads_init p_symbols->__vlc_threads_init_inner
-#   define __vout_CreateThread p_symbols->__vout_CreateThread_inner
-#   define aout_BufferDelete p_symbols->aout_BufferDelete_inner
-#   define aout_BufferNew p_symbols->aout_BufferNew_inner
-#   define aout_BufferPlay p_symbols->aout_BufferPlay_inner
-#   define aout_DateGet p_symbols->aout_DateGet_inner
-#   define aout_DateIncrement p_symbols->aout_DateIncrement_inner
@@ -231 +229 @@
-#   define aout_DateMove p_symbols->aout_DateMove_inner
-#   define aout_DateSet p_symbols->aout_DateSet_inner
-
+
+
+
+
+
-#   define aout_FifoPop p_symbols->aout_FifoPop_inner
-#   define aout_FormatNbChannels p_symbols->aout_FormatNbChannels_inner
-#   define aout_InputDelete p_symbols->aout_InputDelete_inner
-#   define aout_OutputNextBuffer p_symbols->aout_OutputNextBuffer_inner
+#   define aout_Restart p_symbols->aout_Restart_inner
-#   define aout_VolumeDown p_symbols->aout_VolumeDown_inner
-#   define aout_VolumeGet p_symbols->aout_VolumeGet_inner

modules/audio_filter/converter/s16tofloat32swab.c

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-3 2002/09/20 23:27:03
+4 2002/09/26 22:40:19
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -116 +116 @@
-        p_tmp[0] = ((byte_t *)p_in)[1];
-        p_tmp[1] = ((byte_t *)p_in)[0];
-*
+
-#else
-        *p_out = (float)*p_in / 32768.0;

modules/codec/a52.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2002 VideoLAN
-2 2002/09/20 23:27:03
+3 2002/09/26 22:40:20
- *
- * Authors: St�ane Borel <stef@via.ecp.fr>
@@ -175 +175 @@
-        {
-            /* Parameters changed - this should not happen. */
-Input
+Dec
-            p_dec->p_aout_input = NULL;
-        }
@@ -187 +187 @@
-            p_dec->output_format.i_frame_length = A52_FRAME_NB;
-            aout_DateInit( &end_date, i_rate );
-Input
-  
-  
+Dec
+
+
-
-            if ( p_dec->p_aout_input == NULL )
@@ -207 +207 @@
-        }
-
-BufferNew
-
+DecNewBuffer
+   
-        if ( p_buffer == NULL ) return -1;
-        p_buffer->start_date = aout_DateGet( &end_date );
@@ -220 +220 @@
-        if( p_dec->p_fifo->b_die )
-        {
-BufferDelete
-
+DecDeleteBuffer
+   
-            break;
-        }
-
-        /* Send the buffer to the mixer. */
-Buffer
+Dec
-    }
-
@@ -248 +248 @@
-    if ( p_dec->p_aout_input != NULL )
-    {
-Input
+Dec
-    }
-

modules/codec/a52old/a52old.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-6 2002/08/30 22:22:24
+7 2002/09/26 22:40:20
- *
- * Authors: Michel Lespinasse <walken@zoy.org>
@@ -168 +168 @@
-                /* Delete old output */
-                msg_Warn( p_a52dec->p_fifo, "opening a new aout" );
-Input
+Dec
-            }
-
@@ -176 +176 @@
-            output_format.i_rate     = sync_info.sample_rate;
-            aout_DateInit( &end_date, output_format.i_rate );
-Input
-  
-  
+Dec
+
+
-        }
-
@@ -199 +199 @@
-        }
-
-BufferNew
-
-
+DecNewBuffer
+   
+   
-        if( !p_aout_buffer )
-        {
@@ -216 +216 @@
-        {
-            b_sync = 0;
-BufferDelete
-               
+DecDeleteBuffer
+
-            continue;
-        }
-        else
-        {
-Buffer
-                     
+Dec
+
-        }
-
@@ -345 +345 @@
-    if( p_a52dec->p_aout_input )
-    {
-Input
+Dec
-    }
-

modules/codec/faad/decoder.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-2 2002/08/23 14:05:22 sam
+3 2002/09/26 22:40:21 massiot
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -448 +448 @@
-        {
-            /* **** Delete the old **** */
-Input
+Dec
-        }
-
@@ -454 +454 @@
-        p_adec->output_format.i_channels = faad_frame.channels;
-        aout_DateInit( &p_adec->date, p_adec->output_format.i_rate );
-Input
-  
-  
+Dec
+
+
-    }
-
@@ -474 +474 @@
-    }
-
-BufferNew
-
-
+DecNewBuffer
+   
+   
-    if( !p_aout_buffer )
-    {
@@ -491 +491 @@
-            p_aout_buffer->i_nb_bytes );
-
-Buffer
+Dec
-}
-
@@ -502 +502 @@
-    if( p_adec->p_aout_input )
-    {
-Input
+Dec
-    }
-

modules/codec/lpcm.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-1 2002/09/20 23:27:03
+2 2002/09/26 22:40:20
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -132 +132 @@
-    
-    aout_DateInit( &p_dec->end_date, 48000 );
-Input
-  
-  
+Dec
+
+
-
-    if ( p_dec->p_aout_input == NULL )
@@ -176 +176 @@
-    }
-    
-BufferNew
-
-
+DecNewBuffer
+     
+     
-    
-    if( !p_aout_buffer )
@@ -201 +201 @@
-    if( p_dec->p_fifo->b_die )
-    {
-BufferDelete
-
+DecDeleteBuffer
+   
-        return;
-    }
-
-Buffer
-   
+Dec
+
-}
-
@@ -217 +217 @@
-    if( p_dec->p_aout_input != NULL )
-    {
-Input
+Dec
-    }
-

modules/codec/mad/libmad.c

@@ -156 +156 @@
-    {
-        /* Parameters changed - this should not happen. */
-Input
+Dec
-        p_dec->p_aout_input = NULL;
-    }
@@ -166 +166 @@
-        p_dec->output_format.i_channels = p_pcm->channels;
-        aout_DateInit( &p_dec->end_date, p_pcm->samplerate );
-Input
-  
-  
+Dec
+
+
-
-        if ( p_dec->p_aout_input == NULL )
@@ -200 +200 @@
-    }
-
-BufferNew
+DecNewBuffer
-
-    if ( p_buffer == NULL )
@@ -234 +234 @@
-    }
-
-Buffer
+Dec
-
-    return MAD_FLOW_CONTINUE;

modules/codec/mpeg_audio/decoder.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2002/08/26 23:00:22
+4 2002/09/26 22:40:23
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -175 +175 @@
-                /* Delete old output */
-                msg_Warn( p_dec->p_fifo, "opening a new aout" );
-Input
+Dec
-            }
-
@@ -183 +183 @@
-            p_dec->output_format.i_rate     = sync_info.sample_rate;
-            aout_DateInit( &p_dec->end_date, sync_info.sample_rate );
-Input
-   
-   
+Dec
+
+
-        }
-
@@ -201 +201 @@
-        }
-
-BufferNew
-
-
+DecNewBuffer
+   
+   
-        if( !p_aout_buffer )
-        {
@@ -217 +217 @@
-        {
-            /* Ouch, failed decoding... We'll have to resync */
-BufferDelete
+DecDeleteBuffer
-        }
-        else
-        {
-Buffer
+Dec
-        }
-    }
@@ -237 +237 @@
-    if( p_dec->p_aout_input )
-    {
-Input
+Dec
-        
-    }

modules/demux/mpeg/ts.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-5 2002/09/23 23:05:58
+6 2002/09/26 22:40:24
- *
- * Authors: Henri Fallon <henri@via.ecp.fr>
@@ -908 +908 @@
-                    break;
-                case DVD_SPU_ES:
-                case A52_AUDIO_ES:
-                    if ( !b_vls_compat )
-                        p_new_es->i_fourcc = VLC_FOURCC('s','p','u',' ');

src/audio_output/input.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/09/20 23:27:04
+3 2002/09/26 22:40:25
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -40 +40 @@
- * aout_InputNew : allocate a new input and rework the filter pipeline
- *****************************************************************************/
-
-
+
-{
-    aout_input_t * p_input;
-
-    vlc_mutex_lock( &p_aout->mixer_lock );
-
-    if ( p_aout->i_nb_inputs >= AOUT_MAX_INPUTS )
-    {
-        msg_Err( p_aout, "too many inputs already (%d)", p_aout->i_nb_inputs );
-        vlc_mutex_unlock( &p_aout->mixer_lock );
-        return NULL;
-    }
-
-    p_input = malloc(sizeof(aout_input_t));
-    if ( p_input == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
-        vlc_mutex_unlock( &p_aout->mixer_lock );
-        return NULL;
-    }
-
-    vlc_mutex_init( p_aout, &p_input->lock );
-    vlc_mutex_lock( &p_input->lock );
-
-    if ( p_aout->i_nb_inputs == 0 )
-    {
-        /* Recreate the output using the new format. */
-        if ( aout_OutputNew( p_aout, p_format ) < 0 )
-        {
-            vlc_mutex_unlock( &p_input->lock );
-            vlc_mutex_destroy( &p_input->lock );
-            free( p_input );
-            vlc_mutex_unlock( &p_aout->mixer_lock );
-            return NULL;
-        }
-    }
-    else
-    {
-        aout_MixerDelete( p_aout );
-    }
-
-    p_input->b_error = 0;
-    memcpy( &p_input->input, p_format,
-            sizeof(audio_sample_format_t) );
-    aout_FormatPrepare( &p_input->input );
-
-    /* Prepare FIFO. */
-    aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
-    p_input->p_first_byte_to_mix = NULL;
-
-    p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
-    p_aout->i_nb_inputs++;
-
-    if ( aout_MixerNew( p_aout ) < 0 )
-    {
-        p_aout->i_nb_inputs--;
-
-        if ( !p_aout->i_nb_inputs )
-        {
-            aout_OutputDelete( p_aout );
-        }
-        else
-        {
-            aout_MixerNew( p_aout );
-        }
-
-        aout_FifoDestroy( p_aout, &p_input->fifo );
-        vlc_mutex_unlock( &p_input->lock );
-        vlc_mutex_destroy( &p_input->lock );
-        free( p_input );
-        vlc_mutex_unlock( &p_aout->mixer_lock );
-
-        return NULL;
-    }
-
-    vlc_mutex_unlock( &p_aout->mixer_lock );
-
-    /* Create filters. */
@@ -125 +53 @@
-        msg_Err( p_aout, "couldn't set an input pipeline" );
-
-        p_aout->i_nb_inputs--;
-
-        aout_MixerDelete( p_aout );
-        if ( !p_aout->i_nb_inputs )
-        {
-            aout_OutputDelete( p_aout );
-        }
-        else
-        {
-            aout_MixerNew( p_aout );
-        }
-
-        aout_FifoDestroy( p_aout, &p_input->fifo );
-
-
-
-
-
-
+
+
+
-    }
-
@@ -163 +76 @@
-    p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
-
-
-
-
-
+
+
+
-}
-
-
-
-
+
+
+
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
@@ -236 +94 @@
-    aout_FifoDestroy( p_aout, &p_input->fifo );
-
-    vlc_mutex_unlock( &p_input->lock );
-    vlc_mutex_destroy( &p_input->lock );
-    free( p_input );
-
-    msg_Dbg( p_aout, "input 0x%x destroyed", p_input );
-}
-
-/*****************************************************************************
- * aout_InputChange : recreate the pipeline framework, in case the output
- *                    device has changed
- *****************************************************************************
- * You must own p_input->lock and the mixer lock before entering this function.
- * It returns -1 if the input pipeline couldn't be created. Please remember
- * to call aout_MixerNew() afterwards.
- *****************************************************************************/
-int aout_InputChange( aout_instance_t * p_aout, aout_input_t * p_input )
-{
-    aout_FiltersDestroyPipeline( p_aout, p_input->pp_filters,
-                                 p_input->i_nb_filters );
-    aout_FifoDestroy( p_aout, &p_input->fifo );
-
-    aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
-    p_input->p_first_byte_to_mix = NULL;
-
-    /* Create filters. */
-    if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
-                                     &p_input->i_nb_filters, &p_input->input,
-                                     &p_aout->mixer.mixer ) < 0 )
-    {
-        p_input->b_error = 1;
-
-        return -1;
-    }
-
-    /* Prepare hints for the buffer allocator. */
-    p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
-    p_input->input_alloc.i_bytes_per_sec = -1;
-
-    aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
-                             p_input->i_nb_filters,
-                             &p_input->input_alloc );
-
-    /* i_bytes_per_sec is still == -1 if no filters */
-    p_input->input_alloc.i_bytes_per_sec = __MAX(
-                                    p_input->input_alloc.i_bytes_per_sec,
-                                    p_input->input.i_bytes_per_frame
-                                     * p_input->input.i_rate
-                                     / p_input->input.i_frame_length );
-    /* Allocate in the heap, it is more convenient for the decoder. */
-    p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
-
-    return 0;
-}