* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.27 2002/09/30 21:32:32 massiot Exp $
+ * $Id: oss.c,v 1.32 2002/10/25 15:21:42 gbazin 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 FRAME_COUNT 4
#define A52_FRAME_NB 1536
/*****************************************************************************
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();
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;
/* 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 );
+ free( psz_device );
+ 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;
}
- free( psz_device );
p_aout->output.pf_play = Play;
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 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_Err( p_aout, "cannot set fragment size (%.8x)", i_fragments );
- return VLC_EGENERIC;
- }
-
/* Set the output format */
- if ( p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i') )
+ if ( AOUT_FMT_NON_LINEAR( &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;
+ int i_format = AFMT_AC3;
- 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;
+ 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;
+ }
+ 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_VolumeSoftInit( p_aout );
+ aout_VolumeNoneInit( 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 == VLC_FOURCC('s','p','d','i') )
+ int i_format = AFMT_S16_NE;
+ int i_frame_size, i_fragments;
+ int i_rate;
+ int i_nb_channels;
+ audio_buf_info audio_buf;
+
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 )
{
- /* 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;
- }
+ msg_Err( p_aout, "cannot set audio output format" );
+ close( p_sys->i_fd );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- else
+
+ switch ( i_format )
{
- msg_Err( p_aout, "cannot set audio output format (%i)", i_format );
+ 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 ( p_aout->output.output.i_format != VLC_FOURCC('s','p','d','i') )
- {
- /* FIXME */
- if ( p_aout->output.output.i_channels > 2 )
+ /* These cases are desperate because of the OSS API and A/52 spec. */
+ switch ( p_aout->output.output.i_channels )
{
- msg_Warn( p_aout, "only two channels are supported at the moment" );
- /* Trigger downmixing */
- p_aout->output.output.i_channels = 2;
+ 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. */
- /* 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 )
+ 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 )
{
msg_Err( p_aout, "cannot set number of audio channels (%i)",
p_aout->output.output.i_channels );
+ close( p_sys->i_fd );
+ free( p_sys );
return VLC_EGENERIC;
}
- if ( b_stereo + 1 != p_aout->output.output.i_channels )
+ if ( 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;
+ 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 */
{
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_Warn( 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 );
}
/* Create OSS thread and wait for its readiness. */
{
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;
}
+ p_aout->output.p_sys->b_workaround_buggy_driver =
+ config_GetInt( p_aout, "oss-buggy" );
+
return VLC_SUCCESS;
}
free( p_sys );
}
-
/*****************************************************************************
* BufferDuration: buffer status query
*****************************************************************************
{
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 )
projects / vlc / blobdiff