X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Faout_internal.h;h=5a1678701a9ce773c9540f2993cca042441adf35;hb=9dd393c7e2063c2368db6ff2be1b3a22ff6f8faf;hp=a5c388c843a53a6ce70c67690be5b1ba5dacb58e;hpb=d1296b32da7293d0f780cdb9b4782c84e39fb1da;p=vlc diff --git a/include/aout_internal.h b/include/aout_internal.h index a5c388c843..5a1678701a 100644 --- a/include/aout_internal.h +++ b/include/aout_internal.h @@ -2,7 +2,7 @@ * aout_internal.h : internal defines for audio output ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: aout_internal.h,v 1.33 2002/11/13 20:51:04 sam Exp $ + * $Id$ * * Authors: Christophe Massiot * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -97,7 +97,7 @@ struct aout_fifo_t /***************************************************************************** * aout_filter_t : audio output filter *****************************************************************************/ -typedef struct aout_filter_t +struct aout_filter_t { VLC_COMMON_MEMBERS @@ -112,8 +112,8 @@ typedef struct aout_filter_t struct aout_buffer_t *, struct aout_buffer_t * ); vlc_bool_t b_in_place; - vlc_bool_t b_reinit; -} aout_filter_t; + vlc_bool_t b_continuity; +}; /***************************************************************************** * aout_mixer_t : audio output mixer @@ -128,7 +128,7 @@ typedef struct aout_mixer_t void (* pf_do_work)( struct aout_instance_t *, struct aout_buffer_t * ); - /* If b_error == 1, there is no mixer nor audio output pipeline. */ + /* If b_error == 1, there is no mixer. */ 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 @@ -167,10 +167,20 @@ struct aout_input_t /* Mixer information */ byte_t * p_first_byte_to_mix; + /* If b_restart == 1, the input pipeline will be re-created. */ + vlc_bool_t b_restart; + /* If b_error == 1, there is no input pipeline. */ vlc_bool_t b_error; - /* Did we just change the output format ? (expect buffer inconsistencies) */ + + /* Did we just change the output format? (expect buffer inconsistencies) */ vlc_bool_t b_changed; + + /* internal caching delay from input */ + int i_pts_delay; + /* desynchronisation delay request by the user */ + int i_desync; + }; /***************************************************************************** @@ -200,6 +210,9 @@ typedef struct aout_output_t /* Current volume for the output - it's just a placeholder, the plug-in * may or may not use it. */ audio_volume_t i_volume; + + /* If b_error == 1, there is no audio output pipeline. */ + vlc_bool_t b_error; } aout_output_t; /***************************************************************************** @@ -245,24 +258,14 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, aout_buffer_t * p_buffer ); /* From filters.c : */ -int aout_FiltersCreatePipeline( aout_instance_t * p_aout, - aout_filter_t ** pp_filters, - int * pi_nb_filters, - const audio_sample_format_t * p_input_format, - const audio_sample_format_t * p_output_format ); -void aout_FiltersDestroyPipeline( aout_instance_t * p_aout, - aout_filter_t ** pp_filters, - int i_nb_filters ); -void aout_FiltersHintBuffers( aout_instance_t * p_aout, - aout_filter_t ** pp_filters, - int i_nb_filters, aout_alloc_t * p_first_alloc ); -void aout_FiltersPlay( aout_instance_t * p_aout, - aout_filter_t ** pp_filters, - int i_nb_filters, aout_buffer_t ** pp_input_buffer ); +VLC_EXPORT( int, aout_FiltersCreatePipeline, ( aout_instance_t * p_aout, aout_filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format ) ); +VLC_EXPORT( void, aout_FiltersDestroyPipeline, ( aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters ) ); +VLC_EXPORT( void, aout_FiltersPlay, ( aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters, aout_buffer_t ** pp_input_buffer ) ); +void aout_FiltersHintBuffers( aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters, aout_alloc_t * p_first_alloc ); /* From mixer.c : */ int aout_MixerNew( aout_instance_t * p_aout ); -int aout_MixerDelete( aout_instance_t * p_aout ); +void aout_MixerDelete( aout_instance_t * p_aout ); void aout_MixerRun( aout_instance_t * p_aout ); int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier ); int aout_MixerMultiplierGet( aout_instance_t * p_aout, float * pf_multiplier ); @@ -275,10 +278,11 @@ void aout_OutputDelete( aout_instance_t * p_aout ); VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, vlc_bool_t ) ); /* From common.c : */ -VLC_EXPORT( int, aout_FormatNbChannels, ( audio_sample_format_t * p_format ) ); +VLC_EXPORT( unsigned int, aout_FormatNbChannels, ( const audio_sample_format_t * p_format ) ); VLC_EXPORT( void, aout_FormatPrepare, ( audio_sample_format_t * p_format ) ); VLC_EXPORT( void, aout_FormatPrint, ( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format ) ); VLC_EXPORT( void, aout_FormatsPrint, ( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format1, const audio_sample_format_t * p_format2 ) ); +VLC_EXPORT( const char *, aout_FormatPrintChannels, ( const audio_sample_format_t * ) ); void aout_FifoInit( aout_instance_t *, aout_fifo_t *, uint32_t ); mtime_t aout_FifoNextStart( aout_instance_t *, aout_fifo_t * ); void aout_FifoPush( aout_instance_t *, aout_fifo_t *, aout_buffer_t * );