X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=21b67fbdb6a47e4ed8a9a93ab569da508bed4cdc;hb=486e0fc1d7e1826490290ed18996025945193d5e;hp=96a9c5fde5cf84f8082e0e35b8ea7ae4c9579187;hpb=87b5a350a60f94ed1b4f4e9b2affd464f25a5f84;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 96a9c5fde5..21b67fbdb6 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -47,25 +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_S32_NE VLC_FOURCC('s','3','2','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_S32_NE VLC_FOURCC('s','3','2','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 */ /* @@ -222,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 @@ -232,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 @@ -284,10 +293,18 @@ struct aout_input_t bool b_changed; /* last rate from input */ - int i_last_input_rate; + int i_last_input_rate; + + /* */ + int i_buffer_lost; /* */ - 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 */ @@ -384,6 +401,34 @@ VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t 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 ) ); +/** + * 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 ) ); @@ -418,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