/*****************************************************************************
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
- * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.30 2002/10/20 12:23:47 massiot Exp $
+ * Copyright (C) 2000-2002 the VideoLAN team
+ * $Id$
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
- * Samuel Hocevar <sam@zoy.org>
+ * Sam Hocevar <sam@zoy.org>
* Christophe Massiot <massiot@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
*
* 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 <errno.h> /* ENOMEM */
#include <fcntl.h> /* open(), O_WRONLY */
#include <sys/ioctl.h> /* ioctl() */
-#include <string.h> /* strerror() */
#include <unistd.h> /* write(), close() */
-#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
-#include <vlc/aout.h>
-
-#include "aout_internal.h"
+#include <vlc_aout.h>
/* SNDCTL_DSP_RESET, SNDCTL_DSP_SETFMT, SNDCTL_DSP_STEREO, SNDCTL_DSP_SPEED,
* SNDCTL_DSP_GETOSPACE */
# include <machine/soundcard.h>
#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
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 );
+ 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 );
- set_description( _("Linux OSS /dev/dsp module") );
+ N_("OSS DSP device"), NULL, false );
+ add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true );
+
set_capability( "audio output", 100 );
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 )
aout_instance_t * p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys;
char * psz_device;
+ 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;
- }
/* 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;
+ if ( var_Type( p_aout, "audio-device" ) == 0 )
+ {
+ Probe( p_aout );
+ }
+
+ if ( var_Get( p_aout, "audio-device", &val ) < 0 )
+ {
+ /* Probe() has failed. */
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ if ( val.i_int == AOUT_VAR_SPDIF )
+ {
+ p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
+ }
+ else if ( val.i_int == AOUT_VAR_5_1 )
+ {
+ 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;
+ }
+ else if ( val.i_int == AOUT_VAR_2F2R )
+ {
+ 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
+ {
+ /* This should not happen ! */
+ msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ 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 )
{
free( p_sys );
return VLC_EGENERIC;
}
-
+
/* Set the output format */
if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
{
if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
|| i_format != AFMT_AC3 )
{
- p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+ msg_Err( p_aout, "cannot reset OSS audio device" );
+ close( p_sys->i_fd );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- else
- {
- 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 );
- }
+ 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 ( !AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
{
- int i_format = AFMT_S16_NE;
- int i_frame_size, i_fragments;
- int i_rate;
- int i_nb_channels;
+ 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 )
{
return VLC_EGENERIC;
}
- p_aout->output.output.i_format = AOUT_FMT_S16_NE;
- p_aout->output.i_nb_samples = FRAME_SIZE;
-
- aout_VolumeSoftInit( p_aout );
-
- /* 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 )
- {
- ++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 );
- }
-
- /* These cases are desperate because of the OSS API and A/52 spec. */
- switch ( p_aout->output.output.i_channels )
- {
- case AOUT_CHAN_3F:
- case AOUT_CHAN_2F1R:
- case AOUT_CHAN_3F1R:
- case AOUT_CHAN_STEREO | AOUT_CHAN_LFE:
- case AOUT_CHAN_2F1R | AOUT_CHAN_LFE:
- case AOUT_CHAN_3F1R | AOUT_CHAN_LFE:
- case AOUT_CHAN_DOLBY | AOUT_CHAN_LFE:
- p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
- break;
- case AOUT_CHAN_CHANNEL | AOUT_CHAN_LFE:
- case AOUT_CHAN_CHANNEL1 | AOUT_CHAN_LFE:
- case AOUT_CHAN_CHANNEL2 | AOUT_CHAN_LFE:
- case AOUT_CHAN_MONO | AOUT_CHAN_LFE:
- case AOUT_CHAN_2F2R | AOUT_CHAN_LFE:
- p_aout->output.output.i_channels &= ~AOUT_CHAN_LFE;
- break;
- case AOUT_CHAN_3F2R:
- p_aout->output.output.i_channels = AOUT_CHAN_2F2R;
- break;
- }
- /* In a nutshell, possible types : AOUT_CHAN_STEREO (and al.),
- AOUT_CHAN_2F2R, AOUT_CHAN_3F1R | AOUT_CHAN_LFE. */
-
i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
- if ( i_nb_channels > 2 )
- {
- /* Check that the device supports this. */
-
-#ifdef SNDCTL_DSP_GETCHANNELMASK
- int i_chanmask;
- 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 );
- close( p_sys->i_fd );
- free( p_sys );
- return VLC_EGENERIC;
- }
-
- if ( !(i_chanmask & DSP_BIND_SURR) )
- {
- p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
- i_nb_channels = 2;
- }
-
- if ( p_aout->output.output.i_channels ==
- (AOUT_CHAN_3F2R | AOUT_CHAN_LFE)
- && !(i_chanmask & DSP_BIND_CENTER_LFE) )
- {
- p_aout->output.output.i_channels = AOUT_CHAN_2F2R;
- i_nb_channels = 4;
- }
- }
- else
-#endif
- {
- /* The driver doesn't support this call, assume it is stereo. */
- p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
- i_nb_channels = 2;
- }
- }
-
/* Set the number of channels */
- if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) < 0 )
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) < 0 ||
+ i_nb_channels != aout_FormatNbChannels( &p_aout->output.output ) )
{
- msg_Err( p_aout, "cannot set number of audio channels (%i)",
- p_aout->output.output.i_channels );
+ 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;
}
- if ( i_nb_channels != aout_FormatNbChannels( &p_aout->output.output ) )
- {
- switch ( i_nb_channels )
- {
- case 1: p_aout->output.output.i_channels = AOUT_CHAN_MONO; break;
- case 2: p_aout->output.output.i_channels = AOUT_CHAN_STEREO; break;
- case 4: p_aout->output.output.i_channels = AOUT_CHAN_2F2R; break;
- default:
- msg_Err( p_aout, "Unsupported downmixing (%d)", i_nb_channels );
- close( p_sys->i_fd );
- free( p_sys );
- return VLC_EGENERIC;
- }
- }
-
/* Set the output rate */
i_rate = p_aout->output.output.i_rate;
if( ioctl( p_sys->i_fd, SNDCTL_DSP_SPEED, &i_rate ) < 0 )
{
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;
}
*****************************************************************************/
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 );
free( p_sys );
}
-
/*****************************************************************************
* BufferDuration: buffer status query
*****************************************************************************
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 = NULL;
int i_tmp, i_size;
- byte_t * p_bytes;
+ uint8_t * p_bytes;
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
{
msleep( delay / 2 );
}
}
-
- while( !p_aout->b_die && ! ( 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( 1000 );
next_date = mdate();
if( i_tmp < 0 )
{
- msg_Err( p_aout, "write failed (%s)", strerror(errno) );
+ msg_Err( p_aout, "write failed (%m)" );
}
if ( p_buffer != NULL )
projects / vlc / blobdiff