/*****************************************************************************
* directx.c: Windows DirectX audio output method
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: directx.c,v 1.7 2002/11/01 15:43:55 gbazin Exp $
+ * Copyright (C) 2001 the VideoLAN team
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <fcntl.h> /* open(), O_WRONLY */
-#include <string.h> /* strerror() */
-#include <stdlib.h> /* calloc(), malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include "aout_internal.h"
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
#include <windows.h>
#include <mmsystem.h>
#include <dsound.h>
-#define FRAME_SIZE 2048 /* The size is in samples, not in bytes */
-#define FRAMES_NUM 4
-
-/* frame buffer status */
-#define FRAME_QUEUED 0
-#define FRAME_EMPTY 1
+#define FRAME_SIZE ((int)p_aout->output.output.i_rate/20) /* Size in samples */
+#define FRAMES_NUM 8 /* Needs to be > 3 */
/*****************************************************************************
* DirectSound GUIDs.
* the linking stage.
*****************************************************************************/
#include <initguid.h>
-DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
/*****************************************************************************
* Useful macros
# define WAVE_FORMAT_IEEE_FLOAT 0x0003
#endif
+#ifndef WAVE_FORMAT_DOLBY_AC3_SPDIF
+# define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
+#endif
+
+#ifndef WAVE_FORMAT_EXTENSIBLE
+#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
+#endif
+
+#ifndef SPEAKER_FRONT_LEFT
+# define SPEAKER_FRONT_LEFT 0x1
+# define SPEAKER_FRONT_RIGHT 0x2
+# define SPEAKER_FRONT_CENTER 0x4
+# define SPEAKER_LOW_FREQUENCY 0x8
+# define SPEAKER_BACK_LEFT 0x10
+# define SPEAKER_BACK_RIGHT 0x20
+# define SPEAKER_FRONT_LEFT_OF_CENTER 0x40
+# define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80
+# define SPEAKER_BACK_CENTER 0x100
+# define SPEAKER_SIDE_LEFT 0x200
+# define SPEAKER_SIDE_RIGHT 0x400
+# define SPEAKER_TOP_CENTER 0x800
+# define SPEAKER_TOP_FRONT_LEFT 0x1000
+# define SPEAKER_TOP_FRONT_CENTER 0x2000
+# define SPEAKER_TOP_FRONT_RIGHT 0x4000
+# define SPEAKER_TOP_BACK_LEFT 0x8000
+# define SPEAKER_TOP_BACK_CENTER 0x10000
+# define SPEAKER_TOP_BACK_RIGHT 0x20000
+# define SPEAKER_RESERVED 0x80000000
+#endif
+
+#ifndef DSSPEAKER_DSSPEAKER_DIRECTOUT
+# define DSSPEAKER_DSSPEAKER_DIRECTOUT 0x00000000
+#endif
+#ifndef DSSPEAKER_HEADPHONE
+# define DSSPEAKER_HEADPHONE 0x00000001
+#endif
+#ifndef DSSPEAKER_MONO
+# define DSSPEAKER_MONO 0x00000002
+#endif
+#ifndef DSSPEAKER_QUAD
+# define DSSPEAKER_QUAD 0x00000003
+#endif
+#ifndef DSSPEAKER_STEREO
+# define DSSPEAKER_STEREO 0x00000004
+#endif
+#ifndef DSSPEAKER_SURROUND
+# define DSSPEAKER_SURROUND 0x00000005
+#endif
+#ifndef DSSPEAKER_5POINT1
+# define DSSPEAKER_5POINT1 0x00000006
+#endif
+#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 {
+ WAVEFORMATEX Format;
+ union {
+ WORD wValidBitsPerSample; /* bits of precision */
+ WORD wSamplesPerBlock; /* valid if wBitsPerSample==0 */
+ WORD wReserved; /* If neither applies, set to zero. */
+ } Samples;
+ DWORD dwChannelMask; /* which channels are */
+ /* present in stream */
+ GUID SubFormat;
+} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
+#endif
+
+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 );
+
/*****************************************************************************
* notification_thread_t: DirectX event thread
*****************************************************************************/
{
VLC_COMMON_MEMBERS
- aout_instance_t * p_aout;
- int i_frame_status[FRAMES_NUM]; /* status of each frame buffer */
- DSBPOSITIONNOTIFY p_events[FRAMES_NUM]; /* play notification events */
- int i_frame_size; /* Size in bytes of one frame */
+ aout_instance_t *p_aout;
+ int i_frame_size; /* size in bytes of one frame */
+ int i_write_slot; /* current write position in our circular buffer */
mtime_t start_date;
+ HANDLE event;
} notification_thread_t;
*****************************************************************************/
struct aout_sys_t
{
- LPDIRECTSOUND p_dsobject; /* main Direct Sound object */
+ HINSTANCE hdsound_dll; /* handle of the opened dsound dll */
- LPDIRECTSOUNDBUFFER p_dsbuffer_primary; /* the actual sound card buffer
- (not used directly) */
+ int i_device_id; /* user defined device */
+ LPGUID p_device_guid;
+ LPDIRECTSOUND p_dsobject; /* main Direct Sound object */
LPDIRECTSOUNDBUFFER p_dsbuffer; /* the sound buffer we use (direct sound
* takes care of mixing all the
* secondary buffers into the primary) */
- LPDIRECTSOUNDNOTIFY p_dsnotify; /* the position notify interface */
+ notification_thread_t *p_notif; /* DirectSoundThread id */
- HINSTANCE hdsound_dll; /* handle of the opened dsound dll */
+ int b_playing; /* playing status */
- notification_thread_t * p_notif; /* DirectSoundThread id */
+ int i_frame_size; /* Size in bytes of one frame */
- int b_playing; /* playing status */
+ bool b_chan_reorder; /* do we need channel reordering */
+ int pi_chan_table[AOUT_CHAN_MAX];
+ uint32_t i_channel_mask;
+ uint32_t i_bits_per_sample;
+ uint32_t i_channels;
};
+static const uint32_t pi_channels_src[] =
+ { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ 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_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_SIDE_LEFT, SPEAKER_SIDE_RIGHT, 0 };
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static int OpenAudio ( vlc_object_t * );
static void CloseAudio ( vlc_object_t * );
-
static void Play ( aout_instance_t * );
/* local functions */
-static int DirectxCreateSecondaryBuffer ( aout_instance_t * );
-static void DirectxDestroySecondaryBuffer( aout_instance_t * );
-static int DirectxInitDSound ( aout_instance_t * );
-static void DirectSoundThread ( notification_thread_t * );
-static int DirectxFillBuffer ( aout_instance_t *, int,
- aout_buffer_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 void DestroyDSBuffer ( aout_instance_t * );
+static void DirectSoundThread ( notification_thread_t * );
+static int FillBuffer ( aout_instance_t *, int, aout_buffer_t * );
/*****************************************************************************
* 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 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( _("DirectX audio module") );
+ 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" );
+ 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();
static int OpenAudio( vlc_object_t *p_this )
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
- HRESULT dsresult;
- DSBUFFERDESC dsbuffer_desc;
- int i;
+ vlc_value_t val;
- msg_Dbg( p_aout, "Open" );
+ 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_EGENERIC;
+ return VLC_ENOMEM;
}
/* Initialize some variables */
p_aout->output.p_sys->p_dsobject = NULL;
- p_aout->output.p_sys->p_dsbuffer_primary = NULL;
p_aout->output.p_sys->p_dsbuffer = NULL;
- p_aout->output.p_sys->p_dsnotify = NULL;
p_aout->output.p_sys->p_notif = NULL;
p_aout->output.p_sys->b_playing = 0;
p_aout->output.pf_play = Play;
aout_VolumeSoftInit( p_aout );
+ /* 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;
+ p_aout->output.p_sys->p_device_guid = 0;
+
/* Initialise DirectSound */
- if( DirectxInitDSound( p_aout ) )
+ if( InitDirectSound( p_aout ) )
{
msg_Err( p_aout, "cannot initialize DirectSound" );
goto error;
}
- /* Obtain (not create) Direct Sound primary buffer */
- memset( &dsbuffer_desc, 0, sizeof(DSBUFFERDESC) );
- dsbuffer_desc.dwSize = sizeof(DSBUFFERDESC);
- dsbuffer_desc.dwFlags = DSBCAPS_PRIMARYBUFFER;
- msg_Warn( p_aout, "create direct sound primary buffer" );
- dsresult = IDirectSound_CreateSoundBuffer(p_aout->output.p_sys->p_dsobject,
- &dsbuffer_desc,
- &p_aout->output.p_sys->p_dsbuffer_primary,
- NULL);
- if( dsresult != DS_OK )
+ if( var_Type( p_aout, "audio-device" ) == 0 )
{
- msg_Err( p_aout, "cannot create direct sound primary buffer" );
- goto error;
+ Probe( p_aout );
}
- /* Now we need to setup DirectSound play notification */
- p_aout->output.p_sys->p_notif =
- vlc_object_create( p_aout, sizeof(notification_thread_t) );
- p_aout->output.p_sys->p_notif->p_aout = p_aout;
+ if( var_Get( p_aout, "audio-device", &val ) < 0 )
+ {
+ /* Probe() has failed. */
+ goto error;
+ }
- /* first we need to create the notification events */
- for( i = 0; i < FRAMES_NUM; i++ )
- p_aout->output.p_sys->p_notif->p_events[i].hEventNotify =
- CreateEvent( NULL, FALSE, FALSE, NULL );
+ /* Open the device */
+ if( val.i_int == AOUT_VAR_SPDIF )
+ {
+ p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
+
+ /* Calculate the frame size in bytes */
+ p_aout->output.i_nb_samples = A52_FRAME_NB;
+ p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE;
+ p_aout->output.output.i_frame_length = A52_FRAME_NB;
+ 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'),
+ 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, false )
+ != VLC_SUCCESS )
+ {
+ msg_Err( p_aout, "cannot open directx audio device" );
+ free( p_aout->output.p_sys );
+ return VLC_EGENERIC;
+ }
- /* then create a new secondary buffer */
- p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
- if( DirectxCreateSecondaryBuffer( p_aout ) )
+ aout_VolumeNoneInit( p_aout );
+ }
+ else
{
- msg_Err( p_aout, "cannot create WAVE_FORMAT_IEEE_FLOAT buffer" );
+ if( val.i_int == AOUT_VAR_5_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_LFE;
+ }
+ else if( val.i_int == AOUT_VAR_7_1 )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT
+ | AOUT_CHAN_LFE;
+ }
+ else if( val.i_int == AOUT_VAR_3F2R )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ }
+ else if( val.i_int == AOUT_VAR_2F2R )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ }
+ else if( val.i_int == AOUT_VAR_MONO )
+ {
+ p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
+ }
+ else
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ }
- p_aout->output.output.i_format = VLC_FOURCC('s','1','6','l');
- if( DirectxCreateSecondaryBuffer( p_aout ) )
+ 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, false )
+ != VLC_SUCCESS )
{
- msg_Err( p_aout, "cannot create WAVE_FORMAT_PCM buffer" );
- return 1;
+ msg_Err( p_aout, "cannot open directx audio device" );
+ free( p_aout->output.p_sys );
+ return VLC_EGENERIC;
}
+
+ /* Calculate the frame size in bytes */
+ p_aout->output.i_nb_samples = FRAME_SIZE;
+ aout_FormatPrepare( &p_aout->output.output );
+ aout_VolumeSoftInit( p_aout );
}
+ /* Now we need to setup our DirectSound play notification structure */
+ p_aout->output.p_sys->p_notif =
+ vlc_object_create( p_aout, sizeof(notification_thread_t) );
+ p_aout->output.p_sys->p_notif->p_aout = p_aout;
+
+ p_aout->output.p_sys->p_notif->event = CreateEvent( 0, FALSE, FALSE, 0 );
+ p_aout->output.p_sys->p_notif->i_frame_size =
+ p_aout->output.p_sys->i_frame_size;
+
/* then launch the notification thread */
msg_Dbg( p_aout, "creating DirectSoundThread" );
if( vlc_thread_create( p_aout->output.p_sys->p_notif,
"DirectSound Notification Thread",
DirectSoundThread,
- THREAD_PRIORITY_TIME_CRITICAL, 1 ) )
+ VLC_THREAD_PRIORITY_HIGHEST, false ) )
{
msg_Err( p_aout, "cannot create DirectSoundThread" );
+ CloseHandle( p_aout->output.p_sys->p_notif->event );
+ vlc_object_release( p_aout->output.p_sys->p_notif );
+ p_aout->output.p_sys->p_notif = NULL;
goto error;
}
vlc_object_attach( p_aout->output.p_sys->p_notif, p_aout );
- return 0;
+ return VLC_SUCCESS;
error:
CloseAudio( VLC_OBJECT(p_aout) );
return VLC_EGENERIC;
}
+/*****************************************************************************
+ * Probe: probe the audio device for available formats and channels
+ *****************************************************************************/
+static void Probe( aout_instance_t * p_aout )
+{
+ vlc_value_t val, text;
+ int i_format;
+ unsigned int i_physical_channels;
+ DWORD ui_speaker_config;
+
+ 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->output.output.i_physical_channels == i_physical_channels )
+ {
+ if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 6,
+ 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 );
+ 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 );
+ msg_Dbg( p_aout, "device supports 7.1 channels" );
+ }
+ }
+
+ /* Test for 3 Front 2 Rear support */
+ i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT |
+ AOUT_CHAN_REARRIGHT;
+ if( p_aout->output.output.i_physical_channels == i_physical_channels )
+ {
+ if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 5,
+ p_aout->output.output.i_rate, true )
+ == VLC_SUCCESS )
+ {
+ val.i_int = AOUT_VAR_3F2R;
+ text.psz_string = N_("3 Front 2 Rear");
+ var_Change( p_aout, "audio-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
+ 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->output.output.i_physical_channels & i_physical_channels )
+ == i_physical_channels )
+ {
+ if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 4,
+ 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 );
+ 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->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 );
+ 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, true )
+ == VLC_SUCCESS )
+ {
+ val.i_int = AOUT_VAR_MONO;
+ text.psz_string = N_("Mono");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
+ msg_Dbg( p_aout, "device supports 1 channel" );
+ }
+
+ /* Check the speaker configuration to determine which channel config should
+ * be the default */
+ if FAILED( IDirectSound_GetSpeakerConfig( p_aout->output.p_sys->p_dsobject,
+ &ui_speaker_config ) )
+ {
+ ui_speaker_config = DSSPEAKER_STEREO;
+ }
+ switch( DSSPEAKER_CONFIG(ui_speaker_config) )
+ {
+ case DSSPEAKER_7POINT1:
+ val.i_int = AOUT_VAR_7_1;
+ break;
+ case DSSPEAKER_5POINT1:
+ val.i_int = AOUT_VAR_5_1;
+ break;
+ case DSSPEAKER_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:
+ case DSSPEAKER_STEREO:
+ default:
+ val.i_int = AOUT_VAR_STEREO;
+ 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'),
+ p_aout->output.output.i_physical_channels,
+ aout_FormatNbChannels( &p_aout->output.output ),
+ p_aout->output.output.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 = N_("A/52 over S/PDIF");
+ var_Change( p_aout, "audio-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
+ if( config_GetInt( p_aout, "spdif" ) )
+ var_Set( p_aout, "audio-device", val );
+ }
+ }
+
+ 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;
+ }
+
+ var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
+
+ val.b_bool = true;
+ var_Set( p_aout, "intf-change", val );
+}
+
/*****************************************************************************
* 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
if( !p_aout->output.p_sys->b_playing )
{
aout_buffer_t *p_buffer;
+ int i;
p_aout->output.p_sys->b_playing = 1;
aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
/* fill in the first samples */
- p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
- DirectxFillBuffer( p_aout, 0, p_buffer );
+ for( i = 0; i < FRAMES_NUM; i++ )
+ {
+ p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
+ if( !p_buffer ) break;
+ FillBuffer( p_aout, i, p_buffer );
+ }
/* wake up the audio output thread */
- SetEvent( p_aout->output.p_sys->p_notif->p_events[0].hEventNotify );
+ SetEvent( p_aout->output.p_sys->p_notif->event );
}
}
static void CloseAudio( vlc_object_t *p_this )
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
+ aout_sys_t *p_sys = p_aout->output.p_sys;
- msg_Dbg( p_aout, "Close" );
+ msg_Dbg( p_aout, "closing audio device" );
/* kill the position notification thread, if any */
- if( p_aout->output.p_sys->p_notif )
+ if( p_sys->p_notif )
{
- vlc_object_detach( p_aout->output.p_sys->p_notif );
- if( p_aout->output.p_sys->p_notif->b_thread )
- {
- p_aout->output.p_sys->p_notif->b_die = 1;
-
- if( !p_aout->output.p_sys->b_playing )
- /* wake up the audio thread */
- SetEvent(
- p_aout->output.p_sys->p_notif->p_events[0].hEventNotify );
+ vlc_object_detach( p_sys->p_notif );
+ vlc_object_kill( p_sys->p_notif );
+ /* wake up the audio thread if needed */
+ if( !p_sys->b_playing ) SetEvent( p_sys->p_notif->event );
- vlc_thread_join( p_aout->output.p_sys->p_notif );
- }
- vlc_object_destroy( p_aout->output.p_sys->p_notif );
+ vlc_thread_join( p_sys->p_notif );
+ vlc_object_release( p_sys->p_notif );
}
/* release the secondary buffer */
- DirectxDestroySecondaryBuffer( p_aout );
-
- /* then release the primary buffer */
- if( p_aout->output.p_sys->p_dsbuffer_primary )
- IDirectSoundBuffer_Release( p_aout->output.p_sys->p_dsbuffer_primary );
+ DestroyDSBuffer( p_aout );
/* finally release the DirectSound object */
- if( p_aout->output.p_sys->p_dsobject )
- IDirectSound_Release( p_aout->output.p_sys->p_dsobject );
-
+ if( p_sys->p_dsobject ) IDirectSound_Release( p_sys->p_dsobject );
+
/* free DSOUND.DLL */
- if( p_aout->output.p_sys->hdsound_dll )
- FreeLibrary( p_aout->output.p_sys->hdsound_dll );
+ if( p_sys->hdsound_dll ) FreeLibrary( p_sys->hdsound_dll );
+
+ free( p_aout->output.p_sys->p_device_guid );
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * CallBackDirectSoundEnum: callback to enumerate available devices
+ *****************************************************************************/
+static int CALLBACK CallBackDirectSoundEnum( LPGUID p_guid, LPCSTR psz_desc,
+ LPCSTR psz_mod, LPVOID _p_aout )
+{
+ 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 )
+ {
+ 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 );
+ }
- free( p_aout->output.p_sys );
+ p_aout->output.p_sys->i_device_id--;
+ return 1;
}
/*****************************************************************************
- * DirectxInitDSound: handle all the gory details of DirectSound initialisation
+ * InitDirectSound: handle all the gory details of DirectSound initialisation
*****************************************************************************/
-static int DirectxInitDSound( aout_instance_t *p_aout )
+static int InitDirectSound( aout_instance_t *p_aout )
{
HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
+ HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACK, LPVOID);
p_aout->output.p_sys->hdsound_dll = LoadLibrary("DSOUND.DLL");
if( p_aout->output.p_sys->hdsound_dll == NULL )
goto error;
}
- OurDirectSoundCreate = (void *)GetProcAddress(
- p_aout->output.p_sys->hdsound_dll,
- "DirectSoundCreate" );
+ OurDirectSoundCreate = (void *)
+ GetProcAddress( p_aout->output.p_sys->hdsound_dll,
+ "DirectSoundCreate" );
if( OurDirectSoundCreate == NULL )
{
msg_Warn( p_aout, "GetProcAddress FAILED" );
goto error;
}
+ /* Get DirectSoundEnumerate */
+ OurDirectSoundEnumerate = (void *)
+ GetProcAddress( p_aout->output.p_sys->hdsound_dll,
+ "DirectSoundEnumerateA" );
+ if( OurDirectSoundEnumerate )
+ {
+ /* Attempt enumeration */
+ if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum,
+ p_aout ) ) )
+ {
+ msg_Dbg( p_aout, "enumeration of DirectSound devices failed" );
+ }
+ }
+
/* Create the direct sound object */
- if( OurDirectSoundCreate( NULL, &p_aout->output.p_sys->p_dsobject, NULL )
- != DS_OK )
+ if FAILED( OurDirectSoundCreate( p_aout->output.p_sys->p_device_guid,
+ &p_aout->output.p_sys->p_dsobject,
+ NULL ) )
{
msg_Warn( p_aout, "cannot create a direct sound device" );
goto error;
msg_Warn( p_aout, "cannot set direct sound cooperative level" );
}
- return 0;
+ return VLC_SUCCESS;
error:
p_aout->output.p_sys->p_dsobject = NULL;
FreeLibrary( p_aout->output.p_sys->hdsound_dll );
p_aout->output.p_sys->hdsound_dll = NULL;
}
- return 1;
+ return VLC_EGENERIC;
}
/*****************************************************************************
- * DirectxCreateSecondaryBuffer
+ * CreateDSBuffer: Creates a direct sound buffer of the required format.
*****************************************************************************
* This function creates the buffer we'll use to play audio.
* In DirectSound there are two kinds of buffers:
* applications and DirectSound takes care of mixing them into the primary.
*
* Once you create a secondary buffer, you cannot change its format anymore so
- * you have to release the current and create another one.
+ * you have to release the current one and create another.
*****************************************************************************/
-static int DirectxCreateSecondaryBuffer( 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, bool b_probe )
{
- WAVEFORMATEX waveformat;
+ WAVEFORMATEXTENSIBLE waveformat;
DSBUFFERDESC dsbdesc;
- DSBCAPS dsbcaps;
- int i_nb_channels, i;
+ unsigned int i;
- i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
- if ( i_nb_channels > 2 )
+ /* First set the sound buffer format */
+ waveformat.dwChannelMask = 0;
+ for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
{
- i_nb_channels = 2;
- p_aout->output.output.i_channels = AOUT_CHAN_STEREO;
+ if( i_channels & pi_channels_src[i] )
+ waveformat.dwChannelMask |= pi_channels_in[i];
}
- /* First set the buffer format */
- memset( &waveformat, 0, sizeof(WAVEFORMATEX) );
- switch( p_aout->output.output.i_format )
+ switch( i_format )
{
- case VLC_FOURCC('s','1','6','l'):
- waveformat.wFormatTag = WAVE_FORMAT_PCM;
- waveformat.wBitsPerSample = 16;
+ case VLC_FOURCC('s','p','d','i'):
+ i_nb_channels = 2;
+ /* To prevent channel re-ordering */
+ waveformat.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
+ waveformat.Format.wBitsPerSample = 16;
+ waveformat.Samples.wValidBitsPerSample =
+ waveformat.Format.wBitsPerSample;
+ waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF;
+ waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
break;
+
case VLC_FOURCC('f','l','3','2'):
- waveformat.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
- waveformat.wBitsPerSample = sizeof(float) * 8;
+ waveformat.Format.wBitsPerSample = sizeof(float) * 8;
+ waveformat.Samples.wValidBitsPerSample =
+ waveformat.Format.wBitsPerSample;
+ waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
+ waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+ break;
+
+ case VLC_FOURCC('s','1','6','l'):
+ waveformat.Format.wBitsPerSample = 16;
+ waveformat.Samples.wValidBitsPerSample =
+ waveformat.Format.wBitsPerSample;
+ waveformat.Format.wFormatTag = WAVE_FORMAT_PCM;
+ waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_PCM;
break;
}
- waveformat.nChannels = i_nb_channels;
- waveformat.nSamplesPerSec = p_aout->output.output.i_rate;
- waveformat.nBlockAlign = waveformat.wBitsPerSample / 8 *
- waveformat.nChannels;
- waveformat.nAvgBytesPerSec = waveformat.nSamplesPerSec *
- waveformat.nBlockAlign;
- aout_FormatPrepare( &p_aout->output.output );
+ waveformat.Format.nChannels = i_nb_channels;
+ waveformat.Format.nSamplesPerSec = i_rate;
+ waveformat.Format.nBlockAlign =
+ waveformat.Format.wBitsPerSample / 8 * i_nb_channels;
+ waveformat.Format.nAvgBytesPerSec =
+ waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign;
- /* Then fill in the descriptor */
+ p_aout->output.p_sys->i_bits_per_sample = waveformat.Format.wBitsPerSample;
+ p_aout->output.p_sys->i_channels = i_nb_channels;
+
+ /* Then fill in the direct sound descriptor */
memset(&dsbdesc, 0, sizeof(DSBUFFERDESC));
dsbdesc.dwSize = sizeof(DSBUFFERDESC);
dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2/* Better position accuracy */
- | DSBCAPS_CTRLPOSITIONNOTIFY /* We need notification */
| DSBCAPS_GLOBALFOCUS; /* Allows background playing */
- dsbdesc.dwBufferBytes = FRAME_SIZE * FRAMES_NUM /* buffer size */
- * p_aout->output.output.i_bytes_per_frame;
- dsbdesc.lpwfxFormat = &waveformat;
-
- if( IDirectSound_CreateSoundBuffer( p_aout->output.p_sys->p_dsobject,
- &dsbdesc,
- &p_aout->output.p_sys->p_dsbuffer,
- NULL) != DS_OK )
+
+ /* Only use the new WAVE_FORMAT_EXTENSIBLE format for multichannel audio */
+ if( i_nb_channels <= 2 )
{
- msg_Warn( p_aout, "cannot create direct sound secondary buffer" );
- goto error;
+ waveformat.Format.cbSize = 0;
}
+ else
+ {
+ waveformat.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+ waveformat.Format.cbSize =
+ sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
- /* backup the size of a frame */
- p_aout->output.p_sys->p_notif->i_frame_size = FRAME_SIZE *
- p_aout->output.output.i_bytes_per_frame;
+ /* Needed for 5.1 on emu101k */
+ dsbdesc.dwFlags |= DSBCAPS_LOCHARDWARE;
+ }
- memset(&dsbcaps, 0, sizeof(DSBCAPS));
- dsbcaps.dwSize = sizeof(DSBCAPS);
- IDirectSoundBuffer_GetCaps( p_aout->output.p_sys->p_dsbuffer, &dsbcaps );
- msg_Dbg( p_aout, "requested %li bytes buffer and got %li bytes.",
- FRAMES_NUM * p_aout->output.p_sys->p_notif->i_frame_size,
- dsbcaps.dwBufferBytes );
+ dsbdesc.dwBufferBytes = FRAMES_NUM * i_bytes_per_frame; /* buffer size */
+ dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&waveformat;
- /* Now the secondary buffer is created, we need to setup its position
- * notification */
- for( i = 0; i < FRAMES_NUM; i++ )
+ if FAILED( IDirectSound_CreateSoundBuffer(
+ p_aout->output.p_sys->p_dsobject, &dsbdesc,
+ &p_aout->output.p_sys->p_dsbuffer, NULL) )
{
- p_aout->output.p_sys->p_notif->p_events[i].dwOffset = i *
- p_aout->output.p_sys->p_notif->i_frame_size;
-
- p_aout->output.p_sys->p_notif->i_frame_status[i] = FRAME_EMPTY;
+ if( dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE )
+ {
+ /* Try without DSBCAPS_LOCHARDWARE */
+ dsbdesc.dwFlags &= ~DSBCAPS_LOCHARDWARE;
+ if FAILED( IDirectSound_CreateSoundBuffer(
+ p_aout->output.p_sys->p_dsobject, &dsbdesc,
+ &p_aout->output.p_sys->p_dsbuffer, NULL) )
+ {
+ return VLC_EGENERIC;
+ }
+ if( !b_probe )
+ msg_Dbg( p_aout, "couldn't use hardware sound buffer" );
+ }
+ else
+ {
+ return VLC_EGENERIC;
+ }
}
- /* Get the IDirectSoundNotify interface */
- if FAILED( IDirectSoundBuffer_QueryInterface(
- p_aout->output.p_sys->p_dsbuffer,
- &IID_IDirectSoundNotify,
- (LPVOID *)&p_aout->output.p_sys->p_dsnotify ) )
+ /* Stop here if we were just probing */
+ if( b_probe )
{
- msg_Err( p_aout, "cannot get Notify interface" );
- goto error;
+ IDirectSoundBuffer_Release( p_aout->output.p_sys->p_dsbuffer );
+ p_aout->output.p_sys->p_dsbuffer = NULL;
+ return VLC_SUCCESS;
}
-
- if FAILED( IDirectSoundNotify_SetNotificationPositions(
- p_aout->output.p_sys->p_dsnotify,
- FRAMES_NUM,
- p_aout->output.p_sys->p_notif->p_events ) )
+
+ p_aout->output.p_sys->i_frame_size = i_bytes_per_frame;
+ p_aout->output.p_sys->i_channel_mask = waveformat.dwChannelMask;
+ p_aout->output.p_sys->b_chan_reorder =
+ aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ waveformat.dwChannelMask, i_nb_channels,
+ p_aout->output.p_sys->pi_chan_table );
+
+ if( p_aout->output.p_sys->b_chan_reorder )
{
- msg_Err( p_aout, "cannot set position Notification" );
- goto error;
+ msg_Dbg( p_aout, "channel reordering needed" );
}
- p_aout->output.i_nb_samples = FRAME_SIZE;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * CreateDSBufferPCM: creates a PCM direct sound buffer.
+ *****************************************************************************
+ * 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,
+ 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 );
- return 0;
+ /* Float32 audio samples are not supported for 5.1 output on the emu101k */
- error:
- if( p_aout->output.p_sys->p_dsbuffer )
+ if( !val.b_bool || i_nb_channels > 2 ||
+ CreateDSBuffer( p_aout, VLC_FOURCC('f','l','3','2'),
+ i_channels, i_nb_channels, i_rate,
+ FRAME_SIZE * 4 * i_nb_channels, b_probe )
+ != VLC_SUCCESS )
{
- IDirectSoundBuffer_Release( p_aout->output.p_sys->p_dsbuffer );
- p_aout->output.p_sys->p_dsbuffer = NULL;
+ if ( CreateDSBuffer( p_aout, VLC_FOURCC('s','1','6','l'),
+ i_channels, i_nb_channels, i_rate,
+ FRAME_SIZE * 2 * i_nb_channels, b_probe )
+ != VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
+ else
+ {
+ *i_format = VLC_FOURCC('s','1','6','l');
+ return VLC_SUCCESS;
+ }
}
- if( p_aout->output.p_sys->p_dsnotify )
+ else
{
- IDirectSoundBuffer_Release( p_aout->output.p_sys->p_dsbuffer );
- p_aout->output.p_sys->p_dsnotify = NULL;
+ *i_format = VLC_FOURCC('f','l','3','2');
+ return VLC_SUCCESS;
}
- return VLC_EGENERIC;
}
/*****************************************************************************
- * DirectxCreateSecondaryBuffer
+ * DestroyDSBuffer
*****************************************************************************
* This function destroys the secondary buffer.
*****************************************************************************/
-static void DirectxDestroySecondaryBuffer( aout_instance_t *p_aout )
+static void DestroyDSBuffer( aout_instance_t *p_aout )
{
- /* make sure the buffer isn't playing */
- if( p_aout->output.p_sys->p_dsbuffer )
- IDirectSoundBuffer_Stop( p_aout->output.p_sys->p_dsbuffer );
-
- if( p_aout->output.p_sys->p_dsnotify )
- {
- IDirectSoundNotify_Release( p_aout->output.p_sys->p_dsnotify );
- p_aout->output.p_sys->p_dsnotify = NULL;
- }
-
if( p_aout->output.p_sys->p_dsbuffer )
{
IDirectSoundBuffer_Release( p_aout->output.p_sys->p_dsbuffer );
}
/*****************************************************************************
- * DirectxFillBuffer: Fill in one of the direct sound frame buffers.
+ * FillBuffer: Fill in one of the direct sound frame buffers.
*****************************************************************************
* Returns VLC_SUCCESS on success.
*****************************************************************************/
-static int DirectxFillBuffer( aout_instance_t *p_aout, int i_frame,
- aout_buffer_t *p_buffer )
+static int FillBuffer( aout_instance_t *p_aout, int i_frame,
+ aout_buffer_t *p_buffer )
{
notification_thread_t *p_notif = p_aout->output.p_sys->p_notif;
+ aout_sys_t *p_sys = p_aout->output.p_sys;
void *p_write_position, *p_wrap_around;
long l_bytes1, l_bytes2;
HRESULT dsresult;
/* Before copying anything, we have to lock the buffer */
dsresult = IDirectSoundBuffer_Lock(
- p_aout->output.p_sys->p_dsbuffer, /* DS buffer */
+ p_sys->p_dsbuffer, /* DS buffer */
i_frame * p_notif->i_frame_size, /* Start offset */
p_notif->i_frame_size, /* Number of bytes */
&p_write_position, /* Address of lock start */
0 ); /* Flags */
if( dsresult == DSERR_BUFFERLOST )
{
- IDirectSoundBuffer_Restore( p_aout->output.p_sys->p_dsbuffer );
+ IDirectSoundBuffer_Restore( p_sys->p_dsbuffer );
dsresult = IDirectSoundBuffer_Lock(
- p_aout->output.p_sys->p_dsbuffer,
+ p_sys->p_dsbuffer,
i_frame * p_notif->i_frame_size,
p_notif->i_frame_size,
&p_write_position,
return VLC_EGENERIC;
}
- if ( p_buffer != NULL )
+ if( p_buffer == NULL )
{
- p_aout->p_vlc->pf_memcpy( p_write_position, p_buffer->p_buffer,
- l_bytes1 );
- aout_BufferFree( p_buffer );
+ memset( p_write_position, 0, l_bytes1 );
}
else
- memset( p_write_position, 0, l_bytes1 );
+ {
+ if( p_sys->b_chan_reorder )
+ {
+ /* Do the channel reordering here */
+ aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_nb_bytes,
+ p_sys->i_channels, p_sys->pi_chan_table,
+ p_sys->i_bits_per_sample );
+ }
+
+ vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 );
+ aout_BufferFree( p_buffer );
+ }
/* Now the data has been copied, unlock the buffer */
- IDirectSoundBuffer_Unlock( p_aout->output.p_sys->p_dsbuffer,
- p_write_position, l_bytes1,
+ IDirectSoundBuffer_Unlock( p_sys->p_dsbuffer, p_write_position, l_bytes1,
p_wrap_around, l_bytes2 );
+ p_notif->i_write_slot = (i_frame + 1) % FRAMES_NUM;
return VLC_SUCCESS;
}
/*****************************************************************************
- * DirectSoundThread: this thread will capture play notification events.
+ * DirectSoundThread: this thread will capture play notification events.
*****************************************************************************
* We use this thread to emulate a callback mechanism. The thread probes for
* event notification and fills up the DS secondary buffer when needed.
*****************************************************************************/
static void DirectSoundThread( notification_thread_t *p_notif )
{
- HANDLE notification_events[FRAMES_NUM];
- HRESULT dsresult;
aout_instance_t *p_aout = p_notif->p_aout;
- int i, i_which_frame, i_last_frame, i_next_frame;
- mtime_t mtime;
+ bool b_sleek;
+ mtime_t last_time;
+ HRESULT dsresult;
+ long l_queued = 0;
- for( i = 0; i < FRAMES_NUM; i++ )
- notification_events[i] = p_notif->p_events[i].hEventNotify;
+ /* 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( notification_events[0], INFINITE );
+ WaitForSingleObject( p_notif->event, INFINITE );
if( !p_notif->b_die )
{
msg_Err( p_aout, "cannot start playing buffer" );
}
}
+ last_time = mdate();
while( !p_notif->b_die )
{
- aout_buffer_t *p_buffer;
- long l_latency;
+ long l_read, l_free_slots;
+ mtime_t mtime = mdate();
+ int i;
- /* wait for the position notification */
- i_which_frame = WaitForMultipleObjects( FRAMES_NUM,
- notification_events, 0,
- INFINITE ) - WAIT_OBJECT_0;
+ /*
+ * Fill in as much audio data as we can in our circular buffer
+ */
- if( p_notif->b_die )
- break;
-
- mtime = mdate();
-
- /* We take into account the current latency */
- if( IDirectSoundBuffer_GetCurrentPosition(
- p_aout->output.p_sys->p_dsbuffer,
- &l_latency, NULL ) == DS_OK )
+ /* Find out current play position */
+ if FAILED( IDirectSoundBuffer_GetCurrentPosition(
+ p_aout->output.p_sys->p_dsbuffer, &l_read, NULL ) )
{
- if( l_latency > (i_which_frame * FRAME_SIZE)
- && l_latency < ((i_which_frame+1) * FRAME_SIZE) )
- {
- l_latency = - ( l_latency /
- p_aout->output.output.i_bytes_per_frame %
- FRAME_SIZE );
- }
- else
- {
- l_latency = FRAME_SIZE - ( l_latency /
- p_aout->output.output.i_bytes_per_frame %
- FRAME_SIZE );
- }
+ msg_Err( p_aout, "GetCurrentPosition() failed!" );
+ l_read = 0;
}
- else
+
+ /* Detect underruns */
+ if( l_queued && mtime - last_time >
+ INT64_C(1000000) * l_queued / p_aout->output.output.i_rate )
{
- l_latency = 0;
+ msg_Dbg( p_aout, "detected underrun!" );
}
-
- /* Mark last frame as empty */
- i_last_frame = (i_which_frame + FRAMES_NUM -1) % FRAMES_NUM;
- i_next_frame = (i_which_frame + 1) % FRAMES_NUM;
- p_notif->i_frame_status[i_last_frame] = FRAME_EMPTY;
+ last_time = mtime;
/* Try to fill in as many frame buffers as possible */
- for( i = i_next_frame; (i % FRAMES_NUM) != i_which_frame; i++ )
- {
+ l_read /= p_aout->output.output.i_bytes_per_frame;
+ 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;
- /* Check if frame buf is already filled */
- if( p_notif->i_frame_status[i % FRAMES_NUM] == FRAME_QUEUED )
- continue;
-
- p_buffer = aout_OutputNextBuffer( p_aout,
- mtime + 1000000 / p_aout->output.output.i_rate *
- ((i - i_next_frame + 1) * FRAME_SIZE + l_latency), VLC_FALSE );
+ 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) /
+ p_aout->output.output.i_rate, b_sleek );
/* If there is no audio data available and we have some buffered
* already, then just wait for the next time */
- if( !p_buffer && (i != i_next_frame) )
- {
- //msg_Err( p_aout, "only %i frame buffers filled!",
- // i - i_next_frame );
- break;
- }
+ if( !p_buffer && (i || l_queued / FRAME_SIZE) ) break;
- if( DirectxFillBuffer( p_aout, (i%FRAMES_NUM), p_buffer )
- != VLC_SUCCESS )
- break;
-
- /* Mark the frame buffer as QUEUED */
- p_notif->i_frame_status[i%FRAMES_NUM] = FRAME_QUEUED;
+ if( FillBuffer( p_aout, p_notif->i_write_slot % FRAMES_NUM,
+ p_buffer ) != VLC_SUCCESS ) break;
}
+ /* Sleep a reasonable amount of time */
+ l_queued += (i * FRAME_SIZE);
+ msleep( INT64_C(1000000) * l_queued / p_aout->output.output.i_rate / 2 );
}
- /* free the events */
- for( i = 0; i < FRAMES_NUM; i++ )
- CloseHandle( notification_events[i] );
+ /* make sure the buffer isn't playing */
+ IDirectSoundBuffer_Stop( p_aout->output.p_sys->p_dsbuffer );
+
+ /* free the event */
+ CloseHandle( p_notif->event );
msg_Dbg( p_notif, "DirectSoundThread exiting" );
}
projects / vlc / blobdiff