X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=7c95e391253e25276d3cabedade14d1c29a6d078;hb=e047a1d8d86c574092f8e5e886a164f33bde1da7;hp=ff1ba9cf14f54c92ca62f8f318c33c6c8b01a0c5;hpb=da93449d1e5abd10fc0663029c165bed2e7371c1;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index ff1ba9cf14..7c95e39125 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 */ /* @@ -174,16 +163,6 @@ struct aout_buffer_t /* Max input rate factor (1/4 -> 4) */ #define AOUT_MAX_INPUT_RATE (4) -/** date incrementation helper structure without long-term - * rounding errors - */ -struct audio_date_t -{ - mtime_t date; - uint32_t i_divider; - uint32_t i_remainder; -}; - /** allocation of memory in the audio output */ typedef struct aout_alloc_t { @@ -219,10 +198,20 @@ struct aout_fifo_t { aout_buffer_t * p_first; aout_buffer_t ** pp_last; - audio_date_t end_date; + 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 +221,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 @@ -292,6 +291,10 @@ struct aout_input_t /* */ 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 */ @@ -313,7 +316,6 @@ typedef struct aout_output_t void (* pf_play)( aout_instance_t * ); int (* pf_volume_get )( aout_instance_t *, audio_volume_t * ); int (* pf_volume_set )( aout_instance_t *, audio_volume_t ); - int (* pf_volume_infos )( aout_instance_t *, audio_volume_t * ); int i_nb_samples; /* Current volume for the output - it's just a placeholder, the plug-in @@ -370,13 +372,6 @@ static const uint32_t pi_vlc_chan_order_wg4[] = * Prototypes *****************************************************************************/ -/* From common.c : */ -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 * ) 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 ) LIBVLC_USED ); /** @@ -388,6 +383,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 ) ); @@ -404,23 +427,21 @@ VLC_EXPORT( void, aout_VolumeNoneInit, ( aout_instance_t * ) ); VLC_EXPORT( int, __aout_VolumeGet, ( vlc_object_t *, audio_volume_t * ) ); #define aout_VolumeSet(a, b) __aout_VolumeSet(VLC_OBJECT(a), b) VLC_EXPORT( int, __aout_VolumeSet, ( vlc_object_t *, audio_volume_t ) ); -#define aout_VolumeInfos(a, b) __aout_VolumeInfos(VLC_OBJECT(a), b) -VLC_EXPORT( int, __aout_VolumeInfos, ( vlc_object_t *, audio_volume_t * ) ); #define aout_VolumeUp(a, b, c) __aout_VolumeUp(VLC_OBJECT(a), b, c) VLC_EXPORT( int, __aout_VolumeUp, ( vlc_object_t *, int, audio_volume_t * ) ); #define aout_VolumeDown(a, b, c) __aout_VolumeDown(VLC_OBJECT(a), b, c) VLC_EXPORT( int, __aout_VolumeDown, ( vlc_object_t *, int, audio_volume_t * ) ); -#define aout_VolumeMute(a, b) __aout_VolumeMute(VLC_OBJECT(a), b) -VLC_EXPORT( int, __aout_VolumeMute, ( vlc_object_t *, audio_volume_t * ) ); +#define aout_ToggleMute(a, b) __aout_ToggleMute(VLC_OBJECT(a), b) +VLC_EXPORT( int, __aout_ToggleMute, ( vlc_object_t *, audio_volume_t * ) ); VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) ); VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) ); VLC_EXPORT( void, aout_EnableFilter, (vlc_object_t *, const char *, bool )); +#define aout_EnableFilter( o, n, b ) \ + aout_EnableFilter( VLC_OBJECT(o), n, b ) -#define aout_VisualNext(a) aout_VisualChange( VLC_OBJECT(a),1 ) -#define aout_VisualPrev(a) aout_VisualChange( VLC_OBJECT(a),-1 ) - -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 }