X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Faout_internal.h;h=a7f7c4b285bf795116f8441d48288c1ac2d9c368;hb=18b4556f857ff44bff4b3c45459ff42378481cd8;hp=f0cb59ebc5fdd60e140f25e82d2fb096d86392e2;hpb=1b7ce2697e98a3fcff4f78d1610f7f0268cd47c1;p=vlc diff --git a/include/aout_internal.h b/include/aout_internal.h index f0cb59ebc5..a7f7c4b285 100644 --- a/include/aout_internal.h +++ b/include/aout_internal.h @@ -1,8 +1,8 @@ /***************************************************************************** * aout_internal.h : internal defines for audio output ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: aout_internal.h,v 1.35 2002/12/06 10:10:40 sam Exp $ + * Copyright (C) 2002 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -34,11 +34,16 @@ typedef struct aout_alloc_t #define AOUT_ALLOC_STACK 1 #define AOUT_ALLOC_HEAP 2 +#if defined( __APPLE__ ) || defined( SYS_BSD ) +#undef HAVE_ALLOCA +#endif + #ifdef HAVE_ALLOCA # define ALLOCA_TEST( p_alloc, p_new_buffer ) \ if ( (p_alloc)->i_alloc_type == AOUT_ALLOC_STACK ) \ { \ (p_new_buffer) = alloca( i_alloc_size + sizeof(aout_buffer_t) );\ + i_alloc_type = AOUT_ALLOC_STACK; \ } \ else #else @@ -53,16 +58,17 @@ typedef struct aout_alloc_t } \ else \ { \ - int i_alloc_size; \ + int i_alloc_size, i_alloc_type; \ i_alloc_size = (int)( (uint64_t)(p_alloc)->i_bytes_per_sec \ * (i_nb_usec) / 1000000 + 1 ); \ ALLOCA_TEST( p_alloc, p_new_buffer ) \ { \ (p_new_buffer) = malloc( i_alloc_size + sizeof(aout_buffer_t) );\ + i_alloc_type = AOUT_ALLOC_HEAP; \ } \ if ( p_new_buffer != NULL ) \ { \ - (p_new_buffer)->i_alloc_type = (p_alloc)->i_alloc_type; \ + (p_new_buffer)->i_alloc_type = i_alloc_type; \ (p_new_buffer)->i_size = i_alloc_size; \ (p_new_buffer)->p_buffer = (byte_t *)(p_new_buffer) \ + sizeof(aout_buffer_t); \ @@ -79,10 +85,11 @@ typedef struct aout_alloc_t } #define aout_BufferFree( p_buffer ) \ - if ( (p_buffer)->i_alloc_type == AOUT_ALLOC_HEAP ) \ + if( p_buffer != NULL && (p_buffer)->i_alloc_type == AOUT_ALLOC_HEAP ) \ { \ free( p_buffer ); \ - } + } \ + p_buffer = NULL; /***************************************************************************** * aout_fifo_t : audio output buffer FIFO @@ -97,7 +104,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 +119,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 +135,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 @@ -148,6 +155,9 @@ struct aout_input_t * third-party. */ vlc_mutex_t lock; + /* The input thread that spawned this input */ + input_thread_t *p_input_thread; + audio_sample_format_t input; aout_alloc_t input_alloc; @@ -167,10 +177,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 +220,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 +268,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 );