X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fdirectx.c;h=68cf2f3d16c177c26e826c5108d371de4429237c;hb=74d8fc71b8cb33286dfc7b8e9626d5be6f46bb85;hp=5c901cd0dee14889af9d87a46f9fa607e45e073a;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index 5c901cd0de..68cf2f3d16 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 @@ -24,10 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* strerror() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include #include #include @@ -81,6 +84,9 @@ # define SPEAKER_RESERVED 0x80000000 #endif +#ifndef DSSPEAKER_DSSPEAKER_DIRECTOUT +# define DSSPEAKER_DSSPEAKER_DIRECTOUT 0x00000000 +#endif #ifndef DSSPEAKER_HEADPHONE # define DSSPEAKER_HEADPHONE 0x00000001 #endif @@ -99,6 +105,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 { @@ -158,7 +173,9 @@ 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 */ + 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; @@ -168,17 +185,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 }; /***************************************************************************** @@ -191,12 +209,16 @@ 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 * ); +/* Speaker setup override options list */ +static const char *const speaker_list[] = { "Windows default", "Mono", "Stereo", + "Quad", "5.1", "7.1" }; + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -208,20 +230,27 @@ static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * ); #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( _("DirectX audio output") ); - set_shortname( "DirectX" ); - set_capability( "audio output", 100 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_shortcut( "directx" ); +#define SPEAKER_TEXT N_("Select 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_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 ) + 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 @@ -232,16 +261,17 @@ 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" ); /* 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; @@ -255,10 +285,29 @@ 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->i_device_id = var_CreateGetInteger( p_aout, + "directx-audio-device" ); p_aout->output.p_sys->p_device_guid = 0; /* Initialise DirectSound */ @@ -282,7 +331,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; @@ -291,11 +340,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" ); @@ -314,6 +363,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 @@ -339,7 +396,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" ); @@ -367,11 +424,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; } @@ -391,9 +448,10 @@ 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"); @@ -406,17 +464,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"; + 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 | @@ -424,13 +505,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"); + 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" ); } } @@ -442,13 +528,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" ); } } @@ -456,24 +547,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 ); - var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); - 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" ); } @@ -484,13 +580,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 @@ -500,26 +603,60 @@ 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; + } + + /* 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" ) ) @@ -536,9 +673,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 ); } /***************************************************************************** @@ -591,7 +726,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 */ @@ -599,7 +734,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 ); @@ -613,6 +748,8 @@ 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 ); @@ -659,7 +796,7 @@ static int InitDirectSound( aout_instance_t *p_aout ) if( OurDirectSoundEnumerate ) { /* Attempt enumeration */ - if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum, + if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum, p_aout ) ) ) { msg_Dbg( p_aout, "enumeration of DirectSound devices failed" ); @@ -667,7 +804,7 @@ static int InitDirectSound( aout_instance_t *p_aout ) } /* Create the direct sound object */ - if FAILED( OurDirectSoundCreate( p_aout->output.p_sys->p_device_guid, + if FAILED( OurDirectSoundCreate( p_aout->output.p_sys->p_device_guid, &p_aout->output.p_sys->p_dsobject, NULL ) ) { @@ -719,7 +856,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; @@ -735,7 +872,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; @@ -746,7 +883,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; @@ -754,7 +891,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; @@ -849,23 +986,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 ) { - 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 ) @@ -874,13 +1007,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; } } @@ -910,7 +1043,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 */ @@ -957,8 +1090,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 ); } @@ -971,31 +1103,30 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, } /***************************************************************************** - * 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 ) { + 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 ); + b_sleek = p_aout->output.output.i_format == VLC_CODEC_SPDIFL; 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 ); @@ -1020,7 +1151,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(); @@ -1040,7 +1171,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!" ); } @@ -1055,7 +1186,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 @@ -1068,7 +1199,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 */ @@ -1077,5 +1208,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; }