/*****************************************************************************
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
- * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.59 2003/05/09 22:03:06 sigmunau 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
*
* 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.
*****************************************************************************/
/*****************************************************************************
#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 <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 */
/* Patches for ignorant OSS versions */
#ifndef AFMT_AC3
-# define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */
+# define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */
#endif
#ifndef AFMT_S16_NE
* 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
{
/* This must be a power of 2. */
#define FRAME_SIZE 1024
-#define FRAME_COUNT 4
+#define FRAME_COUNT 32
/*****************************************************************************
* Local prototypes
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define BUGGY_TEXT N_("try to work around buggy OSS drivers")
+#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, VLC_FALSE );
+ set_shortname( "OSS" );
+ set_description( _("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, VLC_FALSE );
+ N_("OSS DSP device"), NULL, VLC_FALSE );
add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
- set_description( _("Linux OSS audio output") );
- set_capability( "audio output", 100 );
+ set_capability( "audio output", 100 );
add_shortcut( "oss" );
set_callbacks( Open, Close );
vlc_module_end();
int i_format, i_nb_channels;
var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
- text.psz_string = _("Audio device");
+ text.psz_string = _("Audio Device");
var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
/* Test for multi-channel. */
{
if ( !(i_chanmask & DSP_BIND_FRONT) )
{
- msg_Err( p_aout, "No front channels ! (%x)",
+ msg_Err( p_aout, "no front channels! (%x)",
i_chanmask );
return;
}
| AOUT_CHAN_LFE)) )
{
val.i_int = AOUT_VAR_5_1;
- text.psz_string = N_("5.1");
+ text.psz_string = "5.1";
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
}
}
else if( config_GetInt( p_aout, "spdif" ) )
{
- msg_Warn( p_aout, "s/pdif not supported by card" );
+ 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 )
/* 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;
}
/* 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_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;
}
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) );
+ msg_Err( p_aout, "cannot create OSS thread (%m)" );
close( p_sys->i_fd );
free( p_sys );
return VLC_ETHREAD;
}
/*****************************************************************************
- * 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;
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