X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=e6154656b84ac97a154c986a5aa9e0bc8df69930;hb=59712f39c38e799807beee0db4e366ef5f8914e4;hp=e8df5b4edac08ab142cdbf15ded8229d30f8b557;hpb=a90a19a6b0468ea9fedadc27cfc1118d70295263;p=vlc diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index e8df5b4eda..e6154656b8 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -1,7 +1,7 @@ /***************************************************************************** * oss.c : OSS /dev/dsp module for vlc ***************************************************************************** - * Copyright (C) 2000-2002 VideoLAN + * Copyright (C) 2000-2002 the VideoLAN team * $Id$ * * Authors: Michel Kaempf @@ -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 */ @@ -49,8 +51,6 @@ # include #elif defined( HAVE_SYS_SOUNDCARD_H ) # include -#elif defined( HAVE_MACHINE_SOUNDCARD_H ) -# include #endif /* Patches for ignorant OSS versions */ @@ -82,7 +82,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 @@ -91,7 +91,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Play ( aout_instance_t * ); -static int OSSThread ( aout_instance_t * ); +static void* OSSThread ( vlc_object_t * ); static mtime_t BufferDuration( aout_instance_t * p_aout ); @@ -104,19 +104,21 @@ static mtime_t BufferDuration( aout_instance_t * p_aout ); "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(); - set_description( _("Linux OSS audio output") ); +vlc_module_begin () + 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_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_file( "oss-audio-device", "/dev/dsp", aout_FindAndRestart, + N_("OSS DSP device"), NULL, false ) + add_deprecated_alias( "dspdev" ) /* deprecated since 0.9.3 */ + 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(); + 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 @@ -154,7 +156,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; } @@ -166,7 +168,7 @@ static void Probe( aout_instance_t * p_aout ) | AOUT_CHAN_LFE)) ) { val.i_int = AOUT_VAR_5_1; - text.psz_string = N_("5.1"); + text.psz_string = (char*) "5.1"; var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } @@ -177,7 +179,7 @@ static void Probe( aout_instance_t * p_aout ) | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT)) ) { val.i_int = AOUT_VAR_2F2R; - text.psz_string = N_("2 Front 2 Rear"); + text.psz_string = _("2 Front 2 Rear"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } @@ -201,7 +203,7 @@ static void Probe( aout_instance_t * p_aout ) && i_nb_channels == 2 ) { val.i_int = AOUT_VAR_STEREO; - text.psz_string = N_("Stereo"); + text.psz_string = _("Stereo"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } @@ -221,7 +223,7 @@ static void Probe( aout_instance_t * p_aout ) && i_nb_channels == 1 ) { val.i_int = AOUT_VAR_MONO; - text.psz_string = N_("Mono"); + text.psz_string = _("Mono"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER ) { @@ -245,7 +247,7 @@ static void Probe( aout_instance_t * p_aout ) && i_format == AFMT_AC3 ) { val.i_int = AOUT_VAR_SPDIF; - text.psz_string = N_("A/52 over S/PDIF"); + text.psz_string = _("A/52 over S/PDIF"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); if( config_GetInt( p_aout, "spdif" ) ) @@ -253,7 +255,7 @@ static void Probe( aout_instance_t * p_aout ) } 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" ); } } @@ -277,13 +279,10 @@ 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 ) + if( (psz_device = config_GetPsz( p_aout, "oss-audio-device" )) == NULL ) { msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" ); free( p_sys ); @@ -299,6 +298,7 @@ static int Open( vlc_object_t *p_this ) 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; } @@ -319,6 +319,7 @@ static int Open( vlc_object_t *p_this ) if ( var_Get( p_aout, "audio-device", &val ) < 0 ) { /* Probe() has failed. */ + close( p_sys->i_fd ); free( p_sys ); return VLC_EGENERIC; } @@ -357,12 +358,12 @@ static int Open( vlc_object_t *p_this ) { /* This should not happen ! */ msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int ); + close( p_sys->i_fd ); free( p_sys ); return VLC_EGENERIC; } - val.b_bool = VLC_TRUE; - var_Set( p_aout, "intf-change", val ); + var_SetBool( p_aout, "intf-change", true ); /* Reset the DSP device */ if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ) @@ -473,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; } @@ -516,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 ) ) { - 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; @@ -532,6 +533,7 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Play( aout_instance_t *p_aout ) { + VLC_UNUSED(p_aout); } /***************************************************************************** @@ -542,9 +544,9 @@ 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 ); @@ -583,16 +585,18 @@ static mtime_t BufferDuration( aout_instance_t * p_aout ) /***************************************************************************** * OSSThread: asynchronous thread used to DMA the data to the device *****************************************************************************/ -static int OSSThread( aout_instance_t * p_aout ) +static void* OSSThread( 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; mtime_t next_date = 0; + int canc = vlc_savecancel (); - 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') ) { @@ -614,7 +618,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 @@ -645,8 +649,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(); @@ -674,7 +678,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 ) @@ -687,5 +691,6 @@ static int OSSThread( aout_instance_t * p_aout ) } } - return VLC_SUCCESS; + vlc_restorecancel (canc); + return NULL; }