X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=30f144ef43ff5a2d7cdfe6a822a3b53ce8e0e7e8;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=90fcc01cad259226fcae4ba53c9d3cf2a519578c;hpb=bf48c33dbb564a5ede1581ab9bcb2db9213fba2f;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 90fcc01cad..30f144ef43 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -21,10 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif - #ifndef _VLC_AOUT_H #define _VLC_AOUT_H 1 @@ -137,14 +133,14 @@ typedef int32_t vlc_fixed_t; /** audio output buffer */ struct aout_buffer_t { - byte_t * p_buffer; + uint8_t * p_buffer; int i_alloc_type; /* 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; - vlc_bool_t 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; @@ -169,6 +165,9 @@ struct aout_buffer_t /* Number of samples in an A/52 frame. */ #define A52_FRAME_NB 1536 +/* Max input rate factor (1/4 -> 4) */ +#define AOUT_MAX_INPUT_RATE (4) + /** date incrementation helper structure without long-term * rounding errors */ @@ -202,7 +201,7 @@ typedef struct aout_mixer_t struct aout_buffer_t * ); /** If b_error == 1, there is no mixer. */ - vlc_bool_t b_error; + bool b_error; /** Multiplier used to raise or lower the volume of the sound in * software. Beware, this creates sound distortion and should be avoided * as much as possible. This isn't available for non-float32 mixer. */ @@ -232,8 +231,8 @@ struct aout_filter_t struct aout_filter_t *, struct aout_buffer_t *, struct aout_buffer_t * ); - vlc_bool_t b_in_place; - vlc_bool_t b_continuity; + bool b_in_place; + bool b_continuity; }; #define AOUT_RESAMPLING_NONE 0 @@ -256,6 +255,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; @@ -266,17 +267,21 @@ struct aout_input_t aout_fifo_t fifo; /* Mixer information */ - byte_t * p_first_byte_to_mix; + uint8_t * p_first_byte_to_mix; + audio_replay_gain_t replay_gain; + float f_multiplier; /* If b_restart == 1, the input pipeline will be re-created. */ - vlc_bool_t b_restart; + bool b_restart; /* If b_error == 1, there is no input pipeline. */ - vlc_bool_t b_error; + bool b_error; /* Did we just change the output format? (expect buffer inconsistencies) */ - vlc_bool_t b_changed; + 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 */ @@ -290,7 +295,7 @@ typedef struct aout_output_t audio_sample_format_t output; /* Indicates whether the audio output is currently starving, to avoid * printing a 1,000 "output is starving" messages. */ - vlc_bool_t b_starving; + bool b_starving; /* post-filters */ aout_filter_t * pp_filters[AOUT_MAX_FILTERS]; @@ -311,7 +316,7 @@ typedef struct aout_output_t audio_volume_t i_volume; /* If b_error == 1, there is no audio output pipeline. */ - vlc_bool_t b_error; + bool b_error; } aout_output_t; /** audio output thread descriptor */ @@ -356,12 +361,13 @@ 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_DateIncrement, ( audio_date_t *, uint32_t ) ); -VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, vlc_bool_t ) ); +VLC_EXPORT( aout_buffer_t *, aout_OutputNextBuffer, ( aout_instance_t *, mtime_t, bool ) ); VLC_EXPORT( int, aout_CheckChannelReorder, ( const uint32_t *, const uint32_t *, uint32_t, int, int * ) ); 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 ) ); 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 * ) ); @@ -384,11 +390,10 @@ VLC_EXPORT( int, __aout_VolumeUp, ( vlc_object_t *, int, audio_volume_t * ) ); 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 * ) ); -VLC_EXPORT( int, aout_Restart, ( aout_instance_t * p_aout ) ); 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 *, vlc_bool_t )); +VLC_EXPORT( void, aout_EnableFilter, (vlc_object_t *, const char *, bool )); #define aout_VisualNext(a) aout_VisualChange( VLC_OBJECT(a),1 ) #define aout_VisualPrev(a) aout_VisualChange( VLC_OBJECT(a),-1 )