* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.26 2002/09/18 21:21:23 massiot Exp $
+ * $Id: oss.c,v 1.40 2002/12/23 13:49:11 massiot Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*****************************************************************************/
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 4
/*****************************************************************************
* 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 );
- add_file( "dspdev", "/dev/dsp", NULL, N_("OSS dsp device"), NULL );
+ add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
+ N_("OSS dsp device"), NULL );
+ add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT );
set_description( _("Linux OSS /dev/dsp module") );
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;
+ int i_format, i_nb_channels;
+
+ var_Create( p_aout, "audio-device", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
+
+ 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;
+ }
+
+ 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.psz_string = N_("S/PDIF");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+ }
+ }
+
+ /* Go to PCM mode. */
+ 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 )
+ {
+ return;
+ }
+
+#ifdef SNDCTL_DSP_GETCHANNELMASK
+ if ( aout_FormatNbChannels( &p_aout->output.output ) > 2 )
+ {
+ /* Check that the device supports this. */
+
+ 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 );
+ 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.psz_string = N_("5.1");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+ }
+
+ 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.psz_string = N_("2 Front 2 Rear");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+ }
+ }
+ }
+#endif
+
+ /* 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.psz_string = N_("Stereo");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+ }
+
+ /* 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.psz_string = N_("Mono");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+ }
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_aout, "intf-change", val );
+}
+
/*****************************************************************************
* Open: open the audio device (the digital sound processor)
*****************************************************************************
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 ) );
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 ?)" );
}
/* Open the sound device */
- if( (p_sys->i_fd = open( psz_device, O_WRONLY )) < 0 )
+ p_sys->i_fd = open( psz_device, O_WRONLY );
+ 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;
}
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 ( !strcmp( val.psz_string, N_("S/PDIF") ) )
{
- ++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 ( !strcmp( val.psz_string, N_("5.1") ) )
{
- msg_Err( p_aout, "cannot set fragment size (%.8x)", i_fragments );
+ 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_REARLEFT
+ | AOUT_CHAN_LFE;
+ }
+ else if ( !strcmp( val.psz_string, N_("2 Front 2 Rear") ) )
+ {
+ 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_REARLEFT;
+ }
+ else if ( !strcmp( val.psz_string, "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 ( !strcmp( val.psz_string, "Mono" ) )
+ {
+ p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+ p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
+ }
+ free( val.psz_string );
+
+ /* Reset the DSP device */
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 )
+ {
+ 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 ( p_aout->output.output.i_format == AOUT_FMT_SPDIF )
+ if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
{
- i_format = AOUT_FMT_SPDIF;
+ 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 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 );
}
- else
- {
- p_aout->output.output.i_format = i_format = AOUT_FMT_S16_NE;
- p_aout->output.i_nb_samples = FRAME_SIZE;
-
- aout_VolumeSoftInit( p_aout );
- }
- if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
- || i_format != p_aout->output.output.i_format )
+ if ( !AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
{
- 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
+ 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_Err( p_aout, "cannot set audio output format (%i)", i_format );
+ msg_Err( p_aout, "cannot set audio output format" );
+ close( p_sys->i_fd );
+ free( p_sys );
return VLC_EGENERIC;
}
- }
- if ( p_aout->output.output.i_format != AOUT_FMT_SPDIF )
- {
- /* FIXME */
- if ( p_aout->output.output.i_channels > 2 )
+ switch ( i_format )
{
- msg_Warn( p_aout, "only two channels are supported at the moment" );
- /* Trigger downmixing */
- p_aout->output.output.i_channels = 2;
+ 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;
}
- /* Set the number of channels */
- b_stereo = p_aout->output.output.i_channels - 1;
+ i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
- if( ioctl( p_sys->i_fd, SNDCTL_DSP_STEREO, &b_stereo ) < 0 )
+ /* 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_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 ( b_stereo + 1 != p_aout->output.output.i_channels )
- {
- 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;
- }
-
/* Set the output rate */
i_rate = p_aout->output.output.i_rate;
if( ioctl( p_sys->i_fd, SNDCTL_DSP_SPEED, &i_rate ) < 0 )
{
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_fragments = 0;
+ i_frame_size = FRAME_SIZE * p_aout->output.output.i_bytes_per_frame;
+ 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 );
+ }
+
+ 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 ) )
{
msg_Err( p_aout, "cannot create OSS thread (%s)", strerror(errno) );
close( p_sys->i_fd );
- free( psz_device );
free( p_sys );
return VLC_ETHREAD;
}
free( p_sys );
}
-
/*****************************************************************************
* BufferDuration: buffer status query
*****************************************************************************
int i_tmp, i_size;
byte_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,
+ VLC_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
{