X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fdirectx.c;h=a2dc089b8a69cec2e828e3636fdc8a86ccfe963b;hb=069e8d419fb72defaf956f238ae475087ced2087;hp=f025028bc0a48b1d64e523ccebd5874a2478d6c3;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index f025028bc0..a2dc089b8a 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -30,7 +30,8 @@ # include "config.h" #endif -#include +#include +#include #include #include @@ -84,6 +85,9 @@ # define SPEAKER_RESERVED 0x80000000 #endif +#ifndef DSSPEAKER_DSSPEAKER_DIRECTOUT +# define DSSPEAKER_DSSPEAKER_DIRECTOUT 0x00000000 +#endif #ifndef DSSPEAKER_HEADPHONE # define DSSPEAKER_HEADPHONE 0x00000001 #endif @@ -102,6 +106,15 @@ #ifndef DSSPEAKER_5POINT1 # define DSSPEAKER_5POINT1 0x00000006 #endif +#ifndef DSSPEAKER_7POINT1 +# define DSSPEAKER_7POINT1 0x00000007 +#endif +#ifndef DSSPEAKER_7POINT1_SURROUND +# define DSSPEAKER_7POINT1_SURROUND 0x00000008 +#endif +#ifndef DSSPEAKER_7POINT1_WIDE +# define DSSPEAKER_7POINT1_WIDE DSSPEAKER_7POINT1 +#endif #ifndef _WAVEFORMATEXTENSIBLE_ typedef struct { @@ -161,7 +174,7 @@ struct aout_sys_t int i_frame_size; /* Size in bytes of one frame */ - vlc_bool_t b_chan_reorder; /* do we need channel reordering */ + 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; @@ -171,17 +184,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 }; /***************************************************************************** @@ -194,10 +208,10 @@ 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 *, int*, 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 * ); /***************************************************************************** @@ -212,19 +226,19 @@ static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * ); "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( _("DirectX audio output") ); - set_shortname( "DirectX" ); - set_capability( "audio output", 100 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_shortcut( "directx" ); +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, VLC_TRUE ); + DEVICE_LONGTEXT, true ) add_bool( "directx-audio-float32", 0, 0, FLOAT_TEXT, - FLOAT_LONGTEXT, VLC_TRUE ); - set_callbacks( OpenAudio, CloseAudio ); -vlc_module_end(); + FLOAT_LONGTEXT, true ) + set_callbacks( OpenAudio, CloseAudio ) +vlc_module_end () /***************************************************************************** * OpenAudio: open the audio device @@ -241,10 +255,7 @@ static int OpenAudio( vlc_object_t *p_this ) /* 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_ENOMEM; - } /* Initialize some variables */ p_aout->output.p_sys->p_dsobject = NULL; @@ -298,7 +309,7 @@ static int OpenAudio( vlc_object_t *p_this ) 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" ); @@ -317,6 +328,14 @@ 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 @@ -342,7 +361,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" ); @@ -370,11 +389,11 @@ 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, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_HIGHEST ) ) { msg_Err( p_aout, "cannot create DirectSoundThread" ); CloseHandle( p_aout->output.p_sys->p_notif->event ); - vlc_object_destroy( p_aout->output.p_sys->p_notif ); + vlc_object_release( p_aout->output.p_sys->p_notif ); p_aout->output.p_sys->p_notif = NULL; goto error; } @@ -397,6 +416,7 @@ static void Probe( aout_instance_t * p_aout ) int 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"); @@ -409,17 +429,40 @@ 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 = "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 = "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 | @@ -427,13 +470,18 @@ 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, 5, - p_aout->output.output.i_rate, VLC_TRUE ) + p_aout->output.output.i_rate, true ) == VLC_SUCCESS ) { val.i_int = AOUT_VAR_3F2R; text.psz_string = N_("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" ); } } @@ -445,13 +493,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"); 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" ); } } @@ -459,20 +512,25 @@ 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"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); - var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + 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!)" ); + } 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; @@ -487,13 +545,20 @@ 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 @@ -503,8 +568,11 @@ static void Probe( aout_instance_t * p_aout ) 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; } @@ -517,7 +585,7 @@ static void Probe( aout_instance_t * p_aout ) 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" ); @@ -540,7 +608,7 @@ static void Probe( aout_instance_t * p_aout ) var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_aout, "intf-change", val ); } @@ -594,7 +662,7 @@ static void CloseAudio( vlc_object_t *p_this ) if( !p_sys->b_playing ) SetEvent( p_sys->p_notif->event ); vlc_thread_join( p_sys->p_notif ); - vlc_object_destroy( p_sys->p_notif ); + vlc_object_release( p_sys->p_notif ); } /* release the secondary buffer */ @@ -722,7 +790,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; @@ -854,7 +922,7 @@ static int CreateDSBuffer( aout_instance_t *p_aout, int i_format, ****************************************************************************/ static int CreateDSBufferPCM( aout_instance_t *p_aout, int *i_format, int i_channels, int i_nb_channels, int i_rate, - vlc_bool_t b_probe ) + bool b_probe ) { vlc_value_t val; @@ -960,8 +1028,7 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, p_sys->i_bits_per_sample ); } - p_aout->p_libvlc->pf_memcpy( p_write_position, p_buffer->p_buffer, - l_bytes1 ); + vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 ); aout_BufferFree( p_buffer ); } @@ -979,26 +1046,25 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, * 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 ) { + notification_thread_t *p_notif = (notification_thread_t*)p_this; aout_instance_t *p_aout = p_notif->p_aout; - vlc_bool_t b_sleek; + 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 ); - msg_Dbg( p_notif, "DirectSoundThread ready" ); /* Wait here until Play() is called */ WaitForSingleObject( p_notif->event, INFINITE ); - if( !p_notif->b_die ) + if( vlc_object_alive (p_notif) ) { mwait( p_notif->start_date - AOUT_PTS_TOLERANCE / 2 ); @@ -1023,7 +1089,7 @@ static void DirectSoundThread( notification_thread_t *p_notif ) } last_time = mdate(); - while( !p_notif->b_die ) + while( vlc_object_alive (p_notif) ) { long l_read, l_free_slots; mtime_t mtime = mdate(); @@ -1043,7 +1109,7 @@ static void DirectSoundThread( notification_thread_t *p_notif ) /* Detect underruns */ if( l_queued && mtime - last_time > - I64C(1000000) * l_queued / p_aout->output.output.i_rate ) + INT64_C(1000000) * l_queued / p_aout->output.output.i_rate ) { msg_Dbg( p_aout, "detected underrun!" ); } @@ -1058,7 +1124,7 @@ static void DirectSoundThread( notification_thread_t *p_notif ) for( i = 0; i < l_free_slots; i++ ) { aout_buffer_t *p_buffer = aout_OutputNextBuffer( p_aout, - mtime + I64C(1000000) * (i * FRAME_SIZE + l_queued) / + mtime + INT64_C(1000000) * (i * FRAME_SIZE + l_queued) / p_aout->output.output.i_rate, b_sleek ); /* If there is no audio data available and we have some buffered @@ -1071,7 +1137,7 @@ static void DirectSoundThread( notification_thread_t *p_notif ) /* Sleep a reasonable amount of time */ l_queued += (i * FRAME_SIZE); - msleep( I64C(1000000) * l_queued / p_aout->output.output.i_rate / 2 ); + msleep( INT64_C(1000000) * l_queued / p_aout->output.output.i_rate / 2 ); } /* make sure the buffer isn't playing */ @@ -1080,5 +1146,7 @@ static void DirectSoundThread( notification_thread_t *p_notif ) /* free the event */ CloseHandle( p_notif->event ); + vlc_restorecancel (canc); msg_Dbg( p_notif, "DirectSoundThread exiting" ); + return NULL; }