X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Faudio_output.h;h=ae509b2ad90446f400070cbd64266d667d85b0cb;hb=de64feed6ce4263b06f527141569d981fb079123;hp=1f413c4d892926f892938cd99e7899339c371ef8;hpb=9a6b90b85548cd6ccec21cc6f2115902799a8b85;p=vlc diff --git a/include/audio_output.h b/include/audio_output.h index 1f413c4d89..ae509b2ad9 100644 --- a/include/audio_output.h +++ b/include/audio_output.h @@ -1,8 +1,8 @@ /***************************************************************************** * audio_output.h : audio output interface ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: audio_output.h,v 1.68 2002/09/30 21:32:31 massiot Exp $ + * Copyright (C) 2002-2005 VideoLAN + * $Id$ * * Authors: Christophe Massiot * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,44 +20,31 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +#ifndef _VLC_AUDIO_OUTPUT_H +#define _VLC_AUDIO_OUTPUT_H 1 -/***************************************************************************** - * audio_sample_format_t - ***************************************************************************** - * This structure defines a format for audio samples. - *****************************************************************************/ -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; - /* 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 */ -}; +#include "vlc_es.h" #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 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') #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') #endif #define AOUT_FMT_NON_LINEAR( p_format ) \ @@ -69,7 +56,7 @@ struct audio_sample_format_t /* * Fixed-point format: 0xABBBBBBB * A == whole part (sign + 3 bits) - * B == fractional part (28 bits) + * B == fractional part (28 bits) * * Values are signed two's complement, so the effective range is: * 0x80000000 to 0x7fffffff @@ -80,46 +67,56 @@ struct audio_sample_format_t * * 28 bits of fractional accuracy represent about * 8.6 digits of decimal accuracy. - * + * * Fixed-point numbers can be added or subtracted as normal * 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_MIDDLELEFT 0x100 +#define AOUT_CHAN_MIDDLERIGHT 0x200 +#define AOUT_CHAN_LFE 0x1000 + +/* Values available for original channels only */ +#define AOUT_CHAN_DOLBYSTEREO 0x10000 +#define AOUT_CHAN_DUALMONO 0x20000 +#define AOUT_CHAN_REVERSESTEREO 0x40000 + +#define AOUT_CHAN_PHYSMASK 0xFFFF +#define AOUT_CHAN_MAX 9 + +/* Values used for the audio-device and audio-channels object variables */ +#define AOUT_VAR_MONO 1 +#define AOUT_VAR_STEREO 2 +#define AOUT_VAR_2F2R 4 +#define AOUT_VAR_3F2R 5 +#define AOUT_VAR_5_1 6 +#define AOUT_VAR_6_1 7 +#define AOUT_VAR_7_1 8 +#define AOUT_VAR_SPDIF 10 + +#define AOUT_VAR_CHAN_STEREO 1 +#define AOUT_VAR_CHAN_RSTEREO 2 +#define AOUT_VAR_CHAN_LEFT 3 +#define AOUT_VAR_CHAN_RIGHT 4 +#define AOUT_VAR_CHAN_DOLBYS 5 /***************************************************************************** * aout_buffer_t : audio output buffer @@ -131,23 +128,33 @@ struct aout_buffer_t /* 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; - int i_nb_samples; + unsigned int i_nb_samples; mtime_t start_date, end_date; 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 * ); }; /* 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; }; /***************************************************************************** @@ -157,11 +164,14 @@ struct audio_date_t #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 *, u32 ) ); +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 ) ); + +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 ) ); /* From dec.c : */ #define aout_DecNew(a, b, c) __aout_DecNew(VLC_OBJECT(a), b, c) @@ -172,10 +182,20 @@ VLC_EXPORT( void, aout_DecDeleteBuffer, ( aout_instance_t *, aout_input_t *, aou 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 * ) ); -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 * ) ); +#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_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 * ) ); 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 * ) ); +#endif /* _VLC_AUDIO_OUTPUT_H */