X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=27359c74529b473557780cfc0b25c8ae7621ddfa;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=6e90414f63e385ed3987839b5c8b55813533072c;hpb=f776b2cb7934fdf887768048c7290adf52a71acf;p=vlc diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 6e90414f63..27359c7452 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -1,18 +1,18 @@ /***************************************************************************** * oss.c : OSS /dev/dsp module for vlc ***************************************************************************** - * Copyright (C) 2000-2002 VideoLAN - * $Id: oss.c,v 1.24 2002/09/11 23:10:30 stef Exp $ + * Copyright (C) 2000-2002 the VideoLAN team + * $Id$ * * Authors: Michel Kaempf - * Samuel Hocevar + * Sam Hocevar * Christophe Massiot * * 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 @@ -20,28 +20,30 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* ENOMEM */ #include /* open(), O_WRONLY */ #include /* ioctl() */ -#include /* strerror() */ #include /* write(), close() */ -#include /* calloc(), malloc(), free() */ -#include +#include +#include #ifdef HAVE_ALLOCA_H # include #endif -#include - -#include "aout_internal.h" +#include /* SNDCTL_DSP_RESET, SNDCTL_DSP_SETFMT, SNDCTL_DSP_STEREO, SNDCTL_DSP_SPEED, * SNDCTL_DSP_GETOSPACE */ @@ -53,20 +55,36 @@ # include #endif +/* Patches for ignorant OSS versions */ +#ifndef AFMT_AC3 +# define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */ +#endif + +#ifndef AFMT_S16_NE +# ifdef WORDS_BIGENDIAN +# define AFMT_S16_NE AFMT_S16_BE +# else +# define AFMT_S16_NE AFMT_S16_LE +# endif +#endif + /***************************************************************************** * aout_sys_t: OSS audio output method descriptor ***************************************************************************** * This structure is part of the audio output thread descriptor. - * It describes the dsp specific properties of an audio device. + * It describes the DSP specific properties of an audio device. *****************************************************************************/ struct aout_sys_t { - int i_fd; + int i_fd; + int b_workaround_buggy_driver; + int i_fragstotal; + mtime_t max_buffer_duration; }; +/* This must be a power of 2. */ #define FRAME_SIZE 1024 -#define FRAME_COUNT 8 -#define A52_FRAME_NB 1536 +#define FRAME_COUNT 32 /***************************************************************************** * Local prototypes @@ -77,22 +95,179 @@ static void Close ( vlc_object_t * ); static void Play ( aout_instance_t * ); static int OSSThread ( aout_instance_t * ); +static mtime_t BufferDuration( aout_instance_t * p_aout ); + /***************************************************************************** * Module descriptor *****************************************************************************/ +#define BUGGY_TEXT N_("Try to work around buggy OSS drivers") +#define BUGGY_LONGTEXT N_( \ + "Some buggy OSS drivers just don't like when their internal buffers " \ + "are completely filled (the sound gets heavily hashed). If you have one " \ + "of these drivers, then you need to enable this option." ) + vlc_module_begin(); - add_category_hint( N_("OSS"), NULL ); - add_file( "dspdev", "/dev/dsp", NULL, N_("OSS dsp device"), NULL ); - set_description( _("Linux OSS /dev/dsp module") ); + set_shortname( "OSS" ); + set_description( N_("UNIX OSS audio output") ); + + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); + add_file( "dspdev", "/dev/dsp", aout_FindAndRestart, + N_("OSS DSP device"), NULL, false ); + add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ); + set_capability( "audio output", 100 ); - add_shortcut( "dsp" ); + add_shortcut( "oss" ); set_callbacks( Open, Close ); vlc_module_end(); +/***************************************************************************** + * Probe: probe the audio device for available formats and channels + *****************************************************************************/ +static void Probe( aout_instance_t * p_aout ) +{ + struct aout_sys_t * p_sys = p_aout->output.p_sys; + vlc_value_t val, text; + int i_format, i_nb_channels; + + var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); + text.psz_string = _("Audio Device"); + var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL ); + + /* Test for multi-channel. */ +#ifdef SNDCTL_DSP_GETCHANNELMASK + if ( aout_FormatNbChannels( &p_aout->output.output ) > 2 ) + { + /* Check that the device supports this. */ + + int i_chanmask; + + /* Reset all. */ + i_format = AFMT_S16_NE; + if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 || + ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 ) + { + msg_Err( p_aout, "cannot reset OSS audio device" ); + var_Destroy( p_aout, "audio-device" ); + return; + } + + if ( ioctl( p_sys->i_fd, SNDCTL_DSP_GETCHANNELMASK, + &i_chanmask ) == 0 ) + { + if ( !(i_chanmask & DSP_BIND_FRONT) ) + { + msg_Err( p_aout, "no front channels! (%x)", + i_chanmask ); + return; + } + + if ( (i_chanmask & (DSP_BIND_SURR | DSP_BIND_CENTER_LFE)) + && (p_aout->output.output.i_physical_channels == + (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT + | AOUT_CHAN_LFE)) ) + { + val.i_int = AOUT_VAR_5_1; + text.psz_string = "5.1"; + var_Change( p_aout, "audio-device", + VLC_VAR_ADDCHOICE, &val, &text ); + } + + if ( (i_chanmask & DSP_BIND_SURR) + && (p_aout->output.output.i_physical_channels & + (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT)) ) + { + val.i_int = AOUT_VAR_2F2R; + text.psz_string = N_("2 Front 2 Rear"); + var_Change( p_aout, "audio-device", + VLC_VAR_ADDCHOICE, &val, &text ); + } + } + } +#endif + + /* Reset all. */ + i_format = AFMT_S16_NE; + if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 || + ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 ) + { + msg_Err( p_aout, "cannot reset OSS audio device" ); + var_Destroy( p_aout, "audio-device" ); + return; + } + + /* Test for stereo. */ + i_nb_channels = 2; + if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) >= 0 + && i_nb_channels == 2 ) + { + val.i_int = AOUT_VAR_STEREO; + text.psz_string = N_("Stereo"); + var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); + } + + /* Reset all. */ + i_format = AFMT_S16_NE; + if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 || + ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 ) + { + msg_Err( p_aout, "cannot reset OSS audio device" ); + var_Destroy( p_aout, "audio-device" ); + return; + } + + /* Test for mono. */ + i_nb_channels = 1; + if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) >= 0 + && i_nb_channels == 1 ) + { + val.i_int = AOUT_VAR_MONO; + text.psz_string = N_("Mono"); + var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); + if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER ) + { + var_Set( p_aout, "audio-device", val ); + } + } + + if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ) + { + msg_Err( p_aout, "cannot reset OSS audio device" ); + var_Destroy( p_aout, "audio-device" ); + return; + } + + /* Test for spdif. */ + if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) + { + i_format = AFMT_AC3; + + if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) >= 0 + && i_format == AFMT_AC3 ) + { + val.i_int = AOUT_VAR_SPDIF; + text.psz_string = N_("A/52 over S/PDIF"); + var_Change( p_aout, "audio-device", + VLC_VAR_ADDCHOICE, &val, &text ); + if( config_GetInt( p_aout, "spdif" ) ) + var_Set( p_aout, "audio-device", val ); + } + else if( config_GetInt( p_aout, "spdif" ) ) + { + msg_Warn( p_aout, "S/PDIF not supported by card" ); + } + } + + var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, + NULL ); +} + /***************************************************************************** * Open: open the audio device (the digital sound processor) ***************************************************************************** - * This function opens the dsp as a usual non-blocking write-only file, and + * This function opens the DSP as a usual non-blocking write-only file, and * modifies the p_aout->p_sys->i_fd with the file's descriptor. *****************************************************************************/ static int Open( vlc_object_t *p_this ) @@ -100,127 +275,181 @@ static int Open( vlc_object_t *p_this ) aout_instance_t * p_aout = (aout_instance_t *)p_this; struct aout_sys_t * p_sys; char * psz_device; - int i_format; - int i_rate; - int i_frame_size; - int i_fragments; - vlc_bool_t b_stereo; + vlc_value_t val; /* Allocate structure */ p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } - /* Initialize some variables */ + /* Get device name */ if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL ) { - msg_Err( p_aout, "no audio device given (maybe /dev/dsp ?)" ); + msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" ); free( p_sys ); return VLC_EGENERIC; } - /* Open the sound device */ - if( (p_sys->i_fd = open( psz_device, O_WRONLY )) < 0 ) + /* Open the sound device in non-blocking mode, because ALSA's OSS + * emulation and some broken OSS drivers would make a blocking call + * wait forever until the device is available. Since this breaks the + * OSS spec, we immediately put it back to blocking mode if the + * operation was successful. */ + p_sys->i_fd = open( psz_device, O_WRONLY | O_NDELAY ); + if( p_sys->i_fd < 0 ) { msg_Err( p_aout, "cannot open audio device (%s)", psz_device ); - free( psz_device ); free( p_sys ); return VLC_EGENERIC; } + + /* if the opening was ok, put the device back in blocking mode */ + fcntl( p_sys->i_fd, F_SETFL, + fcntl( p_sys->i_fd, F_GETFL ) &~ FNDELAY ); + free( psz_device ); p_aout->output.pf_play = Play; - /* Reset the DSP device */ - if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ) + if ( var_Type( p_aout, "audio-device" ) == 0 ) { - msg_Err( p_aout, "cannot reset OSS audio device" ); + Probe( p_aout ); + } + + if ( var_Get( p_aout, "audio-device", &val ) < 0 ) + { + /* Probe() has failed. */ + free( p_sys ); return VLC_EGENERIC; } - - /* Set the fragment size - * i_fragment = xxxxyyyy where: xxxx is fragtotal - * 1 << yyyy is fragsize */ - i_fragments = 0; - i_frame_size = FRAME_SIZE; - while( i_frame_size >>= 1 ) + + if ( val.i_int == AOUT_VAR_SPDIF ) { - ++i_fragments; + p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); } - i_fragments |= FRAME_COUNT << 16; - if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFRAGMENT, &i_fragments ) < 0 ) + else if ( val.i_int == AOUT_VAR_5_1 ) { - msg_Err( p_aout, "cannot set fragment size (%.8x)", i_fragments ); - return VLC_EGENERIC; + p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_physical_channels + = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT + | AOUT_CHAN_LFE; } - - /* Set the output format */ - if ( p_aout->output.output.i_format == AOUT_FMT_SPDIF ) + else if ( val.i_int == AOUT_VAR_2F2R ) { - i_format = AOUT_FMT_SPDIF; - p_aout->output.i_nb_samples = A52_FRAME_NB; - p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE; - p_aout->output.output.i_frame_length = A52_FRAME_NB; + p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_physical_channels + = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; + } + else if ( val.i_int == AOUT_VAR_STEREO ) + { + p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_physical_channels + = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + } + else if ( val.i_int == AOUT_VAR_MONO ) + { + p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER; } else { - p_aout->output.output.i_format = i_format = AOUT_FMT_S16_NE; - p_aout->output.i_nb_samples = FRAME_SIZE; + /* This should not happen ! */ + msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int ); + free( p_sys ); + return VLC_EGENERIC; } - if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 - || i_format != p_aout->output.output.i_format ) + val.b_bool = true; + var_Set( p_aout, "intf-change", val ); + + /* Reset the DSP device */ + if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ) { - if ( i_format == AOUT_FMT_SPDIF ) - { - /* Retry with S16 */ - msg_Warn( p_aout, "cannot set audio output format (%i)", i_format ); - p_aout->output.output.i_format = i_format = AOUT_FMT_S16_NE; - p_aout->output.i_nb_samples = FRAME_SIZE; - if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 - || i_format != p_aout->output.output.i_format ) - { - msg_Err( p_aout, "cannot set audio output format (%i)", - i_format ); - return VLC_EGENERIC; - } - } - else + msg_Err( p_aout, "cannot reset OSS audio device" ); + close( p_sys->i_fd ); + free( p_sys ); + return VLC_EGENERIC; + } + + /* Set the output format */ + if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) + { + int i_format = AFMT_AC3; + + if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 + || i_format != AFMT_AC3 ) { - msg_Err( p_aout, "cannot set audio output format (%i)", i_format ); + msg_Err( p_aout, "cannot reset OSS audio device" ); + close( p_sys->i_fd ); + free( p_sys ); return VLC_EGENERIC; } + + p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); + p_aout->output.i_nb_samples = A52_FRAME_NB; + p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE; + p_aout->output.output.i_frame_length = A52_FRAME_NB; + + aout_VolumeNoneInit( p_aout ); } - if ( p_aout->output.output.i_format != AOUT_FMT_SPDIF ) + if ( !AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) { - /* FIXME */ - if ( p_aout->output.output.i_channels > 2 ) + unsigned int i_format = AFMT_S16_NE; + unsigned int i_frame_size, i_fragments; + unsigned int i_rate; + unsigned int i_nb_channels; + audio_buf_info audio_buf; + + if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 ) { - msg_Warn( p_aout, "only two channels are supported at the moment" ); - /* Trigger downmixing */ - p_aout->output.output.i_channels = 2; + msg_Err( p_aout, "cannot set audio output format" ); + close( p_sys->i_fd ); + free( p_sys ); + return VLC_EGENERIC; } - /* Set the number of channels */ - b_stereo = p_aout->output.output.i_channels - 1; - - if( ioctl( p_sys->i_fd, SNDCTL_DSP_STEREO, &b_stereo ) < 0 ) + switch ( i_format ) { - msg_Err( p_aout, "cannot set number of audio channels (%i)", - p_aout->output.output.i_channels ); + case AFMT_U8: + p_aout->output.output.i_format = VLC_FOURCC('u','8',' ',' '); + break; + case AFMT_S8: + p_aout->output.output.i_format = VLC_FOURCC('s','8',' ',' '); + break; + case AFMT_U16_LE: + p_aout->output.output.i_format = VLC_FOURCC('u','1','6','l'); + break; + case AFMT_S16_LE: + p_aout->output.output.i_format = VLC_FOURCC('s','1','6','l'); + break; + case AFMT_U16_BE: + p_aout->output.output.i_format = VLC_FOURCC('u','1','6','b'); + break; + case AFMT_S16_BE: + p_aout->output.output.i_format = VLC_FOURCC('s','1','6','b'); + break; + default: + msg_Err( p_aout, "OSS fell back to an unknown format (%d)", + i_format ); + close( p_sys->i_fd ); + free( p_sys ); return VLC_EGENERIC; } - if ( b_stereo + 1 != p_aout->output.output.i_channels ) + i_nb_channels = aout_FormatNbChannels( &p_aout->output.output ); + + /* Set the number of channels */ + if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) < 0 || + i_nb_channels != aout_FormatNbChannels( &p_aout->output.output ) ) { - msg_Warn( p_aout, "driver forced up/downmixing %li->%li", - p_aout->output.output.i_channels, - b_stereo + 1 ); - p_aout->output.output.i_channels = b_stereo + 1; + msg_Err( p_aout, "cannot set number of audio channels (%s)", + aout_FormatPrintChannels( &p_aout->output.output) ); + close( p_sys->i_fd ); + free( p_sys ); + return VLC_EGENERIC; } /* Set the output rate */ @@ -229,24 +458,68 @@ static int Open( vlc_object_t *p_this ) { msg_Err( p_aout, "cannot set audio output rate (%i)", p_aout->output.output.i_rate ); + close( p_sys->i_fd ); + free( p_sys ); return VLC_EGENERIC; } if( i_rate != p_aout->output.output.i_rate ) { - msg_Warn( p_aout, "driver forced resampling %li->%li", - p_aout->output.output.i_rate, i_rate ); p_aout->output.output.i_rate = i_rate; } + + /* Set the fragment size */ + aout_FormatPrepare( &p_aout->output.output ); + + /* i_fragment = xxxxyyyy where: xxxx is fragtotal + * 1 << yyyy is fragsize */ + i_frame_size = ((uint64_t)p_aout->output.output.i_bytes_per_frame * p_aout->output.output.i_rate * 65536) / (48000 * 2 * 2) / FRAME_COUNT; + i_fragments = 4; + while( i_fragments < 12 && (1U << i_fragments) < i_frame_size ) + { + ++i_fragments; + } + i_fragments |= FRAME_COUNT << 16; + if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFRAGMENT, &i_fragments ) < 0 ) + { + msg_Warn( p_aout, "cannot set fragment size (%.8x)", i_fragments ); + } + + if( ioctl( p_sys->i_fd, SNDCTL_DSP_GETOSPACE, &audio_buf ) < 0 ) + { + msg_Err( p_aout, "cannot get fragment size" ); + close( p_sys->i_fd ); + free( p_sys ); + return VLC_EGENERIC; + } + else + { + /* Number of fragments actually allocated */ + p_aout->output.p_sys->i_fragstotal = audio_buf.fragstotal; + + /* Maximum duration the soundcard's buffer can hold */ + p_aout->output.p_sys->max_buffer_duration = + (mtime_t)audio_buf.fragstotal * audio_buf.fragsize * 1000000 + / p_aout->output.output.i_bytes_per_frame + / p_aout->output.output.i_rate + * p_aout->output.output.i_frame_length; + + p_aout->output.i_nb_samples = audio_buf.fragsize / + p_aout->output.output.i_bytes_per_frame; + } + + aout_VolumeSoftInit( p_aout ); } + p_aout->output.p_sys->b_workaround_buggy_driver = + config_GetInt( p_aout, "oss-buggy" ); + /* Create OSS thread and wait for its readiness. */ if( vlc_thread_create( p_aout, "aout", OSSThread, - VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_OUTPUT, false ) ) { - msg_Err( p_aout, "cannot create OSS thread (%s)", strerror(errno) ); + msg_Err( p_aout, "cannot create OSS thread (%m)" ); close( p_sys->i_fd ); - free( psz_device ); free( p_sys ); return VLC_ETHREAD; } @@ -259,19 +532,20 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Play( aout_instance_t *p_aout ) { + VLC_UNUSED(p_aout); } /***************************************************************************** - * Close: close the dsp audio device + * Close: close the DSP audio device *****************************************************************************/ static void Close( vlc_object_t * p_this ) { aout_instance_t *p_aout = (aout_instance_t *)p_this; struct aout_sys_t * p_sys = p_aout->output.p_sys; - p_aout->b_die = VLC_TRUE; + vlc_object_kill( p_aout ); vlc_thread_join( p_aout ); - p_aout->b_die = VLC_FALSE; + p_aout->b_die = false; ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ); close( p_sys->i_fd ); @@ -279,7 +553,6 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } - /***************************************************************************** * BufferDuration: buffer status query ***************************************************************************** @@ -316,38 +589,45 @@ static int OSSThread( aout_instance_t * p_aout ) struct aout_sys_t * p_sys = p_aout->output.p_sys; mtime_t next_date = 0; - while ( !p_aout->b_die ) + while ( vlc_object_alive (p_aout) ) { - aout_buffer_t * p_buffer; + aout_buffer_t * p_buffer = NULL; int i_tmp, i_size; - byte_t * p_bytes; + uint8_t * p_bytes; - if ( p_aout->output.output.i_format != AOUT_FMT_SPDIF ) + if ( p_aout->output.output.i_format != VLC_FOURCC('s','p','d','i') ) { mtime_t buffered = BufferDuration( p_aout ); - /* Wait a bit - we don't want our buffer to be full */ - while( buffered > AOUT_PTS_TOLERANCE * 2 ) + if( p_aout->output.p_sys->b_workaround_buggy_driver ) { - msleep( buffered / 2 - 10000 ); - buffered = BufferDuration( p_aout ); +#define i_fragstotal p_aout->output.p_sys->i_fragstotal + /* Wait a bit - we don't want our buffer to be full */ + if( buffered > (p_aout->output.p_sys->max_buffer_duration + / i_fragstotal * (i_fragstotal - 1)) ) + { + msleep((p_aout->output.p_sys->max_buffer_duration + / i_fragstotal )); + buffered = BufferDuration( p_aout ); + } +#undef i_fragstotal } - if( !next_date ) - { - /* This is the _real_ presentation date */ - next_date = mdate() + buffered; - } - else + /* Next buffer will be played at mdate() + buffered */ + p_buffer = aout_OutputNextBuffer( p_aout, mdate() + buffered, + false ); + + if( p_buffer == NULL && + buffered > ( p_aout->output.p_sys->max_buffer_duration + / p_aout->output.p_sys->i_fragstotal ) ) { - /* Give a hint to the audio output about our drift, but - * not too much because we want to make it happy with our - * nicely calculated dates. */ - next_date = ( (next_date * 7) + (mdate() + buffered) ) / 8; + /* If we have at least a fragment full, then we can wait a + * little and retry to get a new audio buffer instead of + * playing a blank sample */ + msleep( ( p_aout->output.p_sys->max_buffer_duration + / p_aout->output.p_sys->i_fragstotal / 2 ) ); + continue; } - - /* Next buffer will be played at mdate()+buffered */ - p_buffer = aout_OutputNextBuffer( p_aout, next_date, VLC_FALSE ); } else { @@ -365,14 +645,13 @@ static int OSSThread( aout_instance_t * p_aout ) msleep( delay / 2 ); } } - - while( ! ( p_buffer = - aout_OutputNextBuffer( p_aout, next_date, VLC_TRUE ) ) ) + + while( vlc_object_alive (p_aout) && ! ( p_buffer = + aout_OutputNextBuffer( p_aout, next_date, true ) ) ) { - msleep( 10000 ); + msleep( 1000 ); next_date = mdate(); } - } if ( p_buffer != NULL ) @@ -396,7 +675,7 @@ static int OSSThread( aout_instance_t * p_aout ) if( i_tmp < 0 ) { - msg_Err( p_aout, "write failed (%s)", strerror(errno) ); + msg_Err( p_aout, "write failed (%m)" ); } if ( p_buffer != NULL )