X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fdirectx.c;h=9a41a8bd5e15bf3c98d02fa66185d20e9872ea7f;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=5f5d301f570a3d5ba7f395751621c01327c0012c;hpb=35ca63a9aad988c5ce22a2c7da643de90a221024;p=vlc diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index 5f5d301f57..9a41a8bd5e 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -1,10 +1,10 @@ /***************************************************************************** * directx.c: Windows DirectX audio output method ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: directx.c,v 1.21 2003/06/11 18:20:38 gbazin Exp $ + * Copyright (C) 2001-2009 the VideoLAN team + * $Id$ * - * Authors: Gildas Bazin + * Authors: Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,115 +17,28 @@ * GNU General Public License for more details. * * 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. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* open(), O_WRONLY */ -#include /* strerror() */ -#include /* calloc(), malloc(), free() */ - -#include -#include -#include "aout_internal.h" - -#include -#include -#include - -#define FRAME_SIZE 2048 /* The size is in samples, not in bytes */ -#define FRAMES_NUM 4 - -/* frame buffer status */ -#define FRAME_QUEUED 0 -#define FRAME_EMPTY 1 - -/***************************************************************************** - * DirectSound GUIDs. - * Defining them here allows us to get rid of the dxguid library during - * the linking stage. - *****************************************************************************/ -#include -DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16); - -/***************************************************************************** - * Useful macros - *****************************************************************************/ -#ifndef WAVE_FORMAT_IEEE_FLOAT -# define WAVE_FORMAT_IEEE_FLOAT 0x0003 -#endif - -#ifndef WAVE_FORMAT_DOLBY_AC3_SPDIF -# define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 -#endif - -#ifndef WAVE_FORMAT_EXTENSIBLE -#define WAVE_FORMAT_EXTENSIBLE 0xFFFE +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#ifndef SPEAKER_FRONT_LEFT -# define SPEAKER_FRONT_LEFT 0x1 -# define SPEAKER_FRONT_RIGHT 0x2 -# define SPEAKER_FRONT_CENTER 0x4 -# define SPEAKER_LOW_FREQUENCY 0x8 -# define SPEAKER_BACK_LEFT 0x10 -# define SPEAKER_BACK_RIGHT 0x20 -# define SPEAKER_FRONT_LEFT_OF_CENTER 0x40 -# define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80 -# define SPEAKER_BACK_CENTER 0x100 -# define SPEAKER_SIDE_LEFT 0x200 -# define SPEAKER_SIDE_RIGHT 0x400 -# define SPEAKER_TOP_CENTER 0x800 -# define SPEAKER_TOP_FRONT_LEFT 0x1000 -# define SPEAKER_TOP_FRONT_CENTER 0x2000 -# define SPEAKER_TOP_FRONT_RIGHT 0x4000 -# define SPEAKER_TOP_BACK_LEFT 0x8000 -# define SPEAKER_TOP_BACK_CENTER 0x10000 -# define SPEAKER_TOP_BACK_RIGHT 0x20000 -# define SPEAKER_RESERVED 0x80000000 -#endif +#include +#include +#include +#include -#ifndef DSSPEAKER_HEADPHONE -# define DSSPEAKER_HEADPHONE 0x00000001 -#endif -#ifndef DSSPEAKER_MONO -# define DSSPEAKER_MONO 0x00000002 -#endif -#ifndef DSSPEAKER_QUAD -# define DSSPEAKER_QUAD 0x00000003 -#endif -#ifndef DSSPEAKER_STEREO -# define DSSPEAKER_STEREO 0x00000004 -#endif -#ifndef DSSPEAKER_SURROUND -# define DSSPEAKER_SURROUND 0x00000005 -#endif -#ifndef DSSPEAKER_5POINT1 -# define DSSPEAKER_5POINT1 0x00000006 -#endif +#include "windows_audio_common.h" -#ifndef _WAVEFORMATEXTENSIBLE_ -typedef struct { - WAVEFORMATEX Format; - union { - WORD wValidBitsPerSample; /* bits of precision */ - WORD wSamplesPerBlock; /* valid if wBitsPerSample==0 */ - WORD wReserved; /* If neither applies, set to zero. */ - } Samples; - DWORD dwChannelMask; /* which channels are */ - /* present in stream */ - GUID SubFormat; -} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; -#endif +#include -DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); -DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); -DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); +#define FRAME_SIZE ((int)p_aout->output.output.i_rate/20) /* Size in samples */ /***************************************************************************** * notification_thread_t: DirectX event thread @@ -134,12 +47,12 @@ typedef struct notification_thread_t { VLC_COMMON_MEMBERS - aout_instance_t * p_aout; - int i_frame_status[FRAMES_NUM]; /* status of each frame buffer */ - DSBPOSITIONNOTIFY p_events[FRAMES_NUM]; /* play notification events */ - int i_frame_size; /* Size in bytes of one frame */ + aout_instance_t *p_aout; + int i_frame_size; /* size in bytes of one frame */ + int i_write_slot; /* current write position in our circular buffer */ mtime_t start_date; + HANDLE event; } notification_thread_t; @@ -152,36 +65,30 @@ typedef struct notification_thread_t struct aout_sys_t { HINSTANCE hdsound_dll; /* handle of the opened dsound dll */ + + char * psz_device; /* user defined device name */ + LPGUID p_device_guid; + LPDIRECTSOUND p_dsobject; /* main Direct Sound object */ LPDIRECTSOUNDBUFFER p_dsbuffer; /* the sound buffer we use (direct sound * takes care of mixing all the * secondary buffers into the primary) */ - LPDIRECTSOUNDNOTIFY p_dsnotify; /* the position notify interface */ notification_thread_t *p_notif; /* DirectSoundThread id */ - int b_playing; /* playing status */ + int b_playing; /* playing status */ - int i_frame_size; /* Size in bytes of one frame */ + int i_frame_size; /* Size in bytes of one frame */ - vlc_bool_t b_chan_reorder; /* do we need channel reordering */ - int *pi_chan_table; + int i_speaker_setup; /* Speaker setup override */ + + bool b_chan_reorder; /* do we need channel reordering */ + int pi_chan_table[AOUT_CHAN_MAX]; uint32_t i_channel_mask; + uint32_t i_bits_per_sample; + uint32_t i_channels; }; -static const uint32_t pi_channels_in[] = - { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, - AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, - AOUT_CHAN_CENTER, AOUT_CHAN_LFE }; -static const uint32_t pi_channels_out[] = - { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT, - SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, - SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY }; -static const uint32_t pi_channels_ordered[] = - { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT, SPEAKER_FRONT_CENTER, - SPEAKER_LOW_FREQUENCY, - SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT }; - /***************************************************************************** * Local prototypes. *****************************************************************************/ @@ -192,25 +99,54 @@ static void Play ( aout_instance_t * ); /* local functions */ static void Probe ( aout_instance_t * ); static int InitDirectSound ( aout_instance_t * ); -static int CreateDSBuffer ( aout_instance_t *, int, int, int, int, int, vlc_bool_t ); -static int CreateDSBufferPCM ( aout_instance_t *, int*, int, int, int, vlc_bool_t ); +static int CreateDSBuffer ( aout_instance_t *, int, int, int, int, int, bool ); +static int CreateDSBufferPCM ( aout_instance_t *, vlc_fourcc_t*, int, int, int, bool ); static void DestroyDSBuffer ( aout_instance_t * ); -static void DirectSoundThread ( notification_thread_t * ); +static void* DirectSoundThread( vlc_object_t * ); static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * ); -static void CheckReordering ( aout_instance_t *, int ); -static void InterleaveFloat32 ( float *, float *, int *, int ); -static void InterleaveS16 ( int16_t *, int16_t *, int *, int ); +static int ReloadDirectXDevices( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + +/* Speaker setup override options list */ +static const char *const speaker_list[] = { "Windows default", "Mono", "Stereo", + "Quad", "5.1", "7.1" }; +static const char *const ppsz_adev[] = {"default", }; +static const char *const ppsz_adev_text[] = {"default", }; /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("DirectX audio output") ); - set_capability( "audio output", 100 ); - add_shortcut( "directx" ); - set_callbacks( OpenAudio, CloseAudio ); -vlc_module_end(); +#define DEVICE_TEXT N_("Output device") +#define DEVICE_LONGTEXT N_("Select your audio output device") + +#define SPEAKER_TEXT N_("Speaker configuration") +#define SPEAKER_LONGTEXT N_("Select speaker configuration you want to use. " \ + "This option doesn't upmix! So NO e.g. Stereo -> 5.1 conversion." ) + +vlc_module_begin () + set_description( N_("DirectX audio output") ) + set_shortname( "DirectX" ) + set_capability( "audio output", 100 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_shortcut( "directx", "directsound" ) + + add_string( "directx-audio-device-name", "default", NULL, + DEVICE_TEXT, DEVICE_LONGTEXT, false ) + add_deprecated_alias( "directx-audio-device" ) /* Since 1.1.0 */ + change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices ) + change_action_add( ReloadDirectXDevices, N_("Refresh list") ) + change_need_restart () + add_bool( "directx-audio-float32", false, NULL, FLOAT_TEXT, + FLOAT_LONGTEXT, true ) + add_string( "directx-audio-speaker", "Windows default", NULL, + SPEAKER_TEXT, SPEAKER_LONGTEXT, true ) + change_string_list( speaker_list, 0, 0 ) + change_need_restart () + + set_callbacks( OpenAudio, CloseAudio ) +vlc_module_end () /***************************************************************************** * OpenAudio: open the audio device @@ -221,29 +157,52 @@ static int OpenAudio( vlc_object_t *p_this ) { aout_instance_t * p_aout = (aout_instance_t *)p_this; vlc_value_t val; - int i; + char * psz_speaker; + int i = 0; + + const char * const * ppsz_compare = speaker_list; - msg_Dbg( p_aout, "OpenAudio" ); + msg_Dbg( p_aout, "Opening DirectSound Audio Output" ); /* Allocate structure */ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; /* Initialize some variables */ p_aout->output.p_sys->p_dsobject = NULL; p_aout->output.p_sys->p_dsbuffer = NULL; - p_aout->output.p_sys->p_dsnotify = NULL; p_aout->output.p_sys->p_notif = NULL; p_aout->output.p_sys->b_playing = 0; - p_aout->output.p_sys->pi_chan_table = NULL; p_aout->output.pf_play = Play; aout_VolumeSoftInit( p_aout ); + /* Retrieve config values */ + var_Create( p_aout, "directx-audio-float32", + VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + psz_speaker = var_CreateGetString( p_aout, "directx-audio-speaker" ); + + while ( *ppsz_compare != NULL ) + { + if ( !strncmp( *ppsz_compare, psz_speaker, strlen(*ppsz_compare) ) ) + { + break; + } + ppsz_compare++; i++; + } + + if ( *ppsz_compare == NULL ) + { + msg_Err( p_aout, "(%s) isn't valid speaker setup option", psz_speaker ); + msg_Err( p_aout, "Defaulting to Windows default speaker config"); + i = 0; + } + free( psz_speaker ); + p_aout->output.p_sys->i_speaker_setup = i; + + p_aout->output.p_sys->p_device_guid = 0; + /* Initialise DirectSound */ if( InitDirectSound( p_aout ) ) { @@ -262,20 +221,10 @@ static int OpenAudio( vlc_object_t *p_this ) goto error; } - /* Now we need to setup our DirectSound play notification structure */ - p_aout->output.p_sys->p_notif = - vlc_object_create( p_aout, sizeof(notification_thread_t) ); - p_aout->output.p_sys->p_notif->p_aout = p_aout; - - /* Then create the notification events */ - for( i = 0; i < FRAMES_NUM; i++ ) - p_aout->output.p_sys->p_notif->p_events[i].hEventNotify = - CreateEvent( NULL, FALSE, FALSE, NULL ); - /* Open the device */ if( val.i_int == AOUT_VAR_SPDIF ) { - p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); + p_aout->output.output.i_format = VLC_CODEC_SPDIFL; /* Calculate the frame size in bytes */ p_aout->output.i_nb_samples = A52_FRAME_NB; @@ -284,11 +233,11 @@ static int OpenAudio( vlc_object_t *p_this ) p_aout->output.p_sys->i_frame_size = p_aout->output.output.i_bytes_per_frame; - if( CreateDSBuffer( p_aout, VLC_FOURCC('s','p','d','i'), + if( CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL, p_aout->output.output.i_physical_channels, aout_FormatNbChannels( &p_aout->output.output ), p_aout->output.output.i_rate, - p_aout->output.p_sys->i_frame_size, VLC_FALSE ) + p_aout->output.p_sys->i_frame_size, false ) != VLC_SUCCESS ) { msg_Err( p_aout, "cannot open directx audio device" ); @@ -307,6 +256,20 @@ static int OpenAudio( vlc_object_t *p_this ) | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE; } + else if( val.i_int == AOUT_VAR_7_1 ) + { + p_aout->output.output.i_physical_channels + = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT + | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT + | AOUT_CHAN_LFE; + } + else if( val.i_int == AOUT_VAR_3F2R ) + { + p_aout->output.output.i_physical_channels + = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; + } else if( val.i_int == AOUT_VAR_2F2R ) { p_aout->output.output.i_physical_channels @@ -326,7 +289,7 @@ static int OpenAudio( vlc_object_t *p_this ) if( CreateDSBufferPCM( p_aout, &p_aout->output.output.i_format, p_aout->output.output.i_physical_channels, aout_FormatNbChannels( &p_aout->output.output ), - p_aout->output.output.i_rate, VLC_FALSE ) + p_aout->output.output.i_rate, false ) != VLC_SUCCESS ) { msg_Err( p_aout, "cannot open directx audio device" ); @@ -337,20 +300,29 @@ static int OpenAudio( vlc_object_t *p_this ) /* Calculate the frame size in bytes */ p_aout->output.i_nb_samples = FRAME_SIZE; aout_FormatPrepare( &p_aout->output.output ); - p_aout->output.p_sys->i_frame_size = - FRAME_SIZE * p_aout->output.output.i_bytes_per_frame; - aout_VolumeSoftInit( p_aout ); } + /* Now we need to setup our DirectSound play notification structure */ + p_aout->output.p_sys->p_notif = + vlc_object_create( p_aout, sizeof(notification_thread_t) ); + p_aout->output.p_sys->p_notif->p_aout = p_aout; + + p_aout->output.p_sys->p_notif->event = CreateEvent( 0, FALSE, FALSE, 0 ); + p_aout->output.p_sys->p_notif->i_frame_size = + p_aout->output.p_sys->i_frame_size; + /* then launch the notification thread */ msg_Dbg( p_aout, "creating DirectSoundThread" ); if( vlc_thread_create( p_aout->output.p_sys->p_notif, "DirectSound Notification Thread", DirectSoundThread, - VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_HIGHEST ) ) { msg_Err( p_aout, "cannot create DirectSoundThread" ); + CloseHandle( p_aout->output.p_sys->p_notif->event ); + vlc_object_release( p_aout->output.p_sys->p_notif ); + p_aout->output.p_sys->p_notif = NULL; goto error; } @@ -369,12 +341,13 @@ static int OpenAudio( vlc_object_t *p_this ) static void Probe( aout_instance_t * p_aout ) { vlc_value_t val, text; - int i_format; + vlc_fourcc_t i_format; unsigned int i_physical_channels; DWORD ui_speaker_config; + bool is_default_output_set = false; 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 5.1 support */ @@ -384,17 +357,63 @@ static void Probe( aout_instance_t * p_aout ) if( p_aout->output.output.i_physical_channels == i_physical_channels ) { if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 6, - p_aout->output.output.i_rate, VLC_TRUE ) + p_aout->output.output.i_rate, true ) == VLC_SUCCESS ) { 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 ); + var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + is_default_output_set = true; msg_Dbg( p_aout, "device supports 5.1 channels" ); } } + /* Test for 7.1 support */ + i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | + AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | + AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT | + AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE; + if( p_aout->output.output.i_physical_channels == i_physical_channels ) + { + if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 8, + p_aout->output.output.i_rate, true ) + == VLC_SUCCESS ) + { + val.i_int = AOUT_VAR_7_1; + text.psz_string = (char*) "7.1"; + var_Change( p_aout, "audio-device", + VLC_VAR_ADDCHOICE, &val, &text ); + var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + is_default_output_set = true; + msg_Dbg( p_aout, "device supports 7.1 channels" ); + } + } + + /* Test for 3 Front 2 Rear support */ + i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | + AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | + AOUT_CHAN_REARRIGHT; + if( p_aout->output.output.i_physical_channels == i_physical_channels ) + { + if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 5, + p_aout->output.output.i_rate, true ) + == VLC_SUCCESS ) + { + val.i_int = AOUT_VAR_3F2R; + text.psz_string = _("3 Front 2 Rear"); + var_Change( p_aout, "audio-device", + VLC_VAR_ADDCHOICE, &val, &text ); + if(!is_default_output_set) + { + var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + is_default_output_set = true; + } + msg_Dbg( p_aout, "device supports 5 channels" ); + } + } + /* Test for 2 Front 2 Rear support */ i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; @@ -402,13 +421,18 @@ static void Probe( aout_instance_t * p_aout ) == i_physical_channels ) { if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 4, - p_aout->output.output.i_rate, VLC_TRUE ) + p_aout->output.output.i_rate, true ) == VLC_SUCCESS ) { 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 ); + if(!is_default_output_set) + { + var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + is_default_output_set = true; + } msg_Dbg( p_aout, "device supports 4 channels" ); } } @@ -416,23 +440,29 @@ static void Probe( aout_instance_t * p_aout ) /* Test for stereo support */ i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 2, - p_aout->output.output.i_rate, VLC_TRUE ) + p_aout->output.output.i_rate, true ) == VLC_SUCCESS ) { 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 ); - msg_Dbg( p_aout, "device supports 2 channels" ); + if(!is_default_output_set) + { + var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + is_default_output_set = true; + msg_Dbg( p_aout, "device supports 2 channels (DEFAULT!)" ); + } + else msg_Dbg( p_aout, "device supports 2 channels" ); } /* Test for mono support */ i_physical_channels = AOUT_CHAN_CENTER; if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 1, - p_aout->output.output.i_rate, VLC_TRUE ) + p_aout->output.output.i_rate, true ) == VLC_SUCCESS ) { 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 ); msg_Dbg( p_aout, "device supports 1 channel" ); } @@ -443,42 +473,86 @@ static void Probe( aout_instance_t * p_aout ) &ui_speaker_config ) ) { ui_speaker_config = DSSPEAKER_STEREO; + msg_Dbg( p_aout, "GetSpeakerConfig failed" ); } switch( DSSPEAKER_CONFIG(ui_speaker_config) ) { + case DSSPEAKER_7POINT1: + msg_Dbg( p_aout, "Windows says your SpeakerConfig is 7.1" ); + val.i_int = AOUT_VAR_7_1; + break; case DSSPEAKER_5POINT1: + msg_Dbg( p_aout, "Windows says your SpeakerConfig is 5.1" ); val.i_int = AOUT_VAR_5_1; break; case DSSPEAKER_QUAD: + msg_Dbg( p_aout, "Windows says your SpeakerConfig is Quad" ); val.i_int = AOUT_VAR_2F2R; break; +#if 0 /* Lots of people just get their settings wrong and complain that + * this is a problem with VLC so just don't ever set mono by default. */ case DSSPEAKER_MONO: val.i_int = AOUT_VAR_MONO; break; +#endif case DSSPEAKER_SURROUND: + msg_Dbg( p_aout, "Windows says your SpeakerConfig is surround" ); case DSSPEAKER_STEREO: + msg_Dbg( p_aout, "Windows says your SpeakerConfig is stereo" ); default: + /* If nothing else is found, choose stereo output */ + val.i_int = AOUT_VAR_STEREO; + break; + } + + /* Check if we want to override speaker config */ + switch( p_aout->output.p_sys->i_speaker_setup ) + { + case 0: /* Default value aka Windows default speaker setup */ + break; + case 1: /* Mono */ + msg_Dbg( p_aout, "SpeakerConfig is forced to Mono" ); + val.i_int = AOUT_VAR_MONO; + break; + case 2: /* Stereo */ + msg_Dbg( p_aout, "SpeakerConfig is forced to Stereo" ); val.i_int = AOUT_VAR_STEREO; break; + case 3: /* Quad */ + msg_Dbg( p_aout, "SpeakerConfig is forced to Quad" ); + val.i_int = AOUT_VAR_2F2R; + break; + case 4: /* 5.1 */ + msg_Dbg( p_aout, "SpeakerConfig is forced to 5.1" ); + val.i_int = AOUT_VAR_5_1; + break; + case 5: /* 7.1 */ + msg_Dbg( p_aout, "SpeakerConfig is forced to 7.1" ); + val.i_int = AOUT_VAR_7_1; + break; + default: + msg_Dbg( p_aout, "SpeakerConfig is forced to non-existing value" ); + break; } + var_Set( p_aout, "audio-device", val ); /* Test for SPDIF support */ if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) { - if( CreateDSBuffer( p_aout, VLC_FOURCC('s','p','d','i'), + if( CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL, p_aout->output.output.i_physical_channels, aout_FormatNbChannels( &p_aout->output.output ), p_aout->output.output.i_rate, - AOUT_SPDIF_SIZE, VLC_TRUE ) + AOUT_SPDIF_SIZE, true ) == VLC_SUCCESS ) { msg_Dbg( p_aout, "device supports A/52 over S/PDIF" ); 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" ) ) + if( var_InheritBool( p_aout, "spdif" ) ) var_Set( p_aout, "audio-device", val ); } } @@ -492,9 +566,7 @@ static void Probe( aout_instance_t * p_aout ) } var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); - - val.b_bool = VLC_TRUE; - var_Set( p_aout, "intf-change", val ); + var_SetBool( p_aout, "intf-change", true ); } /***************************************************************************** @@ -515,11 +587,15 @@ static void Play( aout_instance_t *p_aout ) aout_FifoFirstDate( p_aout, &p_aout->output.fifo ); /* fill in the first samples */ - p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); - FillBuffer( p_aout, 0, p_buffer ); + for( int i = 0; i < FRAMES_NUM; i++ ) + { + p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); + if( !p_buffer ) break; + FillBuffer( p_aout, i, p_buffer ); + } /* wake up the audio output thread */ - SetEvent( p_aout->output.p_sys->p_notif->p_events[0].hEventNotify ); + SetEvent( p_aout->output.p_sys->p_notif->event ); } } @@ -529,42 +605,69 @@ static void Play( aout_instance_t *p_aout ) static void CloseAudio( vlc_object_t *p_this ) { aout_instance_t * p_aout = (aout_instance_t *)p_this; + aout_sys_t *p_sys = p_aout->output.p_sys; - msg_Dbg( p_aout, "CloseAudio" ); + msg_Dbg( p_aout, "closing audio device" ); /* kill the position notification thread, if any */ - if( p_aout->output.p_sys->p_notif ) + if( p_sys->p_notif ) { - vlc_object_detach( p_aout->output.p_sys->p_notif ); - if( p_aout->output.p_sys->p_notif->b_thread ) - { - p_aout->output.p_sys->p_notif->b_die = 1; + vlc_object_kill( p_sys->p_notif ); + /* wake up the audio thread if needed */ + if( !p_sys->b_playing ) SetEvent( p_sys->p_notif->event ); - if( !p_aout->output.p_sys->b_playing ) - /* wake up the audio thread */ - SetEvent( - p_aout->output.p_sys->p_notif->p_events[0].hEventNotify ); - - vlc_thread_join( p_aout->output.p_sys->p_notif ); - } - vlc_object_destroy( p_aout->output.p_sys->p_notif ); + vlc_thread_join( p_sys->p_notif ); + vlc_object_release( p_sys->p_notif ); } /* release the secondary buffer */ DestroyDSBuffer( p_aout ); /* finally release the DirectSound object */ - if( p_aout->output.p_sys->p_dsobject ) - IDirectSound_Release( p_aout->output.p_sys->p_dsobject ); - + if( p_sys->p_dsobject ) IDirectSound_Release( p_sys->p_dsobject ); + /* free DSOUND.DLL */ - if( p_aout->output.p_sys->hdsound_dll ) - FreeLibrary( p_aout->output.p_sys->hdsound_dll ); + if( p_sys->hdsound_dll ) FreeLibrary( p_sys->hdsound_dll ); + + free( p_aout->output.p_sys->p_device_guid ); + free( p_sys ); +} - if( p_aout->output.p_sys->pi_chan_table ) - free( p_aout->output.p_sys->pi_chan_table ); +/***************************************************************************** + * CallBackDirectSoundEnum: callback to enumerate available devices + *****************************************************************************/ +static int CALLBACK CallBackDirectSoundEnum( LPGUID p_guid, LPCWSTR psz_desc, + LPCWSTR psz_mod, LPVOID _p_aout ) +{ + VLC_UNUSED( psz_mod ); + + aout_instance_t *p_aout = (aout_instance_t *)_p_aout; + + char *psz_device = FromWide( psz_desc ); + msg_Dbg( p_aout, "found device: %s", psz_device ); + + if( p_aout->output.p_sys->psz_device && + !strcmp(p_aout->output.p_sys->psz_device, psz_device) && p_guid ) + { + /* Use the device corresponding to psz_device */ + p_aout->output.p_sys->p_device_guid = malloc( sizeof( GUID ) ); + *p_aout->output.p_sys->p_device_guid = *p_guid; + msg_Dbg( p_aout, "using device: %s", psz_device ); + } + else + { + /* If no default device has been selected, chose the first one */ + if( !p_aout->output.p_sys->psz_device && p_guid ) + { + p_aout->output.p_sys->psz_device = strdup( psz_device ); + p_aout->output.p_sys->p_device_guid = malloc( sizeof( GUID ) ); + *p_aout->output.p_sys->p_device_guid = *p_guid; + msg_Dbg( p_aout, "using device: %s", psz_device ); + } + } - free( p_aout->output.p_sys ); + free( psz_device ); + return true; } /***************************************************************************** @@ -573,6 +676,7 @@ static void CloseAudio( vlc_object_t *p_this ) static int InitDirectSound( aout_instance_t *p_aout ) { HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN); + HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID); p_aout->output.p_sys->hdsound_dll = LoadLibrary("DSOUND.DLL"); if( p_aout->output.p_sys->hdsound_dll == NULL ) @@ -581,17 +685,33 @@ static int InitDirectSound( aout_instance_t *p_aout ) goto error; } - OurDirectSoundCreate = (void *)GetProcAddress( - p_aout->output.p_sys->hdsound_dll, - "DirectSoundCreate" ); + OurDirectSoundCreate = (void *) + GetProcAddress( p_aout->output.p_sys->hdsound_dll, + "DirectSoundCreate" ); if( OurDirectSoundCreate == NULL ) { msg_Warn( p_aout, "GetProcAddress FAILED" ); goto error; } + /* Get DirectSoundEnumerate */ + OurDirectSoundEnumerate = (void *) + GetProcAddress( p_aout->output.p_sys->hdsound_dll, + "DirectSoundEnumerateW" ); + if( OurDirectSoundEnumerate ) + { + p_aout->output.p_sys->psz_device = var_InheritString(p_aout, "directx-audio-device-name"); + /* Attempt enumeration */ + if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum, + p_aout ) ) ) + { + msg_Dbg( p_aout, "enumeration of DirectSound devices failed" ); + } + } + /* Create the direct sound object */ - if FAILED( OurDirectSoundCreate( NULL, &p_aout->output.p_sys->p_dsobject, + if FAILED( OurDirectSoundCreate( p_aout->output.p_sys->p_device_guid, + &p_aout->output.p_sys->p_dsobject, NULL ) ) { msg_Warn( p_aout, "cannot create a direct sound device" ); @@ -642,7 +762,7 @@ static int InitDirectSound( aout_instance_t *p_aout ) *****************************************************************************/ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, int i_channels, int i_nb_channels, int i_rate, - int i_bytes_per_frame, vlc_bool_t b_probe ) + int i_bytes_per_frame, bool b_probe ) { WAVEFORMATEXTENSIBLE waveformat; DSBUFFERDESC dsbdesc; @@ -650,15 +770,15 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, /* First set the sound buffer format */ waveformat.dwChannelMask = 0; - for( i = 0; i < sizeof(pi_channels_in)/sizeof(uint32_t); i++ ) + for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ ) { - if( i_channels & pi_channels_in[i] ) - waveformat.dwChannelMask |= pi_channels_out[i]; + if( i_channels & pi_channels_src[i] ) + waveformat.dwChannelMask |= pi_channels_in[i]; } switch( i_format ) { - case VLC_FOURCC('s','p','d','i'): + case VLC_CODEC_SPDIFL: i_nb_channels = 2; /* To prevent channel re-ordering */ waveformat.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; @@ -669,7 +789,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF; break; - case VLC_FOURCC('f','l','3','2'): + case VLC_CODEC_FL32: waveformat.Format.wBitsPerSample = sizeof(float) * 8; waveformat.Samples.wValidBitsPerSample = waveformat.Format.wBitsPerSample; @@ -677,7 +797,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; break; - case VLC_FOURCC('s','1','6','l'): + case VLC_CODEC_S16L: waveformat.Format.wBitsPerSample = 16; waveformat.Samples.wValidBitsPerSample = waveformat.Format.wBitsPerSample; @@ -693,6 +813,15 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, waveformat.Format.nAvgBytesPerSec = waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign; + p_aout->output.p_sys->i_bits_per_sample = waveformat.Format.wBitsPerSample; + p_aout->output.p_sys->i_channels = i_nb_channels; + + /* Then fill in the direct sound descriptor */ + memset(&dsbdesc, 0, sizeof(DSBUFFERDESC)); + dsbdesc.dwSize = sizeof(DSBUFFERDESC); + dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2/* Better position accuracy */ + | DSBCAPS_GLOBALFOCUS; /* Allows background playing */ + /* Only use the new WAVE_FORMAT_EXTENSIBLE format for multichannel audio */ if( i_nb_channels <= 2 ) { @@ -703,15 +832,11 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, waveformat.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; waveformat.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - } + /* Needed for 5.1 on emu101k */ + dsbdesc.dwFlags |= DSBCAPS_LOCHARDWARE; + } - /* Then fill in the direct sound descriptor */ - memset(&dsbdesc, 0, sizeof(DSBUFFERDESC)); - dsbdesc.dwSize = sizeof(DSBUFFERDESC); - dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2/* Better position accuracy */ - | DSBCAPS_CTRLPOSITIONNOTIFY /* We need notification */ - | DSBCAPS_GLOBALFOCUS; /* Allows background playing */ dsbdesc.dwBufferBytes = FRAMES_NUM * i_bytes_per_frame; /* buffer size */ dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&waveformat; @@ -719,7 +844,23 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, p_aout->output.p_sys->p_dsobject, &dsbdesc, &p_aout->output.p_sys->p_dsbuffer, NULL) ) { - return VLC_EGENERIC; + if( dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE ) + { + /* Try without DSBCAPS_LOCHARDWARE */ + dsbdesc.dwFlags &= ~DSBCAPS_LOCHARDWARE; + if FAILED( IDirectSound_CreateSoundBuffer( + p_aout->output.p_sys->p_dsobject, &dsbdesc, + &p_aout->output.p_sys->p_dsbuffer, NULL) ) + { + return VLC_EGENERIC; + } + if( !b_probe ) + msg_Dbg( p_aout, "couldn't use hardware sound buffer" ); + } + else + { + return VLC_EGENERIC; + } } /* Stop here if we were just probing */ @@ -730,46 +871,19 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, return VLC_SUCCESS; } - /* Backup the size of a frame */ - p_aout->output.p_sys->p_notif->i_frame_size = i_bytes_per_frame; - - /* Now the secondary buffer is created, we need to setup its position - * notification */ - for( i = 0; i < FRAMES_NUM; i++ ) - { - p_aout->output.p_sys->p_notif->p_events[i].dwOffset = i * - p_aout->output.p_sys->p_notif->i_frame_size; - - p_aout->output.p_sys->p_notif->i_frame_status[i] = FRAME_EMPTY; - } - - /* Get the IDirectSoundNotify interface */ - if FAILED( IDirectSoundBuffer_QueryInterface( - p_aout->output.p_sys->p_dsbuffer, - &IID_IDirectSoundNotify, - (LPVOID *)&p_aout->output.p_sys->p_dsnotify ) ) - { - msg_Err( p_aout, "cannot get IDirectSoundNotify interface" ); - goto error; - } + p_aout->output.p_sys->i_frame_size = i_bytes_per_frame; + p_aout->output.p_sys->i_channel_mask = waveformat.dwChannelMask; + p_aout->output.p_sys->b_chan_reorder = + aout_CheckChannelReorder( pi_channels_in, pi_channels_out, + waveformat.dwChannelMask, i_nb_channels, + p_aout->output.p_sys->pi_chan_table ); - if FAILED( IDirectSoundNotify_SetNotificationPositions( - p_aout->output.p_sys->p_dsnotify, - FRAMES_NUM, - p_aout->output.p_sys->p_notif->p_events ) ) + if( p_aout->output.p_sys->b_chan_reorder ) { - msg_Err( p_aout, "cannot set position notification" ); - goto error; + msg_Dbg( p_aout, "channel reordering needed" ); } - p_aout->output.p_sys->i_channel_mask = waveformat.dwChannelMask; - CheckReordering( p_aout, i_nb_channels ); - return VLC_SUCCESS; - - error: - DestroyDSBuffer( p_aout ); - return VLC_EGENERIC; } /***************************************************************************** @@ -778,16 +892,19 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, * We first try to create a WAVE_FORMAT_IEEE_FLOAT buffer if supported by * the hardware, otherwise we create a WAVE_FORMAT_PCM buffer. ****************************************************************************/ -static int CreateDSBufferPCM( aout_instance_t *p_aout, int *i_format, +static int CreateDSBufferPCM( aout_instance_t *p_aout, vlc_fourcc_t *i_format, int i_channels, int i_nb_channels, int i_rate, - vlc_bool_t b_probe ) + bool b_probe ) { - if( CreateDSBuffer( p_aout, VLC_FOURCC('f','l','3','2'), + /* Float32 audio samples are not supported for 5.1 output on the emu101k */ + if( !var_GetBool( p_aout, "directx-audio-float32" ) || + i_nb_channels > 2 || + CreateDSBuffer( p_aout, VLC_CODEC_FL32, i_channels, i_nb_channels, i_rate, FRAME_SIZE * 4 * i_nb_channels, b_probe ) != VLC_SUCCESS ) { - if ( CreateDSBuffer( p_aout, VLC_FOURCC('s','1','6','l'), + if ( CreateDSBuffer( p_aout, VLC_CODEC_S16L, i_channels, i_nb_channels, i_rate, FRAME_SIZE * 2 * i_nb_channels, b_probe ) != VLC_SUCCESS ) @@ -796,13 +913,13 @@ static int CreateDSBufferPCM( aout_instance_t *p_aout, int *i_format, } else { - *i_format = VLC_FOURCC('s','1','6','l'); + *i_format = VLC_CODEC_S16L; return VLC_SUCCESS; } } else { - *i_format = VLC_FOURCC('f','l','3','2'); + *i_format = VLC_CODEC_FL32; return VLC_SUCCESS; } } @@ -814,12 +931,6 @@ static int CreateDSBufferPCM( aout_instance_t *p_aout, int *i_format, *****************************************************************************/ static void DestroyDSBuffer( aout_instance_t *p_aout ) { - if( p_aout->output.p_sys->p_dsnotify ) - { - IDirectSoundNotify_Release( p_aout->output.p_sys->p_dsnotify ); - p_aout->output.p_sys->p_dsnotify = NULL; - } - if( p_aout->output.p_sys->p_dsbuffer ) { IDirectSoundBuffer_Release( p_aout->output.p_sys->p_dsbuffer ); @@ -836,25 +947,26 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, aout_buffer_t *p_buffer ) { notification_thread_t *p_notif = p_aout->output.p_sys->p_notif; + aout_sys_t *p_sys = p_aout->output.p_sys; void *p_write_position, *p_wrap_around; - long l_bytes1, l_bytes2; + unsigned long l_bytes1, l_bytes2; HRESULT dsresult; /* Before copying anything, we have to lock the buffer */ dsresult = IDirectSoundBuffer_Lock( - p_aout->output.p_sys->p_dsbuffer, /* DS buffer */ + p_sys->p_dsbuffer, /* DS buffer */ i_frame * p_notif->i_frame_size, /* Start offset */ p_notif->i_frame_size, /* Number of bytes */ &p_write_position, /* Address of lock start */ &l_bytes1, /* Count of bytes locked before wrap around */ - &p_wrap_around, /* Buffer adress (if wrap around) */ + &p_wrap_around, /* Buffer address (if wrap around) */ &l_bytes2, /* Count of bytes after wrap around */ 0 ); /* Flags */ if( dsresult == DSERR_BUFFERLOST ) { - IDirectSoundBuffer_Restore( p_aout->output.p_sys->p_dsbuffer ); + IDirectSoundBuffer_Restore( p_sys->p_dsbuffer ); dsresult = IDirectSoundBuffer_Lock( - p_aout->output.p_sys->p_dsbuffer, + p_sys->p_dsbuffer, i_frame * p_notif->i_frame_size, p_notif->i_frame_size, &p_write_position, @@ -874,69 +986,52 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, { memset( p_write_position, 0, l_bytes1 ); } - else if( p_aout->output.p_sys->b_chan_reorder ) - { - /* Do the channel reordering here */ - - if( p_aout->output.output.i_format == VLC_FOURCC('s','1','6','l') ) - InterleaveS16( (int16_t *)p_buffer->p_buffer, - (int16_t *)p_write_position, - p_aout->output.p_sys->pi_chan_table, - aout_FormatNbChannels( &p_aout->output.output ) ); - else - InterleaveFloat32( (float *)p_buffer->p_buffer, - (float *)p_write_position, - p_aout->output.p_sys->pi_chan_table, - aout_FormatNbChannels( &p_aout->output.output ) ); - - aout_BufferFree( p_buffer ); - } else { - p_aout->p_vlc->pf_memcpy( p_write_position, p_buffer->p_buffer, - l_bytes1 ); + if( p_sys->b_chan_reorder ) + { + /* Do the channel reordering here */ + aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_buffer, + p_sys->i_channels, p_sys->pi_chan_table, + p_sys->i_bits_per_sample ); + } + + vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 ); aout_BufferFree( p_buffer ); } /* Now the data has been copied, unlock the buffer */ - IDirectSoundBuffer_Unlock( p_aout->output.p_sys->p_dsbuffer, - p_write_position, l_bytes1, + IDirectSoundBuffer_Unlock( p_sys->p_dsbuffer, p_write_position, l_bytes1, p_wrap_around, l_bytes2 ); + p_notif->i_write_slot = (i_frame + 1) % FRAMES_NUM; return VLC_SUCCESS; } /***************************************************************************** - * DirectSoundThread: this thread will capture play notification events. + * DirectSoundThread: this thread will capture play notification events. ***************************************************************************** * We use this thread to emulate a callback mechanism. The thread probes for * event notification and fills up the DS secondary buffer when needed. *****************************************************************************/ -static void DirectSoundThread( notification_thread_t *p_notif ) +static void* DirectSoundThread( vlc_object_t *p_this ) { - HANDLE notification_events[FRAMES_NUM]; - HRESULT dsresult; + notification_thread_t *p_notif = (notification_thread_t*)p_this; aout_instance_t *p_aout = p_notif->p_aout; - int i, i_which_frame, i_last_frame, i_next_frame; - mtime_t mtime; - vlc_bool_t b_sleek; - - for( i = 0; i < FRAMES_NUM; i++ ) - notification_events[i] = p_notif->p_events[i].hEventNotify; + mtime_t last_time; + int canc = vlc_savecancel (); /* We don't want any resampling when using S/PDIF output */ - b_sleek = p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i'); - - /* Tell the main thread that we are ready */ - vlc_thread_ready( p_notif ); + bool b_sleek = (p_aout->output.output.i_format == VLC_CODEC_SPDIFL); msg_Dbg( p_notif, "DirectSoundThread ready" ); /* Wait here until Play() is called */ - WaitForSingleObject( notification_events[0], INFINITE ); + WaitForSingleObject( p_notif->event, INFINITE ); - if( !p_notif->b_die ) + if( vlc_object_alive (p_notif) ) { + HRESULT dsresult; mwait( p_notif->start_date - AOUT_PTS_TOLERANCE / 2 ); /* start playing the buffer */ @@ -958,178 +1053,157 @@ static void DirectSoundThread( notification_thread_t *p_notif ) msg_Err( p_aout, "cannot start playing buffer" ); } } + last_time = mdate(); - while( !p_notif->b_die ) + while( vlc_object_alive (p_notif) ) { - aout_buffer_t *p_buffer; - long l_latency; - - /* wait for the position notification */ - i_which_frame = WaitForMultipleObjects( FRAMES_NUM, - notification_events, 0, - INFINITE ) - WAIT_OBJECT_0; - - if( p_notif->b_die ) - break; - - mtime = mdate(); - - /* We take into account the current latency */ - if SUCCEEDED( IDirectSoundBuffer_GetCurrentPosition( - p_aout->output.p_sys->p_dsbuffer, - &l_latency, NULL ) ) + DWORD l_read; + int l_queued = 0, l_free_slots; + unsigned i_frame_siz = p_aout->output.i_nb_samples; + mtime_t mtime = mdate(); + int i; + + /* + * Fill in as much audio data as we can in our circular buffer + */ + + /* Find out current play position */ + if FAILED( IDirectSoundBuffer_GetCurrentPosition( + p_aout->output.p_sys->p_dsbuffer, &l_read, NULL ) ) { - if( l_latency > (i_which_frame * FRAME_SIZE) - && l_latency < ((i_which_frame+1) * FRAME_SIZE) ) - { - l_latency = - ( l_latency / - p_aout->output.output.i_bytes_per_frame % - FRAME_SIZE ); - } - else - { - l_latency = FRAME_SIZE - ( l_latency / - p_aout->output.output.i_bytes_per_frame % - FRAME_SIZE ); - } + msg_Err( p_aout, "GetCurrentPosition() failed!" ); + l_read = 0; } - else + + /* Detect underruns */ + if( l_queued && mtime - last_time > + INT64_C(1000000) * l_queued / p_aout->output.output.i_rate ) { - l_latency = 0; + msg_Dbg( p_aout, "detected underrun!" ); } - - /* Mark last frame as empty */ - i_last_frame = (i_which_frame + FRAMES_NUM -1) % FRAMES_NUM; - i_next_frame = (i_which_frame + 1) % FRAMES_NUM; - p_notif->i_frame_status[i_last_frame] = FRAME_EMPTY; + last_time = mtime; /* Try to fill in as many frame buffers as possible */ - for( i = i_next_frame; (i % FRAMES_NUM) != i_which_frame; i++ ) - { + l_read /= (p_aout->output.output.i_bytes_per_frame / + p_aout->output.output.i_frame_length); + l_queued = p_notif->i_write_slot * i_frame_siz - l_read; + if( l_queued < 0 ) l_queued += (i_frame_siz * FRAMES_NUM); + l_free_slots = (FRAMES_NUM * i_frame_siz - l_queued) / i_frame_siz; - /* Check if frame buf is already filled */ - if( p_notif->i_frame_status[i % FRAMES_NUM] == FRAME_QUEUED ) - continue; - - p_buffer = aout_OutputNextBuffer( p_aout, - mtime + 1000000 / p_aout->output.output.i_rate * - ((i - i_next_frame + 1) * FRAME_SIZE + l_latency), b_sleek ); + for( i = 0; i < l_free_slots; i++ ) + { + aout_buffer_t *p_buffer = aout_OutputNextBuffer( p_aout, + mtime + INT64_C(1000000) * (i * i_frame_siz + l_queued) / + p_aout->output.output.i_rate, b_sleek ); /* If there is no audio data available and we have some buffered * already, then just wait for the next time */ - if( !p_buffer && (i != i_next_frame) ) - { - //msg_Err( p_aout, "only %i frame buffers filled!", - // i - i_next_frame ); - break; - } + if( !p_buffer && (i || l_queued / i_frame_siz) ) break; - if( FillBuffer( p_aout, (i%FRAMES_NUM), p_buffer ) - != VLC_SUCCESS ) - break; - - /* Mark the frame buffer as QUEUED */ - p_notif->i_frame_status[i%FRAMES_NUM] = FRAME_QUEUED; + if( FillBuffer( p_aout, p_notif->i_write_slot % FRAMES_NUM, + p_buffer ) != VLC_SUCCESS ) break; } + /* Sleep a reasonable amount of time */ + l_queued += (i * i_frame_siz); + msleep( INT64_C(1000000) * l_queued / p_aout->output.output.i_rate / 2 ); } /* make sure the buffer isn't playing */ IDirectSoundBuffer_Stop( p_aout->output.p_sys->p_dsbuffer ); - /* free the events */ - for( i = 0; i < FRAMES_NUM; i++ ) - CloseHandle( notification_events[i] ); + /* free the event */ + CloseHandle( p_notif->event ); + vlc_restorecancel (canc); msg_Dbg( p_notif, "DirectSoundThread exiting" ); + return NULL; } /***************************************************************************** - * CheckReordering: Check if we need to do some channel re-ordering (the ac3 - * channel order is different from the one chosen by - * Microsoft). + * CallBackConfigNBEnum: callback to get the number of available devices *****************************************************************************/ -static void CheckReordering( aout_instance_t *p_aout, int i_nb_channels ) +static int CALLBACK CallBackConfigNBEnum( LPGUID p_guid, LPCWSTR psz_desc, + LPCWSTR psz_mod, LPVOID p_nb ) { - int i, j, k, l; + VLC_UNUSED( psz_mod ); VLC_UNUSED( psz_desc ); VLC_UNUSED( p_guid ); -#define i_channel_mask p_aout->output.p_sys->i_channel_mask -#define pi_chan_table p_aout->output.p_sys->pi_chan_table + int * a = (int *)p_nb; + (*a)++; + return true; +} - p_aout->output.p_sys->b_chan_reorder = VLC_FALSE; +/***************************************************************************** + * CallBackConfigEnum: callback to add available devices to the preferences list + *****************************************************************************/ +static int CALLBACK CallBackConfigEnum( LPGUID p_guid, LPCWSTR psz_desc, + LPCWSTR psz_mod, LPVOID _p_item ) +{ + VLC_UNUSED( psz_mod ); VLC_UNUSED( p_guid ); - pi_chan_table = malloc( i_nb_channels * sizeof(int) ); - if( !pi_chan_table ) - { - return; - } + module_config_t *p_item = (module_config_t *) _p_item; - for( i = 0, j = 0; - i < (int)(sizeof(pi_channels_out)/sizeof(uint32_t)); i++ ) - { - if( i_channel_mask & pi_channels_out[i] ) - { - for( k = 0, l = 0; - pi_channels_out[i] != pi_channels_ordered[k]; k++ ) - { - if( i_channel_mask & pi_channels_ordered[k] ) - { - l++; - } - } + p_item->ppsz_list[p_item->i_list] = FromWide( psz_desc ); + p_item->ppsz_list_text[p_item->i_list] = FromWide( psz_desc ); + p_item->i_list++; + return true; +} - pi_chan_table[j] = l; +/***************************************************************************** + * ReloadDirectXDevices: store the list of devices in preferences + *****************************************************************************/ +static int ReloadDirectXDevices( vlc_object_t *p_this, char const *psz_name, + vlc_value_t newval, vlc_value_t oldval, void *data ) +{ + VLC_UNUSED( newval ); VLC_UNUSED( oldval ); VLC_UNUSED( data ); - j++; - } - } + module_config_t *p_item = config_FindConfig( p_this, psz_name ); + if( !p_item ) return VLC_SUCCESS; - for( i = 0; i < i_nb_channels; i++ ) + /* Clear-up the current list */ + if( p_item->i_list ) { - if( pi_chan_table[i] != i ) + for( int i = 0; i < p_item->i_list; i++ ) { - p_aout->output.p_sys->b_chan_reorder = VLC_TRUE; + free((char *)(p_item->ppsz_list[i]) ); + free((char *)(p_item->ppsz_list_text[i]) ); } } - if( p_aout->output.p_sys->b_chan_reorder ) + HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID); + + HANDLE hdsound_dll = LoadLibrary("DSOUND.DLL"); + if( hdsound_dll == NULL ) { - msg_Dbg( p_aout, "channel reordering needed" ); + msg_Warn( p_this, "cannot open DSOUND.DLL" ); + return VLC_SUCCESS; } -#undef pi_chan_table -#undef waveformat -} + /* Get DirectSoundEnumerate */ + OurDirectSoundEnumerate = (void *) + GetProcAddress( hdsound_dll, "DirectSoundEnumerateW" ); -/***************************************************************************** - * InterleaveFloat32/S16: change the channel order to the Microsoft one. - *****************************************************************************/ -static void InterleaveFloat32( float *p_buf, float *p_buf_out, - int *pi_chan_table, int i_nb_channels ) -{ - int i, j; + if( OurDirectSoundEnumerate == NULL ) + goto error; - for( i = 0; i < FRAME_SIZE; i++ ) - { - for( j = 0; j < i_nb_channels; j++ ) - { - p_buf_out[i*i_nb_channels + pi_chan_table[j]] = - p_buf[i*i_nb_channels + j]; - } - } -} + int nb_devices = 0; + OurDirectSoundEnumerate(CallBackConfigNBEnum, &nb_devices); + msg_Dbg(p_this,"found %d devices", nb_devices); -static void InterleaveS16( int16_t *p_buf, int16_t *p_buf_out, - int *pi_chan_table, int i_nb_channels ) -{ - int i, j; + p_item->ppsz_list = xrealloc( p_item->ppsz_list, + nb_devices * sizeof(char *) ); + p_item->ppsz_list_text = xrealloc( p_item->ppsz_list_text, + nb_devices * sizeof(char *) ); - for( i = 0; i < FRAME_SIZE; i++ ) - { - for( j = 0; j < i_nb_channels; j++ ) - { - p_buf_out[ i*i_nb_channels + pi_chan_table[j]] = - p_buf[i*i_nb_channels + j]; - } - } + p_item->i_list = 0; + OurDirectSoundEnumerate(CallBackConfigEnum, p_item); + + /* Signal change to the interface */ + p_item->b_dirty = true; + +error: + FreeLibrary(hdsound_dll); + + return VLC_SUCCESS; } +