X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=21b67fbdb6a47e4ed8a9a93ab569da508bed4cdc;hb=52c18c4dec68158eedd655e0502820b7d7b6128f;hp=ab94c86a9b426057e675e270e0e12e534635cccd;hpb=55f1d3272f61f46068e58c41690111e879082188;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index ab94c86a9b..21b67fbdb6 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -21,8 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef _VLC_AOUT_H -#define _VLC_AOUT_H 1 +#ifndef VLC_AOUT_H +#define VLC_AOUT_H 1 + +/** + * \file + * This file defines functions, structures and macros for audio output object + */ # ifdef __cplusplus extern "C" { @@ -42,23 +47,14 @@ extern "C" { && ((p_first)->i_physical_channels == (p_second)->i_physical_channels)\ && ((p_first)->i_original_channels == (p_second)->i_original_channels) ) -#ifdef WORDS_BIGENDIAN -# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','b') -# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','b') -# define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','b') -# define AOUT_FMT_SPDIF_NE VLC_FOURCC('s','p','d','b') -#else -# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','l') -# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','l') -# define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','l') -# define AOUT_FMT_SPDIF_NE VLC_FOURCC('s','p','d','i') -#endif - -#define AOUT_FMT_NON_LINEAR( p_format ) \ - ( ((p_format)->i_format == VLC_FOURCC('s','p','d','i')) \ - || ((p_format)->i_format == VLC_FOURCC('s','p','d','b')) \ - || ((p_format)->i_format == VLC_FOURCC('a','5','2',' ')) \ - || ((p_format)->i_format == VLC_FOURCC('d','t','s',' ')) ) +#define VLC_CODEC_SPDIFL VLC_FOURCC('s','p','d','i') +#define VLC_CODEC_SPDIFB VLC_FOURCC('s','p','d','b') + +#define AOUT_FMT_NON_LINEAR( p_format ) \ + ( ((p_format)->i_format == VLC_CODEC_SPDIFL) \ + || ((p_format)->i_format == VLC_CODEC_SPDIFB) \ + || ((p_format)->i_format == VLC_CODEC_A52) \ + || ((p_format)->i_format == VLC_CODEC_DTS) ) /* This is heavily borrowed from libmad, by Robert Leslie */ /* @@ -86,7 +82,6 @@ typedef int32_t vlc_fixed_t; #define FIXED32_MAX ((vlc_fixed_t) +0x7fffffffL) #define FIXED32_ONE ((vlc_fixed_t) 0x10000000) - /* * Channels descriptions */ @@ -140,7 +135,7 @@ struct aout_buffer_t size_t i_size, i_nb_bytes; unsigned int i_nb_samples; mtime_t start_date, end_date; - bool b_discontinuity; /* Set on discontinuity (for non pcm stream) */ + bool b_discontinuity; /* Set on discontinuity (for non pcm stream) */ struct aout_buffer_t * p_next; @@ -216,7 +211,17 @@ struct aout_fifo_t audio_date_t end_date; }; +/* */ +typedef struct +{ + vout_thread_t *(*pf_request_vout)( void *, + vout_thread_t *, video_format_t *, bool b_recycle ); + void *p_private; +} aout_request_vout_t; + /** audio output filter */ +typedef struct aout_filter_owner_sys_t aout_filter_owner_sys_t; +typedef struct aout_filter_sys_t aout_filter_sys_t; struct aout_filter_t { VLC_COMMON_MEMBERS @@ -226,13 +231,23 @@ struct aout_filter_t aout_alloc_t output_alloc; module_t * p_module; - struct aout_filter_sys_t * p_sys; - void (* pf_do_work)( struct aout_instance_t *, - struct aout_filter_t *, - struct aout_buffer_t *, - struct aout_buffer_t * ); - bool b_in_place; - bool b_continuity; + aout_filter_sys_t *p_sys; + + bool b_in_place; + bool b_continuity; + + void (*pf_do_work)( aout_instance_t *, aout_filter_t *, + aout_buffer_t *, aout_buffer_t * ); + + /* Owner fieldS + * XXX You MUST not use them directly */ + + /* Vout callback + * XXX use aout_filter_RequestVout */ + aout_request_vout_t request_vout; + + /* Private structure for the owner of the filter */ + aout_filter_owner_sys_t *p_owner; }; #define AOUT_RESAMPLING_NONE 0 @@ -245,9 +260,6 @@ 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; @@ -255,6 +267,8 @@ struct aout_input_t aout_filter_t * pp_filters[AOUT_MAX_FILTERS]; int i_nb_filters; + aout_filter_t * p_playback_rate_filter; + /* resamplers */ aout_filter_t * pp_resamplers[AOUT_MAX_FILTERS]; int i_nb_resamplers; @@ -279,13 +293,19 @@ struct aout_input_t bool b_changed; /* last rate from input */ - int i_last_input_rate; - /* internal caching delay from input */ - int i_pts_delay; - /* desynchronisation delay request by the user */ - int i_desync; + int i_last_input_rate; -}; + /* */ + int i_buffer_lost; + + /* */ + bool b_paused; + mtime_t i_pause_date; + + /* */ + bool b_recycle_vout; + aout_request_vout_t request_vout; + }; /** an output stream for the audio output */ typedef struct aout_output_t @@ -348,6 +368,17 @@ struct aout_instance_t aout_output_t output; }; +/** + * It describes the audio channel order VLC except. + */ +static const uint32_t pi_vlc_chan_order_wg4[] = +{ + AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, + AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 +}; + /***************************************************************************** * Prototypes *****************************************************************************/ @@ -356,22 +387,56 @@ struct aout_instance_t VLC_EXPORT( void, aout_DateInit, ( audio_date_t *, uint32_t ) ); VLC_EXPORT( void, aout_DateSet, ( audio_date_t *, mtime_t ) ); VLC_EXPORT( void, aout_DateMove, ( audio_date_t *, mtime_t ) ); -VLC_EXPORT( mtime_t, aout_DateGet, ( const audio_date_t * ) ); +VLC_EXPORT( mtime_t, aout_DateGet, ( const audio_date_t * ) LIBVLC_USED); VLC_EXPORT( mtime_t, aout_DateIncrement, ( audio_date_t *, uint32_t ) ); -VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, bool ) ); +VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, bool ) LIBVLC_USED ); -VLC_EXPORT( int, aout_CheckChannelReorder, ( const uint32_t *, const uint32_t *, uint32_t, int, int * ) ); +/** + * This function computes the reordering needed to go from pi_chan_order_in to + * pi_chan_order_out. + * If pi_chan_order_in or pi_chan_order_out is NULL, it will assume that vlc + * internal (WG4) order is requested. + */ +VLC_EXPORT( int, aout_CheckChannelReorder, ( const uint32_t *pi_chan_order_in, const uint32_t *pi_chan_order_out, uint32_t i_channel_mask, int i_channels, int *pi_chan_table ) ); VLC_EXPORT( void, aout_ChannelReorder, ( uint8_t *, int, int, const int *, int ) ); -VLC_EXPORT( unsigned int, aout_FormatNbChannels, ( const audio_sample_format_t * p_format ) ); -VLC_EXPORT( unsigned int, aout_BitsPerSample, ( vlc_fourcc_t i_format ) ); +/** + * This fonction will compute the extraction parameter into pi_selection to go + * from i_channels with their type given by pi_order_src[] into the order + * describe by pi_order_dst. + * It will also set : + * - *pi_channels as the number of channels that will be extracted which is + * lower (in case of non understood channels type) or equal to i_channels. + * - the layout of the channels (*pi_layout). + * + * It will return true if channel extraction is really needed, in which case + * aout_ChannelExtract must be used + * + * XXX It must be used when the source may have channel type not understood + * by VLC. In this case the channel type pi_order_src[] must be set to 0. + * XXX It must also be used if multiple channels have the same type. + */ +VLC_EXPORT( bool, aout_CheckChannelExtraction, ( int *pi_selection, uint32_t *pi_layout, int *pi_channels, const uint32_t pi_order_dst[AOUT_CHAN_MAX], const uint32_t *pi_order_src, int i_channels ) ); + +/** + * Do the actual channels extraction using the parameters created by + * aout_CheckChannelExtraction. + * + * XXX this function does not work in place (p_dst and p_src must not overlap). + * XXX Only 8, 16, 24, 32, 64 bits per sample are supported. + */ +VLC_EXPORT( void, aout_ChannelExtract, ( void *p_dst, int i_dst_channels, const void *p_src, int i_src_channels, int i_sample_count, const int *pi_selection, int i_bits_per_sample ) ); + +/* */ +VLC_EXPORT( unsigned int, aout_FormatNbChannels, ( const audio_sample_format_t * p_format ) LIBVLC_USED ); +VLC_EXPORT( unsigned int, aout_BitsPerSample, ( vlc_fourcc_t i_format ) LIBVLC_USED ); 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( const char *, aout_FormatPrintChannels, ( const audio_sample_format_t * ) ); +VLC_EXPORT( const char *, aout_FormatPrintChannels, ( const audio_sample_format_t * ) LIBVLC_USED ); -VLC_EXPORT( mtime_t, aout_FifoFirstDate, ( aout_instance_t *, aout_fifo_t * ) ); -VLC_EXPORT( aout_buffer_t *, aout_FifoPop, ( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) ); +VLC_EXPORT( mtime_t, aout_FifoFirstDate, ( aout_instance_t *, aout_fifo_t * ) LIBVLC_USED ); +VLC_EXPORT( aout_buffer_t *, aout_FifoPop, ( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) LIBVLC_USED ); /* From intf.c : */ VLC_EXPORT( void, aout_VolumeSoftInit, ( aout_instance_t * ) ); @@ -398,6 +463,9 @@ VLC_EXPORT( void, aout_EnableFilter, (vlc_object_t *, const char *, bool )); VLC_EXPORT( char *, aout_VisualChange, (vlc_object_t *, int ) ); +/* */ +VLC_EXPORT( vout_thread_t *, aout_filter_RequestVout, ( aout_filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) ); + # ifdef __cplusplus } # endif