X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fdirectx.c;h=118722e779f467693f96dafc294a0361311a5843;hb=9ae49e3bb196a59f827e704c4b6eedf22faf007d;hp=ff4f312d2252e7c74f8e5981580d1771049fddd3;hpb=a48fa0327705ef15ba4356f48f375eee0fb3dca9;p=vlc diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index ff4f312d22..118722e779 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -1,7 +1,7 @@ /***************************************************************************** * directx.c: Windows DirectX audio output method ***************************************************************************** - * Copyright (C) 2001 the VideoLAN team + * Copyright (C) 2001-2009 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -25,7 +25,6 @@ * Preamble *****************************************************************************/ - #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -33,6 +32,7 @@ #include #include #include +#include #include #include @@ -130,6 +130,7 @@ typedef struct { } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif + 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 ); @@ -160,7 +161,7 @@ struct aout_sys_t { HINSTANCE hdsound_dll; /* handle of the opened dsound dll */ - int i_device_id; /* user defined device */ + char * psz_device; /* user defined device name */ LPGUID p_device_guid; LPDIRECTSOUND p_dsobject; /* main Direct Sound object */ @@ -174,6 +175,8 @@ struct aout_sys_t int i_frame_size; /* Size in bytes of one frame */ + 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; @@ -184,17 +187,18 @@ struct aout_sys_t static const uint32_t pi_channels_src[] = { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, - AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; static const uint32_t pi_channels_in[] = { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT, SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT, - SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, + SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, SPEAKER_BACK_CENTER, SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY, 0 }; static const uint32_t pi_channels_out[] = { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT, SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY, SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, + SPEAKER_BACK_CENTER, SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT, 0 }; /***************************************************************************** @@ -208,36 +212,53 @@ static void Play ( aout_instance_t * ); static void Probe ( aout_instance_t * ); static int InitDirectSound ( aout_instance_t * ); static int CreateDSBuffer ( aout_instance_t *, int, int, int, int, int, bool ); -static int CreateDSBufferPCM ( aout_instance_t *, 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( vlc_object_t * ); static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * ); +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 *****************************************************************************/ #define DEVICE_TEXT N_("Output device") -#define DEVICE_LONGTEXT N_( \ - "DirectX device number: 0 default device, 1..N device by number" \ - "(Note that the default device appears as 0 AND another number)." ) +#define DEVICE_LONGTEXT N_("Select your audio output device") #define FLOAT_TEXT N_("Use float32 output") #define FLOAT_LONGTEXT N_( \ "The option allows you to enable or disable the high-quality float32 " \ "audio output mode (which is not well supported by some soundcards)." ) - -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" ); - add_integer( "directx-audio-device", 0, NULL, DEVICE_TEXT, - DEVICE_LONGTEXT, true ); - add_bool( "directx-audio-float32", 0, 0, FLOAT_TEXT, - FLOAT_LONGTEXT, true ); - set_callbacks( OpenAudio, CloseAudio ); -vlc_module_end(); +#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" ) + add_string( "directx-audio-device-name", "default", NULL, + DEVICE_TEXT, DEVICE_LONGTEXT, false ) + change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices ) + change_action_add( ReloadDirectXDevices, N_("Refresh list") ) + 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 @@ -248,6 +269,10 @@ static int OpenAudio( vlc_object_t *p_this ) { aout_instance_t * p_aout = (aout_instance_t *)p_this; vlc_value_t val; + char * psz_speaker; + int i = 0; + + const char * const * ppsz_compare = speaker_list; msg_Dbg( p_aout, "OpenAudio" ); @@ -268,10 +293,27 @@ static int OpenAudio( vlc_object_t *p_this ) /* Retrieve config values */ var_Create( p_aout, "directx-audio-float32", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_aout, "directx-audio-device", - VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Get( p_aout, "directx-audio-device", &val ); - p_aout->output.p_sys->i_device_id = val.i_int; + 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 */ @@ -295,7 +337,7 @@ static int OpenAudio( vlc_object_t *p_this ) /* 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; @@ -304,7 +346,7 @@ 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, @@ -388,7 +430,7 @@ static int OpenAudio( vlc_object_t *p_this ) if( vlc_thread_create( p_aout->output.p_sys->p_notif, "DirectSound Notification Thread", DirectSoundThread, - VLC_THREAD_PRIORITY_HIGHEST, false ) ) + VLC_THREAD_PRIORITY_HIGHEST ) ) { msg_Err( p_aout, "cannot create DirectSoundThread" ); CloseHandle( p_aout->output.p_sys->p_notif->event ); @@ -412,7 +454,7 @@ 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; @@ -432,7 +474,7 @@ static void Probe( aout_instance_t * p_aout ) == VLC_SUCCESS ) { val.i_int = AOUT_VAR_5_1; - text.psz_string = "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 ); @@ -446,21 +488,21 @@ static void Probe( aout_instance_t * p_aout ) 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, + 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 = "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" ); - } - } + == 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 | @@ -473,7 +515,7 @@ static void Probe( aout_instance_t * p_aout ) == VLC_SUCCESS ) { val.i_int = AOUT_VAR_3F2R; - text.psz_string = N_("3 Front 2 Rear"); + text.psz_string = _("3 Front 2 Rear"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); if(!is_default_output_set) @@ -496,7 +538,7 @@ static void Probe( aout_instance_t * p_aout ) == 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) @@ -515,7 +557,7 @@ static void Probe( aout_instance_t * p_aout ) == 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 ); if(!is_default_output_set) { @@ -523,7 +565,7 @@ static void Probe( aout_instance_t * p_aout ) is_default_output_set = true; msg_Dbg( p_aout, "device supports 2 channels (DEFAULT!)" ); } - msg_Dbg( p_aout, "device supports 2 channels" ); + else msg_Dbg( p_aout, "device supports 2 channels" ); } /* Test for mono support */ @@ -533,7 +575,7 @@ static void Probe( aout_instance_t * p_aout ) == 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" ); } @@ -575,12 +617,43 @@ static void Probe( aout_instance_t * p_aout ) 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, @@ -589,7 +662,7 @@ static void Probe( aout_instance_t * p_aout ) { 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" ) ) @@ -606,9 +679,7 @@ static void Probe( aout_instance_t * p_aout ) } var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); - - val.b_bool = true; - var_Set( p_aout, "intf-change", val ); + var_SetBool( p_aout, "intf-change", true ); } /***************************************************************************** @@ -669,7 +740,7 @@ static void CloseAudio( vlc_object_t *p_this ) /* finally release the DirectSound object */ if( p_sys->p_dsobject ) IDirectSound_Release( p_sys->p_dsobject ); - + /* free DSOUND.DLL */ if( p_sys->hdsound_dll ) FreeLibrary( p_sys->hdsound_dll ); @@ -683,18 +754,30 @@ static void CloseAudio( vlc_object_t *p_this ) static int CALLBACK CallBackDirectSoundEnum( LPGUID p_guid, LPCSTR psz_desc, LPCSTR psz_mod, LPVOID _p_aout ) { + VLC_UNUSED( psz_mod ); + aout_instance_t *p_aout = (aout_instance_t *)_p_aout; msg_Dbg( p_aout, "found device: %s", psz_desc ); - if( p_aout->output.p_sys->i_device_id == 0 && p_guid ) + if( p_aout->output.p_sys->psz_device && !strcmp(p_aout->output.p_sys->psz_device, psz_desc) && 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_desc ); } - - p_aout->output.p_sys->i_device_id--; + 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_desc ); + 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_desc ); + } + } return 1; } @@ -728,6 +811,7 @@ static int InitDirectSound( aout_instance_t *p_aout ) "DirectSoundEnumerateA" ); if( OurDirectSoundEnumerate ) { + p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name"); /* Attempt enumeration */ if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum, p_aout ) ) ) @@ -805,7 +889,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, 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; @@ -816,7 +900,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; @@ -824,7 +908,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; @@ -919,23 +1003,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, bool b_probe ) { - vlc_value_t val; - - var_Get( p_aout, "directx-audio-float32", &val ); - /* Float32 audio samples are not supported for 5.1 output on the emu101k */ - - if( !val.b_bool || i_nb_channels > 2 || - CreateDSBuffer( p_aout, VLC_FOURCC('f','l','3','2'), + 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 ) @@ -944,13 +1024,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; } } @@ -980,7 +1060,7 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, 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 */ @@ -1022,7 +1102,7 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, if( p_sys->b_chan_reorder ) { /* Do the channel reordering here */ - aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_nb_bytes, + 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 ); } @@ -1049,16 +1129,11 @@ static void* DirectSoundThread( vlc_object_t *p_this ) { notification_thread_t *p_notif = (notification_thread_t*)p_this; aout_instance_t *p_aout = p_notif->p_aout; - bool b_sleek; mtime_t last_time; - HRESULT dsresult; - long l_queued = 0; + 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" ); @@ -1067,6 +1142,7 @@ static void* DirectSoundThread( vlc_object_t *p_this ) if( vlc_object_alive (p_notif) ) { + HRESULT dsresult; mwait( p_notif->start_date - AOUT_PTS_TOLERANCE / 2 ); /* start playing the buffer */ @@ -1092,7 +1168,9 @@ static void* DirectSoundThread( vlc_object_t *p_this ) while( vlc_object_alive (p_notif) ) { - long l_read, l_free_slots; + 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; @@ -1117,27 +1195,28 @@ static void* DirectSoundThread( vlc_object_t *p_this ) last_time = mtime; /* Try to fill in as many frame buffers as possible */ - l_read /= p_aout->output.output.i_bytes_per_frame; - l_queued = p_notif->i_write_slot * FRAME_SIZE - l_read; - if( l_queued < 0 ) l_queued += (FRAME_SIZE * FRAMES_NUM); - l_free_slots = (FRAMES_NUM * FRAME_SIZE - l_queued) / FRAME_SIZE; + 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; for( i = 0; i < l_free_slots; i++ ) { aout_buffer_t *p_buffer = aout_OutputNextBuffer( p_aout, - mtime + INT64_C(1000000) * (i * FRAME_SIZE + l_queued) / + 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 || l_queued / FRAME_SIZE) ) break; + if( !p_buffer && (i || l_queued / i_frame_siz) ) break; 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 * FRAME_SIZE); + l_queued += (i * i_frame_siz); msleep( INT64_C(1000000) * l_queued / p_aout->output.output.i_rate / 2 ); } @@ -1147,6 +1226,92 @@ static void* DirectSoundThread( vlc_object_t *p_this ) /* free the event */ CloseHandle( p_notif->event ); + vlc_restorecancel (canc); msg_Dbg( p_notif, "DirectSoundThread exiting" ); return NULL; } + +/***************************************************************************** + * CallBackConfigNBEnum: callback to get the number of available devices + *****************************************************************************/ +static int CALLBACK CallBackConfigNBEnum( LPGUID p_guid, LPCSTR psz_desc, + LPCSTR psz_mod, LPVOID p_nb ) +{ + VLC_UNUSED( psz_mod ); + VLC_UNUSED( psz_desc ); + VLC_UNUSED( p_guid ); + int * a = (int *)p_nb; + *a = *a +1; + return 1; +} + +/***************************************************************************** + * CallBackConfigEnum: callback to add available devices to the preferences list + *****************************************************************************/ +static int CALLBACK CallBackConfigEnum( LPGUID p_guid, LPCSTR psz_desc, + LPCSTR psz_mod, LPVOID _p_item ) +{ + VLC_UNUSED( psz_mod ); + VLC_UNUSED( p_guid ); + + module_config_t *p_item = (module_config_t *) _p_item; + + p_item->ppsz_list[p_item->i_list] = FromLocaleDup(psz_desc); + p_item->ppsz_list_text[p_item->i_list] = FromLocaleDup(psz_desc); + p_item->i_list = p_item->i_list +1; + return 1; +} + +/***************************************************************************** + * 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 ); + module_config_t *p_item = config_FindConfig( p_this, psz_name ); + if( !p_item ) return VLC_SUCCESS; + + /* Clear-up the current list */ + if( p_item->i_list ) + { + int i; + for( i = 0; i < p_item->i_list; i++ ) + { + free((char *)(p_item->ppsz_list[i]) ); + free((char *)(p_item->ppsz_list_text[i]) ); + } + } + + HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACK, LPVOID); + + HANDLE hdsound_dll = LoadLibrary("DSOUND.DLL"); + if( hdsound_dll == NULL ) + { + msg_Warn( p_this, "cannot open DSOUND.DLL" ); + } + + /* Get DirectSoundEnumerate */ + OurDirectSoundEnumerate = (void *) + GetProcAddress( hdsound_dll, + "DirectSoundEnumerateA" ); + int nb_devices = 0; + OurDirectSoundEnumerate(CallBackConfigNBEnum, &nb_devices); + msg_Dbg(p_this,"found %d devices", nb_devices); + + 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 *) ); + + p_item->i_list = 0; + OurDirectSoundEnumerate(CallBackConfigEnum, p_item); + + FreeLibrary(hdsound_dll); + + /* Signal change to the interface */ + p_item->b_dirty = true; + + return VLC_SUCCESS; +} +