X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=953702a7ac066b7508df5f481f37acf208106da9;hb=065f9350636a17b8340c4bde8a45336fb9563fc6;hp=cdae6d484148e0e10d2495bb115939c08bd18de4;hpb=f76500382dc059091e0d811ed55a22337d2fe04f;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index cdae6d4841..953702a7ac 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -37,9 +37,7 @@ extern "C" { #define AOUT_FMTS_IDENTICAL( p_first, p_second ) ( \ ((p_first)->i_format == (p_second)->i_format) \ - && ((p_first)->i_rate == (p_second)->i_rate) \ - && ((p_first)->i_physical_channels == (p_second)->i_physical_channels)\ - && ((p_first)->i_original_channels == (p_second)->i_original_channels) ) + && AOUT_FMTS_SIMILAR(p_first, p_second) ) /* Check if i_rate == i_rate and i_channels == i_channels */ #define AOUT_FMTS_SIMILAR( p_first, p_second ) ( \ @@ -125,33 +123,7 @@ typedef int32_t vlc_fixed_t; * Main audio output structures *****************************************************************************/ -/** audio output buffer */ -struct aout_buffer_t -{ - uint8_t * p_buffer; - bool b_alloc; - /* i_size is the real size of the buffer (used for debug ONLY), i_nb_bytes - * is the number of significative bytes in it. */ - 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) */ - - struct aout_buffer_t * p_next; - - /** Private data (aout_buffer_t will disappear soon so no need for an - * aout_buffer_sys_t type) */ - void * p_sys; - - /** This way the release can be overloaded */ - void (*pf_release)( aout_buffer_t * ); -}; - -static inline void aout_BufferFree( aout_buffer_t *buffer ) -{ - if( buffer && buffer->b_alloc ) - free( buffer ); -} +#define aout_BufferFree( buffer ) block_Release( buffer ) /* Size of a frame for S/PDIF output. */ #define AOUT_SPDIF_SIZE 6144 @@ -162,13 +134,6 @@ static inline void aout_BufferFree( aout_buffer_t *buffer ) /* Max input rate factor (1/4 -> 4) */ #define AOUT_MAX_INPUT_RATE (4) -/** allocation of memory in the audio output */ -typedef struct aout_alloc_t -{ - bool b_alloc; - int i_bytes_per_sec; -} aout_alloc_t; - /** audio output buffer FIFO */ struct aout_fifo_t { @@ -178,46 +143,7 @@ struct aout_fifo_t }; /* FIXME to remove once aout.h is cleaned a bit more */ -#include - -/* */ -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 - - audio_sample_format_t input; - audio_sample_format_t output; - aout_alloc_t output_alloc; - - module_t * p_module; - 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; -}; +#include #define AOUT_RESAMPLING_NONE 0 #define AOUT_RESAMPLING_UP 1 @@ -232,7 +158,7 @@ typedef struct aout_output_t bool b_starving; /* post-filters */ - aout_filter_t * pp_filters[AOUT_MAX_FILTERS]; + filter_t * pp_filters[AOUT_MAX_FILTERS]; int i_nb_filters; aout_fifo_t fifo; @@ -240,18 +166,12 @@ typedef struct aout_output_t struct module_t * p_module; struct aout_sys_t * p_sys; 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_set )( aout_instance_t *, audio_volume_t, bool ); int i_nb_samples; - - /* 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. */ - bool b_error; } aout_output_t; +struct aout_mixer_t; + /** audio output thread descriptor */ struct aout_instance_t { @@ -271,23 +191,23 @@ struct aout_instance_t /* When output_fifo_lock is taken, the p_aout->output.fifo structure * cannot be read or written by a third-party thread. */ vlc_mutex_t output_fifo_lock; + /* volume_vars_lock is taken */ + vlc_mutex_t volume_vars_lock; /* Input streams & pre-filters */ - aout_input_t * pp_inputs[AOUT_MAX_INPUTS]; - int i_nb_inputs; + aout_input_t * p_input; /* Mixer */ audio_sample_format_t mixer_format; - aout_alloc_t mixer_allocation; float mixer_multiplier; - aout_mixer_t *p_mixer; + struct aout_mixer_t *p_mixer; /* Output plug-in */ aout_output_t output; }; /** - * It describes the audio channel order VLC except. + * It describes the audio channel order VLC expect. */ static const uint32_t pi_vlc_chan_order_wg4[] = { @@ -301,7 +221,7 @@ static const uint32_t pi_vlc_chan_order_wg4[] = * Prototypes *****************************************************************************/ -VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, bool ) LIBVLC_USED ); +VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) VLC_USED; /** * This function computes the reordering needed to go from pi_chan_order_in to @@ -309,8 +229,8 @@ VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t * 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_API 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_API void aout_ChannelReorder( uint8_t *, int, int, const int *, int ); /** * This fonction will compute the extraction parameter into pi_selection to go @@ -328,7 +248,7 @@ VLC_EXPORT( void, aout_ChannelReorder, ( uint8_t *, int, int, const int *, int ) * 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 ) ); +VLC_API 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 @@ -337,40 +257,45 @@ VLC_EXPORT( bool, aout_CheckChannelExtraction, ( int *pi_selection, uint32_t *pi * 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_API 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 * ) LIBVLC_USED ); +static inline unsigned aout_FormatNbChannels(const audio_sample_format_t *fmt) +{ + return popcount(fmt->i_physical_channels & AOUT_CHAN_PHYSMASK); +} + +VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) VLC_USED; +VLC_API void aout_FormatPrepare( audio_sample_format_t * p_format ); +VLC_API void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format ); +VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED; -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 ); +VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) VLC_USED; +VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) VLC_USED; /* From intf.c : */ -VLC_EXPORT( void, aout_VolumeSoftInit, ( aout_instance_t * ) ); -VLC_EXPORT( void, aout_VolumeNoneInit, ( aout_instance_t * ) ); -#define aout_VolumeGet(a, b) __aout_VolumeGet(VLC_OBJECT(a), b) -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_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_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 )); +VLC_API void aout_VolumeSoftInit( aout_instance_t * ); +VLC_API void aout_VolumeNoneInit( aout_instance_t * ); +VLC_API audio_volume_t aout_VolumeGet( vlc_object_t * ); +#define aout_VolumeGet(a) aout_VolumeGet(VLC_OBJECT(a)) +VLC_API int aout_VolumeSet( vlc_object_t *, audio_volume_t ); +#define aout_VolumeSet(a, b) aout_VolumeSet(VLC_OBJECT(a), b) +VLC_API int aout_VolumeUp( vlc_object_t *, int, audio_volume_t * ); +#define aout_VolumeUp(a, b, c) aout_VolumeUp(VLC_OBJECT(a), b, c) +VLC_API int aout_VolumeDown( vlc_object_t *, int, audio_volume_t * ); +#define aout_VolumeDown(a, b, c) aout_VolumeDown(VLC_OBJECT(a), b, c) +VLC_API int aout_ToggleMute( vlc_object_t *, audio_volume_t * ); +#define aout_ToggleMute(a, b) aout_ToggleMute(VLC_OBJECT(a), b) +VLC_API int aout_SetMute( vlc_object_t *, audio_volume_t *, bool ); +VLC_API bool aout_IsMuted( vlc_object_t * ); +VLC_API int aout_ChannelsRestart( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ); + +VLC_API void aout_EnableFilter(vlc_object_t *, const char *, bool ); #define aout_EnableFilter( o, n, b ) \ aout_EnableFilter( VLC_OBJECT(o), n, b ) /* */ -VLC_EXPORT( vout_thread_t *, aout_filter_RequestVout, ( aout_filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) ); +VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) VLC_USED; # ifdef __cplusplus }