/*****************************************************************************
* audio_output.h : audio output thread interface
- * (c)1999 VideoLAN
*****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ * Michel Kaempf <maxx@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
* Required headers:
- * - <sys/soundcard.h> ( audio_buf_info )
* - "common.h" ( boolean_t )
* - "mtime.h" ( mtime_t )
- * - "vlc_thread.h" ( vlc_thread_t )
+ * - "threads.h" ( vlc_thread_t )
*****************************************************************************/
/* TODO :
* - Créer un flag destroy dans les fifos audio pour indiquer au thread audio
* qu'il peut libérer la mémoire occupée par le buffer de la fifo lorsqu'il
* le désire (fin du son ou fin du thread)
- * - Redéplacer les #define dans config.h
*
*/
-/*
- * Defines => "config.h"
- */
-
-/* Default output device. You probably should not change this. */
-#define AOUT_DEFAULT_DEVICE "/dev/dsp"
-
-/* Default audio output format (AFMT_S16_NE = Native Endianess) */
-#define AOUT_DEFAULT_FORMAT AFMT_S16_NE
-
-/* Default stereo mode (0 stands for mono, 1 for stereo) */
-#define AOUT_DEFAULT_STEREO 1
-
-/* Audio output rate, in Hz */
-#define AOUT_MIN_RATE 22050 /* ?? */
-#define AOUT_DEFAULT_RATE 44100
-#define AOUT_MAX_RATE 48000
-
-/* Number of audio output frames contained in an audio output fifo.
- * (AOUT_FIFO_SIZE + 1) must be a power of 2, in order to optimise the
- * %(AOUT_FIFO_SIZE + 1) operation with an &AOUT_FIFO_SIZE.
- * With 511 we have at least 511*384/2/48000=2 seconds of sound */
-#define AOUT_FIFO_SIZE 511
-
-/* Maximum number of audio fifos. The value of AOUT_MAX_FIFOS should be a power
- * of two, in order to optimize the '/AOUT_MAX_FIFOS' and '*AOUT_MAX_FIFOS'
- * operations with '>>' and '<<' (gcc changes this at compilation-time) */
-#define AOUT_MAX_FIFOS 2
-
-/* Duration (in microseconds) of an audio output buffer should be :
- * - short, in order to be able to play a new song very quickly (especially a
- * song from the interface)
- * - long, in order to perform the buffer calculations as few as possible */
-#define AOUT_BUFFER_DURATION 100000
-
/*
* Macros
*/
#define AOUT_FIFO_ISEMPTY( fifo ) ( (fifo).l_end_frame == (fifo).i_start_frame )
#define AOUT_FIFO_ISFULL( fifo ) ( ((((fifo).l_end_frame + 1) - (fifo).l_start_frame) & AOUT_FIFO_SIZE) == 0 )
-/*****************************************************************************
- * aout_sys_t
- *****************************************************************************/
-typedef struct
-{
- /* Path to the audio output device (default is set to "/dev/dsp") */
- char * psz_device;
- int i_fd;
-
- /* Format of the audio output samples (see <sys/soundcard.h>) */
- int i_format;
- /* Following boolean is set to 0 if output sound is mono, 1 if stereo */
- boolean_t b_stereo;
- /* Rate of the audio output sound (in Hz) */
- long l_rate;
-
- /* Buffer information structure, used by aout_sys_getbufinfo() to store the
- * current state of the internal sound card buffer */
- audio_buf_info buf_info;
-
-} aout_sys_t;
-
/*****************************************************************************
* aout_increment_t
*****************************************************************************
int i_type;
boolean_t b_die;
+ int i_channels;
boolean_t b_stereo;
long l_rate;
/*****************************************************************************
* aout_thread_t : audio output thread descriptor
*****************************************************************************/
-typedef int (aout_sys_open_t) ( aout_sys_t *p_sys );
-typedef int (aout_sys_reset_t) ( aout_sys_t *p_sys );
-typedef int (aout_sys_setformat_t) ( aout_sys_t *p_sys );
-typedef int (aout_sys_setchannels_t) ( aout_sys_t *p_sys );
-typedef int (aout_sys_setrate_t) ( aout_sys_t *p_sys );
-typedef long (aout_sys_getbufinfo_t) ( aout_sys_t *p_sys );
-typedef void (aout_sys_playsamples_t) ( aout_sys_t *p_sys,
- byte_t *buffer, int i_size );
-typedef void (aout_sys_close_t) ( aout_sys_t *p_sys );
+typedef int (aout_open_t) ( p_aout_thread_t p_aout );
+typedef int (aout_setformat_t) ( p_aout_thread_t p_aout );
+typedef long (aout_getbufinfo_t) ( p_aout_thread_t p_aout,
+ long l_buffer_limit );
+typedef void (aout_play_t) ( p_aout_thread_t p_aout,
+ byte_t *buffer, int i_size );
+typedef void (aout_close_t) ( p_aout_thread_t p_aout );
typedef struct aout_thread_s
{
vlc_thread_t thread_id;
boolean_t b_die;
-
- aout_sys_t sys;
+ boolean_t b_active;
vlc_mutex_t fifos_lock;
aout_fifo_t fifo[ AOUT_MAX_FIFOS ];
- /* method-dependant functions */
- aout_sys_open_t * p_sys_open;
- aout_sys_reset_t * p_sys_reset;
- aout_sys_setformat_t * p_sys_setformat;
- aout_sys_setchannels_t * p_sys_setchannels;
- aout_sys_setrate_t * p_sys_setrate;
- aout_sys_getbufinfo_t * p_sys_getbufinfo;
- aout_sys_playsamples_t * p_sys_playsamples;
- aout_sys_close_t * p_sys_close;
+ /* Plugin used and shortcuts to access its capabilities */
+ struct module_s * p_module;
+ aout_open_t * p_open;
+ aout_setformat_t * p_setformat;
+ aout_getbufinfo_t * p_getbufinfo;
+ aout_play_t * p_play;
+ aout_close_t * p_close;
void * buffer;
/* The s32 buffer is used to mix all the audio fifos together before
* will be played */
mtime_t date;
-} aout_thread_t;
+ /* Path to the audio output device (default is set to "/dev/dsp") */
+ char * psz_device;
+ int i_fd;
+
+ /* Format of the audio output samples */
+ int i_format;
+ /* Number of channels */
+ int i_channels;
+ /* Mono or Stereo sound */
+ boolean_t b_stereo;
+ /* Rate and gain of the audio output sound (in Hz) */
+ long l_rate;
+ long l_gain;
+
+ /* there might be some useful private structure, such as audio_buf_info
+ * for the OSS output */
+ p_aout_sys_t p_sys;
+
-/* Output methods */
-#define AOUT_DUMMY_METHOD 0x0000 /* dummy video output */
-#define AOUT_DSP_METHOD 0x0001 /* linux /dev/dsp */
+ /* there is the current volume */
+ int vol;
+
+} aout_thread_t;
-/* Get the fallback method */
-#ifdef AUDIO_DSP
-#define AOUT_DEFAULT_METHOD "dsp"
+/* Those are from <linux/soundcard.h> but are needed because of formats
+ * on other platforms */
+#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 */
+
+#ifdef WORDS_BIGENDIAN
+#define AOUT_FMT_S16_NE AOUT_FMT_S16_BE
+#else
+#define AOUT_FMT_S16_NE AOUT_FMT_S16_LE
#endif
/*****************************************************************************
projects / vlc / blobdiff