X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Faudio_output.h;h=4a5d2bb8e40253e3cdae620d00db5ae29abd9504;hb=923da58842e70c77aacd956274381eb30447b744;hp=78124a870841422b4ee797ffe1d428ad8b04c222;hpb=d198a80352e084894fcbd20d65ddd43a1c661b81;p=vlc diff --git a/include/audio_output.h b/include/audio_output.h index 78124a8708..4a5d2bb8e4 100644 --- a/include/audio_output.h +++ b/include/audio_output.h @@ -2,7 +2,7 @@ * audio_output.h : audio output interface ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: audio_output.h,v 1.66 2002/09/20 23:27:03 massiot Exp $ + * $Id: audio_output.h,v 1.72 2002/11/28 23:24:14 massiot Exp $ * * Authors: Christophe Massiot * @@ -28,57 +28,50 @@ *****************************************************************************/ struct audio_sample_format_t { - int i_format; - int i_rate; - int i_channels; - /* Optional - for A52, SPDIF and DTS types */ - int i_bytes_per_frame; - int i_frame_length; + vlc_fourcc_t i_format; + unsigned int i_rate; + /* Describes the channels configuration of the samples (ie. number of + * channels which are available in the buffer, and positions). */ + u32 i_physical_channels; + /* Describes from which original channels, before downmixing, the + * buffer is derived. */ + u32 i_original_channels; + /* Optional - for A/52, SPDIF and DTS types : */ + /* Bytes used by one compressed frame, depends on bitrate. */ + unsigned int i_bytes_per_frame; + /* Number of sampleframes contained in one compressed frame. */ + unsigned int i_frame_length; /* Please note that it may be completely arbitrary - buffers are not * obliged to contain a integral number of so-called "frames". It's * just here for the division : - * i_nb_samples * i_bytes_per_frame / i_frame_length */ + * buffer_size = i_nb_samples * i_bytes_per_frame / i_frame_length + */ }; -#define AOUT_FMT_MU_LAW 0x00000001 -#define AOUT_FMT_A_LAW 0x00000002 -#define AOUT_FMT_IMA_ADPCM 0x00000004 -#define AOUT_FMT_U8 0x00000008 -#define AOUT_FMT_S16_LE 0x00000010 /* Little endian signed 16 */ -#define AOUT_FMT_S16_BE 0x00000020 /* Big endian signed 16 */ -#define AOUT_FMT_S8 0x00000040 -#define AOUT_FMT_U16_LE 0x00000080 /* Little endian U16 */ -#define AOUT_FMT_U16_BE 0x00000100 /* Big endian U16 */ -#define AOUT_FMT_SPDIF 0x00000400 /* S/PDIF hardware support */ -#define AOUT_FMT_FLOAT32 0x00010000 -#define AOUT_FMT_FIXED32 0x00020000 -#define AOUT_FMT_A52 0x00100000 -#define AOUT_FMT_DTS 0x00200000 - #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_channels == (p_second)->i_channels \ - || (p_first)->i_channels == -1 || (p_second)->i_channels == -1) ) + && ((p_first)->i_physical_channels == (p_second)->i_physical_channels)\ + && ((p_first)->i_original_channels == (p_second)->i_original_channels) ) /* Check if i_rate == i_rate and i_channels == i_channels */ #define AOUT_FMTS_SIMILAR( p_first, p_second ) ( \ ((p_first)->i_rate == (p_second)->i_rate) \ - && ((p_first)->i_channels == (p_second)->i_channels \ - || (p_first)->i_channels == -1 || (p_second)->i_channels == -1) ) + && ((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 AOUT_FMT_S16_BE -# define AOUT_FMT_U16_NE AOUT_FMT_U16_BE +# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','b') +# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','b') #else -# define AOUT_FMT_S16_NE AOUT_FMT_S16_LE -# define AOUT_FMT_U16_NE AOUT_FMT_U16_LE +# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','l') +# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','l') #endif #define AOUT_FMT_NON_LINEAR( p_format ) \ - ( ((p_format)->i_format == AOUT_FMT_SPDIF) \ - || ((p_format)->i_format == AOUT_FMT_A52) \ - || ((p_format)->i_format == AOUT_FMT_DTS) ) + ( ((p_format)->i_format == VLC_FOURCC('s','p','d','i')) \ + || ((p_format)->i_format == VLC_FOURCC('a','5','2',' ')) \ + || ((p_format)->i_format == VLC_FOURCC('d','t','s',' ')) ) /* This is heavily borrowed from libmad, by Robert Leslie */ /* @@ -100,40 +93,31 @@ struct audio_sample_format_t * integers, but multiplication requires shifting the 64-bit result * from 56 fractional bits back to 28 (and rounding.) */ -typedef s32 vlc_fixed_t; +typedef int32_t vlc_fixed_t; #define FIXED32_FRACBITS 28 #define FIXED32_MIN ((vlc_fixed_t) -0x80000000L) #define FIXED32_MAX ((vlc_fixed_t) +0x7fffffffL) #define FIXED32_ONE ((vlc_fixed_t) 0x10000000) -/* Dual mono. Two independant mono channels */ -#define AOUT_CHAN_CHANNEL 0x0000000B -#define AOUT_CHAN_MONO 0x00000001 -#define AOUT_CHAN_STEREO 0x00000002 -/* 3 front channels (left, center, right) */ -#define AOUT_CHAN_3F 0x00000003 -/* 2 front, 1 rear surround channels (L, R, S) */ -#define AOUT_CHAN_2F1R 0x00000004 -/* 3 front, 1 rear surround channels (L, C, R, S) */ -#define AOUT_CHAN_3F1R 0x00000005 -/* 2 front, 2 rear surround channels (L, R, LS, RS) */ -#define AOUT_CHAN_2F2R 0x00000006 -/* 3 front, 2 rear surround channels (L, C, R, LS, RS) */ -#define AOUT_CHAN_3F2R 0x00000007 -/* First of two mono channels */ -#define AOUT_CHAN_CHANNEL1 0x00000008 -/* Second of two mono channels */ -#define AOUT_CHAN_CHANNEL2 0x00000009 -/* Dolby surround compatible stereo */ -#define AOUT_CHAN_DOLBY 0x0000000A - -#define AOUT_CHAN_MASK 0x0000000F - -/* Low frequency effects channel. Normally used to connect a subwoofer. - * Can be combined with any of the above channels. For example : - * AOUT_CHAN_3F2R | AOUT_CHAN_LFE -> 3 front, 2 rear, 1 LFE (5.1) */ -#define AOUT_CHAN_LFE 0x00000010 +/* + * Channels descriptions + */ + +/* Values available for physical and original channels */ +#define AOUT_CHAN_CENTER 0x1 +#define AOUT_CHAN_LEFT 0x2 +#define AOUT_CHAN_RIGHT 0x4 +#define AOUT_CHAN_REARCENTER 0x10 +#define AOUT_CHAN_REARLEFT 0x20 +#define AOUT_CHAN_REARRIGHT 0x40 +#define AOUT_CHAN_LFE 0x100 + +/* Values available for original channels only */ +#define AOUT_CHAN_DOLBYSTEREO 0x10000 +#define AOUT_CHAN_DUALMONO 0x20000 + +#define AOUT_CHAN_PHYSMASK 0xFFFF /***************************************************************************** @@ -155,36 +139,39 @@ struct aout_buffer_t /* Size of a frame for S/PDIF output. */ #define AOUT_SPDIF_SIZE 6144 +/* Number of samples in an A/52 frame. */ +#define A52_FRAME_NB 1536 + /***************************************************************************** * audio_date_t : date incrementation without long-term rounding errors *****************************************************************************/ struct audio_date_t { - mtime_t date; - u32 i_divider; - u32 i_remainder; + mtime_t date; + uint32_t i_divider; + uint32_t i_remainder; }; /***************************************************************************** * Prototypes *****************************************************************************/ -/* From audio_output.c : */ -#define aout_NewInstance(a) __aout_NewInstance(VLC_OBJECT(a)) -VLC_EXPORT( aout_instance_t *, __aout_NewInstance, ( vlc_object_t * ) ); -VLC_EXPORT( void, aout_DeleteInstance, ( aout_instance_t * ) ); -VLC_EXPORT( aout_buffer_t *, aout_BufferNew, ( aout_instance_t *, aout_input_t *, size_t ) ); -VLC_EXPORT( void, aout_BufferDelete, ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ); -VLC_EXPORT( int, aout_BufferPlay, ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ); -VLC_EXPORT( void, aout_DateInit, ( audio_date_t *, u32 ) ); +/* From common.c : */ +#define aout_New(a) __aout_New(VLC_OBJECT(a)) +VLC_EXPORT( aout_instance_t *, __aout_New, ( vlc_object_t * ) ); +VLC_EXPORT( void, aout_Delete, ( 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_DateIncrement, ( audio_date_t *, u32 ) ); +VLC_EXPORT( mtime_t, aout_DateIncrement, ( audio_date_t *, uint32_t ) ); -/* From input.c : */ -#define aout_InputNew(a,b,c) __aout_InputNew(VLC_OBJECT(a),b,c) -VLC_EXPORT( aout_input_t *, __aout_InputNew, ( vlc_object_t *, aout_instance_t **, audio_sample_format_t * ) ); -VLC_EXPORT( void, aout_InputDelete, ( aout_instance_t *, aout_input_t * ) ); +/* From dec.c : */ +#define aout_DecNew(a, b, c) __aout_DecNew(VLC_OBJECT(a), b, c) +VLC_EXPORT( aout_input_t *, __aout_DecNew, ( vlc_object_t *, aout_instance_t **, audio_sample_format_t * ) ); +VLC_EXPORT( int, aout_DecDelete, ( aout_instance_t *, aout_input_t * ) ); +VLC_EXPORT( aout_buffer_t *, aout_DecNewBuffer, ( aout_instance_t *, aout_input_t *, size_t ) ); +VLC_EXPORT( void, aout_DecDeleteBuffer, ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ); +VLC_EXPORT( int, aout_DecPlay, ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ); /* From intf.c : */ VLC_EXPORT( int, aout_VolumeGet, ( aout_instance_t *, audio_volume_t * ) ); @@ -192,4 +179,7 @@ VLC_EXPORT( int, aout_VolumeSet, ( aout_instance_t *, audio_volume_t ) ); VLC_EXPORT( int, aout_VolumeInfos, ( aout_instance_t *, audio_volume_t * ) ); VLC_EXPORT( int, aout_VolumeUp, ( aout_instance_t *, int, audio_volume_t * ) ); VLC_EXPORT( int, aout_VolumeDown, ( aout_instance_t *, int, audio_volume_t * ) ); +VLC_EXPORT( int, aout_Restart, ( aout_instance_t * p_aout ) ); +VLC_EXPORT( void, aout_FindAndRestart, ( vlc_object_t * p_this ) ); +VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );