/*****************************************************************************
* directx.c: Windows DirectX audio output method
*****************************************************************************
- * Copyright (C) 2001-2009 the VideoLAN team
+ * Copyright (C) 2001-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
+#include <math.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_charset.h>
-#include <vlc_atomic.h>
#include "windows_audio_common.h"
-#define FRAME_SIZE ((int)p_aout->format.i_rate/20) /* Size in samples */
-
-/*****************************************************************************
- * notification_thread_t: DirectX event thread
- *****************************************************************************/
-typedef struct notification_thread_t
-{
- audio_output_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;
-
- vlc_thread_t thread;
- vlc_atomic_t abort;
-
-} notification_thread_t;
+#define DS_BUF_SIZE (4*1024*1024)
/*****************************************************************************
* aout_sys_t: directx audio output method descriptor
*****************************************************************************/
struct aout_sys_t
{
- HINSTANCE hdsound_dll; /* handle of the opened dsound dll */
-
- char * psz_device; /* user defined device name */
- LPGUID p_device_guid;
+ HINSTANCE hdsound_dll; /* handle of the opened dsound dll */
- LPDIRECTSOUND p_dsobject; /* main Direct Sound object */
+ 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) */
- notification_thread_t *p_notif; /* DirectSoundThread id */
-
- int b_playing; /* playing status */
-
- int i_frame_size; /* Size in bytes of one frame */
+ LPDIRECTSOUNDNOTIFY p_notify;
+ HANDLE hnotify_evt;
+ struct
+ {
+ float volume;
+ LONG mb;
+ bool mute;
+ } volume;
- int i_speaker_setup; /* Speaker setup override */
+ int i_bytes_per_sample; /* Size in bytes of one frame */
+ int i_rate; /* Sample rate */
- bool b_chan_reorder; /* do we need channel reordering */
- int pi_chan_table[AOUT_CHAN_MAX];
+ uint8_t chans_to_reorder; /* do we need channel reordering */
+ uint8_t chan_table[AOUT_CHAN_MAX];
uint32_t i_channel_mask;
- uint32_t i_bits_per_sample;
- uint32_t i_channels;
+ vlc_fourcc_t format;
+
+ size_t i_write;
};
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static int OpenAudio ( vlc_object_t * );
-static void CloseAudio ( vlc_object_t * );
-static void Play ( audio_output_t * );
+static int Open( vlc_object_t * );
+static void Close( vlc_object_t * );
+static void Stop( audio_output_t * );
+static void Play( audio_output_t *, block_t * );
+static int VolumeSet( audio_output_t *, float );
+static int MuteSet( audio_output_t *, bool );
+static void Flush( audio_output_t *, bool );
+static void Pause( audio_output_t *, bool, mtime_t );
+static int TimeGet( audio_output_t *, mtime_t *);
/* local functions */
-static void Probe ( audio_output_t * );
static int InitDirectSound ( audio_output_t * );
-static int CreateDSBuffer ( audio_output_t *, int, int, int, int, int, bool );
-static int CreateDSBufferPCM ( audio_output_t *, vlc_fourcc_t*, int, int, int, bool );
+static int CreateDSBuffer ( audio_output_t *, int, int, int, int, bool );
+static int CreateDSBufferPCM ( audio_output_t *, vlc_fourcc_t*, int, int, bool );
static void DestroyDSBuffer ( audio_output_t * );
-static void* DirectSoundThread( void * );
-static int FillBuffer ( audio_output_t *, int, aout_buffer_t * );
+static int FillBuffer ( audio_output_t *, block_t * );
-static int ReloadDirectXDevices( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
+static int ReloadDirectXDevices( vlc_object_t *, const char *,
+ char ***, char *** );
/* 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 SPEAKER_LONGTEXT N_("Select speaker configuration you want to use. " \
"This option doesn't upmix! So NO e.g. Stereo -> 5.1 conversion." )
+#define VOLUME_TEXT N_("Audio volume")
+#define VOLUME_LONGTEXT N_("Audio volume in hundredths of decibels (dB).")
+
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_shortcut( "directx", "aout_directx" )
- add_string( "directx-audio-device-name", "default",
+ add_string( "directx-audio-device", 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") )
- add_bool( "directx-audio-float32", false, FLOAT_TEXT,
+ change_string_cb( ReloadDirectXDevices )
+ add_obsolete_string( "directx-audio-device-name")
+ add_bool( "directx-audio-float32", true, FLOAT_TEXT,
FLOAT_LONGTEXT, true )
add_string( "directx-audio-speaker", "Windows default",
SPEAKER_TEXT, SPEAKER_LONGTEXT, true )
- change_string_list( speaker_list, 0, 0 )
+ change_string_list( speaker_list, speaker_list )
+ add_float( "directx-volume", 1.0f,
+ VOLUME_TEXT, VOLUME_LONGTEXT, true )
+ change_integer_range( DSBVOLUME_MIN, DSBVOLUME_MAX )
- set_callbacks( OpenAudio, CloseAudio )
+ set_callbacks( Open, Close )
vlc_module_end ()
/*****************************************************************************
*****************************************************************************
* This function opens and setups Direct Sound.
*****************************************************************************/
-static int OpenAudio( vlc_object_t *p_this )
+static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
{
- audio_output_t * p_aout = (audio_output_t *)p_this;
- vlc_value_t val;
char * psz_speaker;
int i = 0;
msg_Dbg( p_aout, "Opening DirectSound Audio Output" );
- /* Allocate structure */
- p_aout->sys = malloc( sizeof( aout_sys_t ) );
- if( p_aout->sys == NULL )
- return VLC_ENOMEM;
-
- /* Initialize some variables */
- p_aout->sys->p_dsobject = NULL;
- p_aout->sys->p_dsbuffer = NULL;
- p_aout->sys->p_notif = NULL;
- p_aout->sys->b_playing = 0;
-
- p_aout->pf_play = Play;
- p_aout->pf_pause = NULL;
- aout_VolumeSoftInit( p_aout );
-
/* Retrieve config values */
var_Create( p_aout, "directx-audio-float32",
VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
i = 0;
}
free( psz_speaker );
- p_aout->sys->i_speaker_setup = i;
-
- p_aout->sys->p_device_guid = 0;
/* Initialise DirectSound */
if( InitDirectSound( p_aout ) )
goto error;
}
- if( var_Type( p_aout, "audio-device" ) == 0 )
+ if( i == 0 )
{
- Probe( p_aout );
- }
+ DWORD ui_speaker_config;
- if( var_Get( p_aout, "audio-device", &val ) < 0 )
- {
- /* Probe() has failed. */
- goto error;
+ /* Check the speaker configuration to determine which channel config
+ * should be the default */
+ if( FAILED( IDirectSound_GetSpeakerConfig( p_aout->sys->p_dsobject,
+ &ui_speaker_config ) ) )
+ {
+ ui_speaker_config = DSSPEAKER_STEREO;
+ msg_Dbg( p_aout, "GetSpeakerConfig failed" );
+ }
+ fmt->i_physical_channels = AOUT_CHANS_2_0;
+
+ const char *name = "Unknown";
+ switch( DSSPEAKER_CONFIG(ui_speaker_config) )
+ {
+ case DSSPEAKER_7POINT1:
+ case DSSPEAKER_7POINT1_SURROUND:
+ name = "7.1";
+ fmt->i_physical_channels = AOUT_CHANS_7_1;
+ break;
+ case DSSPEAKER_5POINT1:
+ case DSSPEAKER_5POINT1_SURROUND:
+ name = "5.1";
+ fmt->i_physical_channels = AOUT_CHANS_5_1;
+ break;
+ case DSSPEAKER_QUAD:
+ name = "Quad";
+ fmt->i_physical_channels = AOUT_CHANS_4_0;
+ 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:
+ name = "Mono";
+ fmt->i_physical_channels = AOUT_CHAN_CENTER;
+ break;
+#endif
+ case DSSPEAKER_SURROUND: /* XXX: stereo, really? -- Courmisch */
+ name = "Surround";
+ break;
+ case DSSPEAKER_STEREO:
+ name = "Stereo";
+ break;
+ }
+ msg_Dbg( p_aout, "%s speaker config: %s", "Windows", name );
+ }
+ else
+ { /* Overriden speaker configuration */
+ const char *name = "Non-existant";
+ switch( i )
+ {
+ case 1: /* Mono */
+ name = "Mono";
+ fmt->i_physical_channels = AOUT_CHAN_CENTER;
+ break;
+ case 2: /* Stereo */
+ name = "Stereo";
+ fmt->i_physical_channels = AOUT_CHANS_2_0;
+ break;
+ case 3: /* Quad */
+ name = "Quad";
+ fmt->i_physical_channels = AOUT_CHANS_4_0;
+ break;
+ case 4: /* 5.1 */
+ name = "5.1";
+ fmt->i_physical_channels = AOUT_CHANS_5_1;
+ break;
+ case 5: /* 7.1 */
+ name = "7.1";
+ fmt->i_physical_channels = AOUT_CHANS_7_1;
+ break;
+ }
+ msg_Dbg( p_aout, "%s speaker config: %s", "VLC", name );
}
/* Open the device */
- if( val.i_int == AOUT_VAR_SPDIF )
+ if ( AOUT_FMT_SPDIF( fmt )
+ && var_InheritBool( p_aout, "spdif" )
+ && CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL, fmt->i_physical_channels,
+ aout_FormatNbChannels( fmt ), fmt->i_rate, true )
+ == VLC_SUCCESS )
{
- p_aout->format.i_format = VLC_CODEC_SPDIFL;
+ msg_Dbg( p_aout, "using A/52 pass-through over S/PDIF" );
+ fmt->i_format = VLC_CODEC_SPDIFL;
/* Calculate the frame size in bytes */
- p_aout->i_nb_samples = A52_FRAME_NB;
- p_aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
- p_aout->format.i_frame_length = A52_FRAME_NB;
- p_aout->sys->i_frame_size = p_aout->format.i_bytes_per_frame;
-
- if( CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL,
- p_aout->format.i_physical_channels,
- aout_FormatNbChannels( &p_aout->format ),
- p_aout->format.i_rate,
- p_aout->sys->i_frame_size, false )
- != VLC_SUCCESS )
- {
- msg_Err( p_aout, "cannot open directx audio device" );
- free( p_aout->sys );
- return VLC_EGENERIC;
- }
-
- aout_VolumeNoneInit( p_aout );
+ fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE;
+ fmt->i_frame_length = A52_FRAME_NB;
}
else
{
- if( val.i_int == AOUT_VAR_5_1 )
- {
- p_aout->format.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
- | AOUT_CHAN_LFE;
- }
- else if( val.i_int == AOUT_VAR_7_1 )
- {
- p_aout->format.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->format.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->format.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
- }
- else if( val.i_int == AOUT_VAR_MONO )
- {
- p_aout->format.i_physical_channels = AOUT_CHAN_CENTER;
- }
- else
- {
- p_aout->format.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- }
+ aout_FormatPrepare( fmt );
- if( CreateDSBufferPCM( p_aout, &p_aout->format.i_format,
- p_aout->format.i_physical_channels,
- aout_FormatNbChannels( &p_aout->format ),
- p_aout->format.i_rate, false )
+ if( CreateDSBufferPCM( p_aout, &fmt->i_format,
+ fmt->i_physical_channels, fmt->i_rate, false )
!= VLC_SUCCESS )
{
msg_Err( p_aout, "cannot open directx audio device" );
- free( p_aout->sys );
- return VLC_EGENERIC;
+ goto error;
}
-
- /* Calculate the frame size in bytes */
- p_aout->i_nb_samples = FRAME_SIZE;
- aout_FormatPrepare( &p_aout->format );
- aout_VolumeSoftInit( p_aout );
}
+ p_aout->sys->i_write = 0;
- /* Now we need to setup our DirectSound play notification structure */
- p_aout->sys->p_notif = calloc( 1, sizeof( *p_aout->sys->p_notif ) );
- p_aout->sys->p_notif->p_aout = p_aout;
-
- vlc_atomic_set(&p_aout->sys->p_notif->abort, 0);
- p_aout->sys->p_notif->event = CreateEvent( 0, FALSE, FALSE, 0 );
- p_aout->sys->p_notif->i_frame_size = p_aout->sys->i_frame_size;
+ /* Force volume update */
+ VolumeSet( p_aout, p_aout->sys->volume.volume );
+ MuteSet( p_aout, p_aout->sys->volume.mute );
/* then launch the notification thread */
- msg_Dbg( p_aout, "creating DirectSoundThread" );
- if( vlc_clone( &p_aout->sys->p_notif->thread,
- DirectSoundThread, p_aout->sys->p_notif,
- VLC_THREAD_PRIORITY_HIGHEST ) )
- {
- msg_Err( p_aout, "cannot create DirectSoundThread" );
- CloseHandle( p_aout->sys->p_notif->event );
- free( p_aout->sys->p_notif );
- p_aout->sys->p_notif = NULL;
- goto error;
- }
+ p_aout->time_get = TimeGet;
+ p_aout->play = Play;
+ p_aout->pause = Pause;
+ p_aout->flush = Flush;
return VLC_SUCCESS;
error:
- CloseAudio( VLC_OBJECT(p_aout) );
+ Stop( p_aout );
return VLC_EGENERIC;
}
/*****************************************************************************
- * Probe: probe the audio device for available formats and channels
+ * Play: we'll start playing the directsound buffer here because at least here
+ * we know the first buffer has been put in the aout fifo and we also
+ * know its date.
*****************************************************************************/
-static void Probe( audio_output_t * p_aout )
+static void Play( audio_output_t *p_aout, block_t *p_buffer )
{
- vlc_value_t val, text;
- 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");
- var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
-
- /* Test for 5.1 support */
- i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT |
- AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
- if( p_aout->format.i_physical_channels == i_physical_channels )
- {
- if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 6,
- p_aout->format.i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_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->format.i_physical_channels == i_physical_channels )
- {
- if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 8,
- p_aout->format.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->format.i_physical_channels == i_physical_channels )
+ if( FillBuffer( p_aout, p_buffer ) == VLC_SUCCESS )
{
- if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 5,
- p_aout->format.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;
- if( ( p_aout->format.i_physical_channels & i_physical_channels )
- == i_physical_channels )
- {
- if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 4,
- p_aout->format.i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_2F2R;
- 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" );
- }
- }
-
- /* 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->format.i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_STEREO;
- text.psz_string = _("Stereo");
- var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
- if(!is_default_output_set)
+ /* start playing the buffer */
+ HRESULT dsresult = IDirectSoundBuffer_Play( p_aout->sys->p_dsbuffer,
+ 0, 0, DSBPLAY_LOOPING );
+ if( dsresult == DSERR_BUFFERLOST )
{
- 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!)" );
+ IDirectSoundBuffer_Restore( p_aout->sys->p_dsbuffer );
+ dsresult = IDirectSoundBuffer_Play( p_aout->sys->p_dsbuffer,
+ 0, 0, DSBPLAY_LOOPING );
}
- 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->format.i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_MONO;
- text.psz_string = _("Mono");
- var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
- msg_Dbg( p_aout, "device supports 1 channel" );
+ if( dsresult != DS_OK )
+ msg_Err( p_aout, "cannot start playing buffer" );
}
+}
- /* Check the speaker configuration to determine which channel config should
- * be the default */
- if FAILED( IDirectSound_GetSpeakerConfig( p_aout->sys->p_dsobject,
- &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;
- }
+static int VolumeSet( audio_output_t *p_aout, float volume )
+{
+ aout_sys_t *sys = p_aout->sys;
+ int ret = 0;
- /* Check if we want to override speaker config */
- switch( p_aout->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;
- }
+ /* Convert UI volume to linear factor (cube) */
+ float vol = volume * volume * volume;
- var_Set( p_aout, "audio-device", val );
+ /* millibels from linear amplification */
+ LONG mb = lroundf(2000.f * log10f(vol));
- /* Test for SPDIF support */
- if ( AOUT_FMT_NON_LINEAR( &p_aout->format ) )
+ /* Clamp to allowed DirectSound range */
+ static_assert( DSBVOLUME_MIN < DSBVOLUME_MAX, "DSBVOLUME_* confused" );
+ if( mb > DSBVOLUME_MAX )
{
- if( CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL,
- p_aout->format.i_physical_channels,
- aout_FormatNbChannels( &p_aout->format ),
- p_aout->format.i_rate,
- 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 = _("A/52 over S/PDIF");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- if( var_InheritBool( p_aout, "spdif" ) )
- var_Set( p_aout, "audio-device", val );
- }
+ mb = DSBVOLUME_MAX;
+ ret = -1;
}
+ if( mb <= DSBVOLUME_MIN )
+ mb = DSBVOLUME_MIN;
- var_Change( p_aout, "audio-device", VLC_VAR_CHOICESCOUNT, &val, NULL );
- if( val.i_int <= 0 )
- {
- /* Probe() has failed. */
- var_Destroy( p_aout, "audio-device" );
- return;
- }
+ sys->volume.mb = mb;
+ sys->volume.volume = volume;
+ if( !sys->volume.mute && sys->p_dsbuffer &&
+ IDirectSoundBuffer_SetVolume( sys->p_dsbuffer, mb ) != DS_OK )
+ return -1;
+ /* Convert back to UI volume */
+ aout_VolumeReport( p_aout, volume );
- var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
- var_TriggerCallback( p_aout, "intf-change" );
+ if( var_InheritBool( p_aout, "volume-save" ) )
+ config_PutFloat( p_aout, "directx-volume", volume );
+ return ret;
}
-/*****************************************************************************
- * Play: we'll start playing the directsound buffer here because at least here
- * we know the first buffer has been put in the aout fifo and we also
- * know its date.
- *****************************************************************************/
-static void Play( audio_output_t *p_aout )
+static int MuteSet( audio_output_t *p_aout, bool mute )
{
- if( !p_aout->sys->b_playing )
- {
- aout_buffer_t *p_buffer;
+ HRESULT res = DS_OK;
+ aout_sys_t *sys = p_aout->sys;
- p_aout->sys->b_playing = 1;
+ sys->volume.mute = mute;
- /* get the playing date of the first aout buffer */
- p_aout->sys->p_notif->start_date =
- aout_FifoFirstDate( &p_aout->fifo );
-
- /* fill in the first samples */
- for( int i = 0; i < FRAMES_NUM; i++ )
- {
- p_buffer = aout_FifoPop( &p_aout->fifo );
- if( !p_buffer ) break;
- FillBuffer( p_aout, i, p_buffer );
- }
+ if( sys->p_dsbuffer )
+ res = IDirectSoundBuffer_SetVolume( sys->p_dsbuffer,
+ mute? DSBVOLUME_MIN : sys->volume.mb );
- /* wake up the audio output thread */
- SetEvent( p_aout->sys->p_notif->event );
- }
+ aout_MuteReport( p_aout, mute );
+ return (res != DS_OK);
}
/*****************************************************************************
* CloseAudio: close the audio device
*****************************************************************************/
-static void CloseAudio( vlc_object_t *p_this )
+static void Stop( audio_output_t *p_aout )
{
- audio_output_t * p_aout = (audio_output_t *)p_this;
aout_sys_t *p_sys = p_aout->sys;
-
msg_Dbg( p_aout, "closing audio device" );
- /* kill the position notification thread, if any */
- if( p_sys->p_notif )
- {
- vlc_atomic_set(&p_aout->sys->p_notif->abort, 1);
- /* wake up the audio thread if needed */
- if( !p_sys->b_playing ) SetEvent( p_sys->p_notif->event );
-
- vlc_join( p_sys->p_notif->thread, NULL );
- free( p_sys->p_notif );
- }
+ if( p_sys->p_notify )
+ IDirectSoundNotify_Release(p_sys->p_notify );
+ p_sys->p_notify = NULL;
+ IDirectSoundBuffer_Stop( p_sys->p_dsbuffer );
/* release the secondary buffer */
DestroyDSBuffer( p_aout );
/* 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 );
-
- free( p_aout->sys->p_device_guid );
- free( p_sys );
-}
-
-/*****************************************************************************
- * 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 );
-
- audio_output_t *p_aout = (audio_output_t *)_p_aout;
-
- char *psz_device = FromWide( psz_desc );
- msg_Dbg( p_aout, "found device: %s", psz_device );
-
- if( p_aout->sys->psz_device &&
- !strcmp(p_aout->sys->psz_device, psz_device) && p_guid )
- {
- /* Use the device corresponding to psz_device */
- p_aout->sys->p_device_guid = malloc( sizeof( GUID ) );
- *p_aout->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->sys->psz_device && p_guid )
- {
- p_aout->sys->psz_device = strdup( psz_device );
- p_aout->sys->p_device_guid = malloc( sizeof( GUID ) );
- *p_aout->sys->p_device_guid = *p_guid;
- msg_Dbg( p_aout, "using device: %s", psz_device );
- }
- }
-
- free( psz_device );
- return true;
+ if( p_sys->p_dsobject )
+ IDirectSound_Release( p_sys->p_dsobject );
}
/*****************************************************************************
*****************************************************************************/
static int InitDirectSound( audio_output_t *p_aout )
{
+ aout_sys_t *sys = p_aout->sys;
+ GUID guid, *p_guid = NULL;
HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
- HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID);
-
- p_aout->sys->hdsound_dll = LoadLibrary("DSOUND.DLL");
- if( p_aout->sys->hdsound_dll == NULL )
- {
- msg_Warn( p_aout, "cannot open DSOUND.DLL" );
- goto error;
- }
OurDirectSoundCreate = (void *)
GetProcAddress( p_aout->sys->hdsound_dll,
goto error;
}
- /* Get DirectSoundEnumerate */
- OurDirectSoundEnumerate = (void *)
- GetProcAddress( p_aout->sys->hdsound_dll,
- "DirectSoundEnumerateW" );
- if( OurDirectSoundEnumerate )
+ char *dev = var_GetNonEmptyString( p_aout, "directx-audio-device" );
+ if( dev != NULL )
{
- p_aout->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" );
- }
+ LPOLESTR lpsz = ToWide( dev );
+ free( dev );
+
+ if( SUCCEEDED( IIDFromString( lpsz, &guid ) ) )
+ p_guid = &guid;
+ else
+ msg_Err( p_aout, "bad device GUID: %ls", lpsz );
+ free( lpsz );
}
/* Create the direct sound object */
- if FAILED( OurDirectSoundCreate( p_aout->sys->p_device_guid,
- &p_aout->sys->p_dsobject,
- NULL ) )
+ if FAILED( OurDirectSoundCreate( p_guid, &sys->p_dsobject, NULL ) )
{
msg_Warn( p_aout, "cannot create a direct sound device" );
goto error;
* sound without any video, and so what window handle should we use ???
* The hack for now is to use the Desktop window handle - it seems to be
* working */
+#if !VLC_WINSTORE_APP
if( IDirectSound_SetCooperativeLevel( p_aout->sys->p_dsobject,
GetDesktopWindow(),
DSSCL_EXCLUSIVE) )
{
msg_Warn( p_aout, "cannot set direct sound cooperative level" );
}
-
+#endif
return VLC_SUCCESS;
error:
- p_aout->sys->p_dsobject = NULL;
- if( p_aout->sys->hdsound_dll )
- {
- FreeLibrary( p_aout->sys->hdsound_dll );
- p_aout->sys->hdsound_dll = NULL;
- }
+ sys->p_dsobject = NULL;
return VLC_EGENERIC;
}
*****************************************************************************/
static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
int i_channels, int i_nb_channels, int i_rate,
- int i_bytes_per_frame, bool b_probe )
+ bool b_probe )
{
WAVEFORMATEXTENSIBLE waveformat;
DSBUFFERDESC dsbdesc;
- unsigned int i;
/* First set the sound buffer format */
waveformat.dwChannelMask = 0;
- for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
- {
- if( i_channels & pi_channels_src[i] )
+ for( unsigned i = 0; pi_vlc_chan_order_wg4[i]; i++ )
+ if( i_channels & pi_vlc_chan_order_wg4[i] )
waveformat.dwChannelMask |= pi_channels_in[i];
- }
switch( i_format )
{
waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
break;
- case VLC_CODEC_S16L:
+ case VLC_CODEC_S16N:
waveformat.Format.wBitsPerSample = 16;
waveformat.Samples.wValidBitsPerSample =
waveformat.Format.wBitsPerSample;
waveformat.Format.nAvgBytesPerSec =
waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign;
- p_aout->sys->i_bits_per_sample = waveformat.Format.wBitsPerSample;
- p_aout->sys->i_channels = i_nb_channels;
+ p_aout->sys->i_bytes_per_sample = waveformat.Format.nBlockAlign;
+ p_aout->sys->format = i_format;
/* 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 */
+ dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 /* Better position accuracy */
+ | DSBCAPS_GLOBALFOCUS /* Allows background playing */
+ | DSBCAPS_CTRLVOLUME /* Allows volume control */
+ | DSBCAPS_CTRLPOSITIONNOTIFY; /* Allow position notifications */
/* Only use the new WAVE_FORMAT_EXTENSIBLE format for multichannel audio */
if( i_nb_channels <= 2 )
dsbdesc.dwFlags |= DSBCAPS_LOCHARDWARE;
}
- dsbdesc.dwBufferBytes = FRAMES_NUM * i_bytes_per_frame; /* buffer size */
+ dsbdesc.dwBufferBytes = DS_BUF_SIZE; /* buffer size */
dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&waveformat;
if FAILED( IDirectSound_CreateSoundBuffer(
return VLC_SUCCESS;
}
- p_aout->sys->i_frame_size = i_bytes_per_frame;
+ p_aout->sys->i_rate = i_rate;
p_aout->sys->i_channel_mask = waveformat.dwChannelMask;
- p_aout->sys->b_chan_reorder =
+ p_aout->sys->chans_to_reorder =
aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
- waveformat.dwChannelMask, i_nb_channels,
- p_aout->sys->pi_chan_table );
-
- if( p_aout->sys->b_chan_reorder )
+ waveformat.dwChannelMask,
+ p_aout->sys->chan_table );
+ if( p_aout->sys->chans_to_reorder )
{
msg_Dbg( p_aout, "channel reordering needed" );
}
+ if( IDirectSoundBuffer_QueryInterface( p_aout->sys->p_dsbuffer,
+ &IID_IDirectSoundNotify,
+ (void **) &p_aout->sys->p_notify )
+ != DS_OK )
+ {
+
+ msg_Err(p_aout, "Couldn't query IDirectSoundNotify");
+ p_aout->sys->p_notify = NULL;
+ }
+
+ FillBuffer(p_aout,NULL);
+
return VLC_SUCCESS;
}
* the hardware, otherwise we create a WAVE_FORMAT_PCM buffer.
****************************************************************************/
static int CreateDSBufferPCM( audio_output_t *p_aout, vlc_fourcc_t *i_format,
- int i_channels, int i_nb_channels, int i_rate,
- bool b_probe )
+ int i_channels, int i_rate, bool b_probe )
{
- /* Float32 audio samples are not supported for 5.1 output on the emu101k */
+ unsigned i_nb_channels = popcount( i_channels );
+
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 )
+ i_channels, i_nb_channels, i_rate, b_probe )
!= VLC_SUCCESS )
{
- if ( CreateDSBuffer( p_aout, VLC_CODEC_S16L,
- i_channels, i_nb_channels, i_rate,
- FRAME_SIZE * 2 * i_nb_channels, b_probe )
+ if ( CreateDSBuffer( p_aout, VLC_CODEC_S16N,
+ i_channels, i_nb_channels, i_rate, b_probe )
!= VLC_SUCCESS )
{
return VLC_EGENERIC;
}
else
{
- *i_format = VLC_CODEC_S16L;
+ *i_format = VLC_CODEC_S16N;
return VLC_SUCCESS;
}
}
*****************************************************************************
* Returns VLC_SUCCESS on success.
*****************************************************************************/
-static int FillBuffer( audio_output_t *p_aout, int i_frame,
- aout_buffer_t *p_buffer )
+static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer )
{
- notification_thread_t *p_notif = p_aout->sys->p_notif;
aout_sys_t *p_sys = p_aout->sys;
+
+ size_t towrite = (p_buffer)?p_buffer->i_buffer:DS_BUF_SIZE;
void *p_write_position, *p_wrap_around;
unsigned long l_bytes1, l_bytes2;
HRESULT dsresult;
/* Before copying anything, we have to lock the buffer */
dsresult = IDirectSoundBuffer_Lock(
- 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 address (if wrap around) */
- &l_bytes2, /* Count of bytes after wrap around */
- 0 ); /* Flags */
+ p_sys->p_dsbuffer, /* DS buffer */
+ p_aout->sys->i_write, /* Start offset */
+ towrite, /* Number of bytes */
+ &p_write_position, /* Address of lock start */
+ &l_bytes1, /* Count of bytes locked before wrap around */
+ &p_wrap_around, /* Buffer address (if wrap around) */
+ &l_bytes2, /* Count of bytes after wrap around */
+ 0 ); /* Flags: DSBLOCK_FROMWRITECURSOR is buggy */
if( dsresult == DSERR_BUFFERLOST )
{
IDirectSoundBuffer_Restore( p_sys->p_dsbuffer );
dsresult = IDirectSoundBuffer_Lock(
p_sys->p_dsbuffer,
- i_frame * p_notif->i_frame_size,
- p_notif->i_frame_size,
+ p_aout->sys->i_write,
+ towrite,
&p_write_position,
&l_bytes1,
&p_wrap_around,
if( dsresult != DS_OK )
{
msg_Warn( p_aout, "cannot lock buffer" );
- if( p_buffer ) aout_BufferFree( p_buffer );
+ if( p_buffer ) block_Release( p_buffer );
return VLC_EGENERIC;
}
}
else
{
- if( p_sys->b_chan_reorder )
- {
+ if( p_sys->chans_to_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 );
- }
+ p_sys->chans_to_reorder, p_sys->chan_table,
+ p_sys->format );
- vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 );
- aout_BufferFree( p_buffer );
+ memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 );
+ if( l_bytes1 < p_buffer->i_buffer)
+ memcpy(p_wrap_around, p_buffer->p_buffer + l_bytes1, l_bytes2);
+ block_Release( p_buffer );
}
/* Now the data has been copied, unlock the buffer */
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;
+ p_sys->i_write += towrite;
+ p_sys->i_write %= DS_BUF_SIZE;
+
return VLC_SUCCESS;
}
-/*****************************************************************************
- * 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( void *data )
+typedef struct
{
- notification_thread_t *p_notif = (notification_thread_t*)data;
- audio_output_t *p_aout = p_notif->p_aout;
- mtime_t last_time;
- int canc = vlc_savecancel ();
+ unsigned count;
+ char **ids;
+ char **names;
+} ds_list_t;
- /* We don't want any resampling when using S/PDIF output */
- bool b_sleek = (p_aout->format.i_format == VLC_CODEC_SPDIFL);
+static int CALLBACK DeviceEnumCallback( LPGUID guid, LPCWSTR desc,
+ LPCWSTR mod, LPVOID data )
+{
+ ds_list_t *list = data;
+ OLECHAR buf[48];
- msg_Dbg( p_aout, "DirectSoundThread ready" );
+ StringFromGUID2( guid, buf, 48 );
- /* Wait here until Play() is called */
- WaitForSingleObject( p_notif->event, INFINITE );
+ list->count++;
+ list->ids = xrealloc( list->ids, list->count * sizeof(char *) );
+ list->names = xrealloc( list->names, list->count * sizeof(char *) );
+ list->ids[list->count - 1] = FromWide( buf );
+ list->names[list->count - 1] = FromWide( desc );
+ if( list->ids == NULL || list->names == NULL )
+ abort();
- if( !vlc_atomic_get( &p_notif->abort) )
- {
- HRESULT dsresult;
- mwait( p_notif->start_date - AOUT_MAX_PTS_ADVANCE / 2 );
+ (void) mod;
+ return true;
+}
- /* start playing the buffer */
- dsresult = IDirectSoundBuffer_Play( p_aout->sys->p_dsbuffer,
- 0, /* Unused */
- 0, /* Unused */
- DSBPLAY_LOOPING ); /* Flags */
- if( dsresult == DSERR_BUFFERLOST )
- {
- IDirectSoundBuffer_Restore( p_aout->sys->p_dsbuffer );
- dsresult = IDirectSoundBuffer_Play(
- p_aout->sys->p_dsbuffer,
- 0, /* Unused */
- 0, /* Unused */
- DSBPLAY_LOOPING ); /* Flags */
- }
- if( dsresult != DS_OK )
- {
- msg_Err( p_aout, "cannot start playing buffer" );
- }
- }
- last_time = mdate();
+/*****************************************************************************
+ * ReloadDirectXDevices: store the list of devices in preferences
+ *****************************************************************************/
+static int ReloadDirectXDevices( vlc_object_t *p_this, char const *psz_name,
+ char ***values, char ***descs )
+{
+ ds_list_t list = {
+ .count = 1,
+ .ids = xmalloc(sizeof (char *)),
+ .names = xmalloc(sizeof (char *)),
+ };
+ list.ids[0] = xstrdup("");
+ list.names[0] = xstrdup(_("Default"));
- while( !vlc_atomic_get( &p_notif->abort ) )
- {
- DWORD l_read;
- int l_queued = 0, l_free_slots;
- unsigned i_frame_siz = p_aout->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->sys->p_dsbuffer, &l_read, NULL ) )
- {
- msg_Err( p_aout, "GetCurrentPosition() failed!" );
- l_read = 0;
- }
+ (void) psz_name;
- /* Detect underruns */
- if( l_queued && mtime - last_time >
- INT64_C(1000000) * l_queued / p_aout->format.i_rate )
- {
- msg_Dbg( p_aout, "detected underrun!" );
- }
- last_time = mtime;
+ HANDLE hdsound_dll = LoadLibrary(_T("DSOUND.DLL"));
+ if( hdsound_dll == NULL )
+ {
+ msg_Warn( p_this, "cannot open DSOUND.DLL" );
+ goto out;
+ }
- /* Try to fill in as many frame buffers as possible */
- l_read /= (p_aout->format.i_bytes_per_frame /
- p_aout->format.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;
+ /* Get DirectSoundEnumerate */
+ HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID) =
+ (void *)GetProcAddress( hdsound_dll, "DirectSoundEnumerateW" );
+ if( OurDirectSoundEnumerate != NULL )
+ {
+ OurDirectSoundEnumerate( DeviceEnumCallback, &list );
+ msg_Dbg( p_this, "found %u devices", list.count );
+ }
+ FreeLibrary(hdsound_dll);
- 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->format.i_rate, b_sleek );
+out:
+ *values = list.ids;
+ *descs = list.names;
+ return list.count;
+}
- /* 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 / i_frame_siz) ) break;
+static int DeviceSelect (audio_output_t *aout, const char *id)
+{
+ var_SetString(aout, "directx-audio-device", (id != NULL) ? id : "");
+ aout_DeviceReport (aout, id);
+ aout_RestartRequest (aout, AOUT_RESTART_OUTPUT);
+ return 0;
+}
- if( FillBuffer( p_aout, p_notif->i_write_slot % FRAMES_NUM,
- p_buffer ) != VLC_SUCCESS ) break;
- }
+static int Open(vlc_object_t *obj)
+{
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = calloc(1, sizeof (*sys));
+ if (unlikely(sys == NULL))
+ return VLC_ENOMEM;
- /* Sleep a reasonable amount of time */
- l_queued += (i * i_frame_siz);
- msleep( INT64_C(1000000) * l_queued / p_aout->format.i_rate / 2 );
+ sys->hdsound_dll = LoadLibrary(_T("DSOUND.DLL"));
+ if (sys->hdsound_dll == NULL)
+ {
+ msg_Warn(aout, "cannot open DSOUND.DLL");
+ free(sys);
+ return VLC_EGENERIC;
}
- /* make sure the buffer isn't playing */
- IDirectSoundBuffer_Stop( p_aout->sys->p_dsbuffer );
+ aout->sys = sys;
+ aout->start = Start;
+ aout->stop = Stop;
+ aout->volume_set = VolumeSet;
+ aout->mute_set = MuteSet;
+ aout->device_select = DeviceSelect;
- /* free the event */
- CloseHandle( p_notif->event );
+ /* Volume */
+ sys->volume.volume = var_InheritFloat(aout, "directx-volume");
+ aout_VolumeReport(aout, sys->volume.volume );
+ MuteSet(aout, var_InheritBool(aout, "mute"));
- vlc_restorecancel (canc);
- msg_Dbg( p_aout, "DirectSoundThread exiting" );
- return NULL;
-}
+ sys->hnotify_evt = CreateEvent(NULL, FALSE, TRUE, NULL);
+ if( !sys->hnotify_evt )
+ {
+ msg_Err(aout, "cannot create Event");
+ FreeLibrary(sys->hdsound_dll);
+ free(sys);
+ return VLC_EGENERIC;
+ }
-/*****************************************************************************
- * CallBackConfigNBEnum: callback to get the number of available devices
- *****************************************************************************/
-static int CALLBACK CallBackConfigNBEnum( LPGUID p_guid, LPCWSTR psz_desc,
- LPCWSTR psz_mod, LPVOID p_nb )
-{
- VLC_UNUSED( psz_mod ); VLC_UNUSED( psz_desc ); VLC_UNUSED( p_guid );
+ /* DirectSound does not support hot-plug events (unless with WASAPI) */
+ char **ids, **names;
+ int count = ReloadDirectXDevices(obj, NULL, &ids, &names);
+ if (count >= 0)
+ {
+ for (int i = 0; i < count; i++)
+ {
+ aout_HotplugReport(aout, ids[i], names[i]);
+ free(names[i]);
+ free(ids[i]);
+ }
+ free(names);
+ free(ids);
+ }
- int * a = (int *)p_nb;
- (*a)++;
- return true;
+ char *dev = var_CreateGetNonEmptyString(aout, "directx-audio-device");
+ aout_DeviceReport(aout, dev);
+ free(dev);
+
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * 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 )
+static void Close(vlc_object_t *obj)
{
- VLC_UNUSED( psz_mod ); VLC_UNUSED( p_guid );
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = aout->sys;
- module_config_t *p_item = (module_config_t *) _p_item;
-
- 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;
+ var_Destroy(aout, "directx-audio-device");
+ CloseHandle(sys->hnotify_evt);
+ FreeLibrary(sys->hdsound_dll); /* free DSOUND.DLL */
+ free(sys);
}
-/*****************************************************************************
- * 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 )
+static void Flush ( audio_output_t * aout, bool drain )
{
- 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 )
+ aout_sys_t *sys = aout->sys;
+ size_t read;
+ if( drain )
{
- for( int i = 0; i < p_item->i_list; i++ )
+ if( sys->p_notify )
{
- free((char *)(p_item->ppsz_list[i]) );
- free((char *)(p_item->ppsz_list_text[i]) );
+ DSBPOSITIONNOTIFY notif = {.dwOffset = aout->sys->i_write, .hEventNotify = sys->hnotify_evt } ;
+ if( IDirectSoundNotify_SetNotificationPositions( sys->p_notify, 1, ¬if ) == DS_OK )
+ {
+ WaitForSingleObject( sys->hnotify_evt, INFINITE );
+ IDirectSoundBuffer_Stop( aout->sys->p_dsbuffer );
+ }
}
+ else
+ while( IDirectSoundBuffer_GetCurrentPosition( aout->sys->p_dsbuffer,(LPDWORD) &read, NULL) == DS_OK )
+ {
+ read %= DS_BUF_SIZE;
+ if( read == aout->sys->i_write )
+ break;
+ msleep(10000);
+ }
}
-
- HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID);
-
- HANDLE hdsound_dll = LoadLibrary("DSOUND.DLL");
- if( hdsound_dll == NULL )
+ else
{
- msg_Warn( p_this, "cannot open DSOUND.DLL" );
- return VLC_SUCCESS;
+ IDirectSoundBuffer_Stop( aout->sys->p_dsbuffer );
+ IDirectSoundBuffer_SetCurrentPosition( aout->sys->p_dsbuffer,
+ aout->sys->i_write );
}
+}
- /* Get DirectSoundEnumerate */
- OurDirectSoundEnumerate = (void *)
- GetProcAddress( hdsound_dll, "DirectSoundEnumerateW" );
-
- if( OurDirectSoundEnumerate == NULL )
- goto error;
+static void Pause( audio_output_t * aout, bool pause, mtime_t date )
+{
+ (void) date;
+ if( pause )
+ IDirectSoundBuffer_Stop( aout->sys->p_dsbuffer );
+ else
+ IDirectSoundBuffer_Play( aout->sys->p_dsbuffer, 0, 0, DSBPLAY_LOOPING );
+}
- 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 *) );
+static int TimeGet( audio_output_t * aout, mtime_t * delay )
+{
+ uint32_t read;
+ mtime_t size;
- p_item->i_list = 0;
- OurDirectSoundEnumerate(CallBackConfigEnum, p_item);
+ if( IDirectSoundBuffer_GetCurrentPosition( aout->sys->p_dsbuffer, (LPDWORD) &read, NULL) != DS_OK )
+ return 1;
- /* Signal change to the interface */
- p_item->b_dirty = true;
+ read %= DS_BUF_SIZE;
-error:
- FreeLibrary(hdsound_dll);
+ size = (mtime_t)aout->sys->i_write - (mtime_t) read;
+ if( size < 0 )
+ size += DS_BUF_SIZE;
- return VLC_SUCCESS;
+ *delay = ( size / aout->sys->i_bytes_per_sample ) * CLOCK_FREQ / aout->sys->i_rate;
+ return 0;
}
-
projects / vlc / blobdiff