X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=929aeacb7e6faacd16f17f787bf5fa0c2d626c49;hb=19933fe7a674ee6d1253821a656507a6a712f8d0;hp=0e9618c8b2878d91d54106403bd306dcc2329dee;hpb=5c9fdb1101e7da5c522e4ae2c41aef8e5f9aac92;p=vlc diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 0e9618c8b2..929aeacb7e 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -1,11 +1,11 @@ /***************************************************************************** * oss.c : OSS /dev/dsp module for vlc ***************************************************************************** - * Copyright (C) 2000-2002 VideoLAN - * $Id: oss.c,v 1.54 2003/03/10 10:41:22 massiot 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 @@ -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 */ @@ -55,7 +57,7 @@ /* 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 @@ -66,12 +68,11 @@ # 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 { @@ -83,7 +84,7 @@ 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 @@ -99,18 +100,22 @@ static mtime_t BufferDuration( aout_instance_t * p_aout ); /***************************************************************************** * 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( 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, VLC_FALSE ); - add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE ); - 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 ); @@ -122,10 +127,12 @@ vlc_module_end(); static void Probe( aout_instance_t * p_aout ) { struct aout_sys_t * p_sys = p_aout->output.p_sys; - vlc_value_t val; + vlc_value_t val, text; int i_format, i_nb_channels; - var_Create( p_aout, "audio-device", VLC_VAR_STRING | VLC_VAR_HASCHOICE ); + 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 @@ -150,7 +157,7 @@ static void Probe( aout_instance_t * p_aout ) { 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; } @@ -161,8 +168,10 @@ static void Probe( aout_instance_t * p_aout ) | 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 ); + 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) @@ -170,8 +179,10 @@ static void Probe( aout_instance_t * p_aout ) (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 ); + 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 ); } } } @@ -192,8 +203,9 @@ static void Probe( aout_instance_t * p_aout ) 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 ); + val.i_int = AOUT_VAR_STEREO; + text.psz_string = N_("Stereo"); + var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } /* Reset all. */ @@ -211,8 +223,9 @@ static void Probe( aout_instance_t * p_aout ) 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.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 ); @@ -234,11 +247,17 @@ static void Probe( aout_instance_t * p_aout ) if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) >= 0 && i_format == AFMT_AC3 ) { - val.psz_string = N_("A/52 over S/PDIF"); - var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val ); + 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, @@ -248,7 +267,7 @@ static void Probe( aout_instance_t * p_aout ) /***************************************************************************** * 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 ) @@ -261,24 +280,26 @@ static int Open( vlc_object_t *p_this ) /* 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 */ + /* 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; } @@ -303,11 +324,11 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - if ( !strcmp( val.psz_string, N_("A/52 over S/PDIF") ) ) + if ( val.i_int == AOUT_VAR_SPDIF ) { p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); } - else if ( !strcmp( val.psz_string, N_("5.1") ) ) + 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 @@ -315,20 +336,20 @@ static int Open( vlc_object_t *p_this ) | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE; } - else if ( !strcmp( val.psz_string, N_("2 Front 2 Rear") ) ) + 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_REARLEFT; + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; } - else if ( !strcmp( val.psz_string, N_("Stereo") ) ) + 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 ( !strcmp( val.psz_string, N_("Mono") ) ) + 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; @@ -336,15 +357,12 @@ static int Open( vlc_object_t *p_this ) else { /* This should not happen ! */ - msg_Err( p_aout, "internal: can't find audio-device (%s)", - val.psz_string ); + msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int ); free( p_sys ); - free( val.psz_string ); return VLC_EGENERIC; } - free( val.psz_string ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_aout, "intf-change", val ); /* Reset the DSP device */ @@ -456,9 +474,9 @@ static int Open( vlc_object_t *p_this ) /* 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; } @@ -499,9 +517,9 @@ static int Open( vlc_object_t *p_this ) /* 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( p_sys ); return VLC_ETHREAD; @@ -515,19 +533,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 ); @@ -571,11 +590,11 @@ 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 = 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') ) { @@ -597,7 +616,7 @@ static int OSSThread( aout_instance_t * p_aout ) /* Next buffer will be played at mdate() + buffered */ p_buffer = aout_OutputNextBuffer( p_aout, mdate() + buffered, - VLC_FALSE ); + false ); if( p_buffer == NULL && buffered > ( p_aout->output.p_sys->max_buffer_duration @@ -628,8 +647,8 @@ static int OSSThread( aout_instance_t * p_aout ) } } - 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(); @@ -657,7 +676,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 )