Skip to content

V
vlc-2-2
Commit 39694ce4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

DirectSound: factor out common code for legacy and MMDevice

parent dd3e234c
Show whitespace changes
Inline Side-by-side
Showing with 323 additions and 275 deletions
modules/audio_output/directsound.c
View file @ 39694ce4
...@@ -86,6 +86,25 @@ vlc_module_begin () ...@@ -86,6 +86,25 @@ vlc_module_begin ()
set_callbacks( Open, Close ) set_callbacks( Open, Close )
vlc_module_end () vlc_module_end ()
typedef struct aout_stream_sys
{
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_notify;
int i_bytes_per_sample; /*< Size in bytes of one frame */
int i_rate; /*< Sample rate */
uint8_t chans_to_reorder; /*< Do we need channel reordering? */
uint8_t chan_table[AOUT_CHAN_MAX];
uint32_t i_channel_mask;
vlc_fourcc_t format;
size_t i_write;
} aout_stream_sys_t;
/** /**
* DirectSound audio output method descriptor * DirectSound audio output method descriptor
* *
...@@ -94,50 +113,39 @@ vlc_module_end () ...@@ -94,50 +113,39 @@ vlc_module_end ()
*/ */
struct aout_sys_t struct aout_sys_t
{ {
HINSTANCE hdsound_dll; /* handle of the opened dsound dll */ aout_stream_sys_t s;
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_notify;
struct struct
{ {
float volume; float volume;
LONG mb; LONG mb;
bool mute; bool mute;
} volume; } volume;
HINSTANCE hdsound_dll; /*< handle of the opened dsound DLL */
int i_bytes_per_sample; /* Size in bytes of one frame */
int i_rate; /* Sample rate */
uint8_t chans_to_reorder; /* do we need channel reordering */
uint8_t chan_table[AOUT_CHAN_MAX];
uint32_t i_channel_mask;
vlc_fourcc_t format;
size_t i_write;
}; };
static int TimeGet( audio_output_t * aout, mtime_t * delay ) static HRESULT TimeGet( aout_stream_sys_t *sys, mtime_t *delay )
{ {
DWORD read; DWORD read;
HRESULT hr;
mtime_t size; mtime_t size;
if( IDirectSoundBuffer_GetCurrentPosition( aout->sys->p_dsbuffer, &read, hr = IDirectSoundBuffer_GetCurrentPosition( sys->p_dsbuffer, &read, NULL );
NULL) != DS_OK ) if( hr != DS_OK )
return -1; return hr;
read %= DS_BUF_SIZE; read %= DS_BUF_SIZE;
size = (mtime_t)aout->sys->i_write - (mtime_t) read; size = (mtime_t)sys->i_write - (mtime_t) read;
if( size < 0 ) if( size < 0 )
size += DS_BUF_SIZE; size += DS_BUF_SIZE;
*delay = ( size / aout->sys->i_bytes_per_sample ) * CLOCK_FREQ *delay = ( size / sys->i_bytes_per_sample ) * CLOCK_FREQ / sys->i_rate;
/ aout->sys->i_rate; return DS_OK;
return 0; }
static int OutputTimeGet( audio_output_t *aout, mtime_t *delay )
{
return (TimeGet( &aout->sys->s, delay ) == DS_OK) ? 0 : -1;
} }
/** /**
...@@ -145,14 +153,13 @@ static int TimeGet( audio_output_t * aout, mtime_t * delay ) ...@@ -145,14 +153,13 @@ static int TimeGet( audio_output_t * aout, mtime_t * delay )
* *
* @return VLC_SUCCESS on success. * @return VLC_SUCCESS on success.
*/ */
static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer ) static HRESULT FillBuffer( vlc_object_t *obj, aout_stream_sys_t *p_sys,
block_t *p_buffer )
{ {
aout_sys_t *p_sys = p_aout->sys; size_t towrite = (p_buffer != NULL) ? p_buffer->i_buffer : DS_BUF_SIZE;
size_t towrite = (p_buffer)? p_buffer->i_buffer : DS_BUF_SIZE;
void *p_write_position, *p_wrap_around; void *p_write_position, *p_wrap_around;
unsigned long l_bytes1, l_bytes2; unsigned long l_bytes1, l_bytes2;
uint32_t i_read; DWORD i_read;
size_t i_size; size_t i_size;
mtime_t i_buf; mtime_t i_buf;
HRESULT dsresult; HRESULT dsresult;
...@@ -160,9 +167,11 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer ) ...@@ -160,9 +167,11 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer )
size_t toerase = p_sys->i_bytes_per_sample * p_sys->i_rate / 4; size_t toerase = p_sys->i_bytes_per_sample * p_sys->i_rate / 4;
mtime_t max = towrite; mtime_t max = towrite;
if( IDirectSoundBuffer_GetCurrentPosition( p_aout->sys->p_dsbuffer, (LPDWORD) &i_read, NULL) == DS_OK ) dsresult = IDirectSoundBuffer_GetCurrentPosition( p_sys->p_dsbuffer,
&i_read, NULL );
if( dsresult == DS_OK )
{ {
max = (mtime_t)i_read - (mtime_t)p_aout->sys->i_write; max = (mtime_t)i_read - (mtime_t)p_sys->i_write;
if( max <= 0 ) if( max <= 0 )
max += DS_BUF_SIZE; max += DS_BUF_SIZE;
} }
...@@ -175,7 +184,7 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer ) ...@@ -175,7 +184,7 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer )
/* Before copying anything, we have to lock the buffer */ /* Before copying anything, we have to lock the buffer */
dsresult = IDirectSoundBuffer_Lock( dsresult = IDirectSoundBuffer_Lock(
p_sys->p_dsbuffer, /* DS buffer */ p_sys->p_dsbuffer, /* DS buffer */
p_aout->sys->i_write, /* Start offset */ p_sys->i_write, /* Start offset */
i_buf, /* Number of bytes */ i_buf, /* Number of bytes */
&p_write_position, /* Address of lock start */ &p_write_position, /* Address of lock start */
&l_bytes1, /* Count of bytes locked before wrap around */ &l_bytes1, /* Count of bytes locked before wrap around */
...@@ -187,7 +196,7 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer ) ...@@ -187,7 +196,7 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer )
IDirectSoundBuffer_Restore( p_sys->p_dsbuffer ); IDirectSoundBuffer_Restore( p_sys->p_dsbuffer );
dsresult = IDirectSoundBuffer_Lock( dsresult = IDirectSoundBuffer_Lock(
p_sys->p_dsbuffer, p_sys->p_dsbuffer,
p_aout->sys->i_write, p_sys->i_write,
i_buf, i_buf,
&p_write_position, &p_write_position,
&l_bytes1, &l_bytes1,
...@@ -197,10 +206,10 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer ) ...@@ -197,10 +206,10 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer )
} }
if( dsresult != DS_OK ) if( dsresult != DS_OK )
{ {
msg_Warn( p_aout, "cannot lock buffer" ); msg_Warn( obj, "cannot lock buffer" );
if( p_buffer != NULL ) if( p_buffer != NULL )
block_Release( p_buffer ); block_Release( p_buffer );
return VLC_EGENERIC; return dsresult;
} }
if( p_buffer == NULL ) if( p_buffer == NULL )
...@@ -237,43 +246,66 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer ) ...@@ -237,43 +246,66 @@ static int FillBuffer( audio_output_t *p_aout, block_t *p_buffer )
p_sys->i_write += towrite; p_sys->i_write += towrite;
p_sys->i_write %= DS_BUF_SIZE; p_sys->i_write %= DS_BUF_SIZE;
return VLC_SUCCESS; return DS_OK;
} }
static void Play( audio_output_t *p_aout, block_t *p_buffer ) static HRESULT Play( vlc_object_t *obj, aout_stream_sys_t *sys,
block_t *p_buffer )
{ {
if( FillBuffer( p_aout, p_buffer ) != VLC_SUCCESS ) HRESULT dsresult;
return;
dsresult = FillBuffer( obj, sys, p_buffer );
if( dsresult != DS_OK )
return dsresult;
/* start playing the buffer */ /* start playing the buffer */
HRESULT dsresult = IDirectSoundBuffer_Play( p_aout->sys->p_dsbuffer, dsresult = IDirectSoundBuffer_Play( sys->p_dsbuffer, 0, 0,
0, 0, DSBPLAY_LOOPING ); DSBPLAY_LOOPING );
if( dsresult == DSERR_BUFFERLOST ) if( dsresult == DSERR_BUFFERLOST )
{ {
IDirectSoundBuffer_Restore( p_aout->sys->p_dsbuffer ); IDirectSoundBuffer_Restore( sys->p_dsbuffer );
dsresult = IDirectSoundBuffer_Play( p_aout->sys->p_dsbuffer, dsresult = IDirectSoundBuffer_Play( sys->p_dsbuffer,
0, 0, DSBPLAY_LOOPING ); 0, 0, DSBPLAY_LOOPING );
} }
if( dsresult != DS_OK ) if( dsresult != DS_OK )
msg_Err( p_aout, "cannot start playing buffer" ); msg_Err( obj, "cannot start playing buffer" );
return dsresult;
}
static void OutputPlay( audio_output_t *aout, block_t *block )
{
Play( VLC_OBJECT(aout), &aout->sys->s, block );
} }
static void Pause( audio_output_t * aout, bool pause, mtime_t date ) static HRESULT Pause( aout_stream_sys_t *sys, bool pause )
{ {
HRESULT hr;
if( pause ) if( pause )
IDirectSoundBuffer_Stop( aout->sys->p_dsbuffer ); hr = IDirectSoundBuffer_Stop( sys->p_dsbuffer );
else else
IDirectSoundBuffer_Play( aout->sys->p_dsbuffer, 0, 0, hr = IDirectSoundBuffer_Play( sys->p_dsbuffer, 0, 0, DSBPLAY_LOOPING );
DSBPLAY_LOOPING ); return hr;
}
static void OutputPause( audio_output_t *aout, bool pause, mtime_t date )
{
Pause( &aout->sys->s, pause );
(void) date; (void) date;
} }
static void Flush( audio_output_t * aout, bool drain ) static HRESULT Flush( aout_stream_sys_t *sys )
{ {
IDirectSoundBuffer_Stop( aout->sys->p_dsbuffer ); return IDirectSoundBuffer_Stop( sys->p_dsbuffer );
}
static void OutputFlush( audio_output_t *aout, bool drain )
{
aout_stream_sys_t *sys = &aout->sys->s;
Flush( sys );
if( !drain ) if( !drain )
IDirectSoundBuffer_SetCurrentPosition( aout->sys->p_dsbuffer, IDirectSoundBuffer_SetCurrentPosition( sys->p_dsbuffer, sys->i_write );
aout->sys->i_write );
} }
/** /**
...@@ -288,12 +320,13 @@ static void Flush( audio_output_t * aout, bool drain ) ...@@ -288,12 +320,13 @@ static void Flush( audio_output_t * aout, bool drain )
* Once you create a secondary buffer, you cannot change its format anymore so * Once you create a secondary buffer, you cannot change its format anymore so
* you have to release the current one and create another. * you have to release the current one and create another.
*/ */
static int CreateDSBuffer( audio_output_t *p_aout, int i_format, static HRESULT CreateDSBuffer( vlc_object_t *obj, aout_stream_sys_t *sys,
int i_channels, int i_nb_channels, int i_rate, int i_format, int i_channels, int i_nb_channels,
bool b_probe ) int i_rate, bool b_probe )
{ {
WAVEFORMATEXTENSIBLE waveformat; WAVEFORMATEXTENSIBLE waveformat;
DSBUFFERDESC dsbdesc; DSBUFFERDESC dsbdesc;
HRESULT hr;
/* First set the sound buffer format */ /* First set the sound buffer format */
waveformat.dwChannelMask = 0; waveformat.dwChannelMask = 0;
...@@ -338,8 +371,8 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format, ...@@ -338,8 +371,8 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
waveformat.Format.nAvgBytesPerSec = waveformat.Format.nAvgBytesPerSec =
waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign; waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign;
p_aout->sys->i_bytes_per_sample = waveformat.Format.nBlockAlign; sys->i_bytes_per_sample = waveformat.Format.nBlockAlign;
p_aout->sys->format = i_format; sys->format = i_format;
/* Then fill in the direct sound descriptor */ /* Then fill in the direct sound descriptor */
memset(&dsbdesc, 0, sizeof(DSBUFFERDESC)); memset(&dsbdesc, 0, sizeof(DSBUFFERDESC));
...@@ -371,61 +404,50 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format, ...@@ -371,61 +404,50 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
if ( i_format == VLC_CODEC_SPDIFL ) if ( i_format == VLC_CODEC_SPDIFL )
dsbdesc.dwFlags &= ~DSBCAPS_CTRLVOLUME; dsbdesc.dwFlags &= ~DSBCAPS_CTRLVOLUME;
if FAILED( IDirectSound_CreateSoundBuffer( hr = IDirectSound_CreateSoundBuffer( sys->p_dsobject, &dsbdesc,
p_aout->sys->p_dsobject, &dsbdesc, &sys->p_dsbuffer, NULL );
&p_aout->sys->p_dsbuffer, NULL) ) if( FAILED(hr) )
{
if( dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE )
{ {
if( !(dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE) )
return hr;
/* Try without DSBCAPS_LOCHARDWARE */ /* Try without DSBCAPS_LOCHARDWARE */
dsbdesc.dwFlags &= ~DSBCAPS_LOCHARDWARE; dsbdesc.dwFlags &= ~DSBCAPS_LOCHARDWARE;
if FAILED( IDirectSound_CreateSoundBuffer( hr = IDirectSound_CreateSoundBuffer( sys->p_dsobject, &dsbdesc,
p_aout->sys->p_dsobject, &dsbdesc, &sys->p_dsbuffer, NULL );
&p_aout->sys->p_dsbuffer, NULL) ) if( FAILED(hr) )
{ return hr;
return VLC_EGENERIC;
}
if( !b_probe ) if( !b_probe )
msg_Dbg( p_aout, "couldn't use hardware sound buffer" ); msg_Dbg( obj, "couldn't use hardware sound buffer" );
}
else
{
return VLC_EGENERIC;
}
} }
/* Stop here if we were just probing */ /* Stop here if we were just probing */
if( b_probe ) if( b_probe )
{ {
IDirectSoundBuffer_Release( p_aout->sys->p_dsbuffer ); IDirectSoundBuffer_Release( sys->p_dsbuffer );
p_aout->sys->p_dsbuffer = NULL; sys->p_dsbuffer = NULL;
return VLC_SUCCESS; return DS_OK;
} }
p_aout->sys->i_rate = i_rate; sys->i_rate = i_rate;
p_aout->sys->i_channel_mask = waveformat.dwChannelMask; sys->i_channel_mask = waveformat.dwChannelMask;
p_aout->sys->chans_to_reorder = sys->chans_to_reorder =
aout_CheckChannelReorder( pi_channels_in, pi_channels_out, aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
waveformat.dwChannelMask, waveformat.dwChannelMask, sys->chan_table );
p_aout->sys->chan_table ); if( sys->chans_to_reorder )
if( p_aout->sys->chans_to_reorder ) msg_Dbg( obj, "channel reordering needed" );
{
msg_Dbg( p_aout, "channel reordering needed" );
}
if( IDirectSoundBuffer_QueryInterface( p_aout->sys->p_dsbuffer, hr = IDirectSoundBuffer_QueryInterface( sys->p_dsbuffer,
&IID_IDirectSoundNotify, &IID_IDirectSoundNotify,
(void **) &p_aout->sys->p_notify ) (void **) &sys->p_notify );
!= DS_OK ) if( hr != DS_OK )
{ {
msg_Err( obj, "Couldn't query IDirectSoundNotify" );
msg_Err(p_aout, "Couldn't query IDirectSoundNotify"); sys->p_notify = NULL;
p_aout->sys->p_notify = NULL;
} }
FillBuffer(p_aout,NULL); FillBuffer( obj, sys, NULL );
return DS_OK;
return VLC_SUCCESS;
} }
/** /**
...@@ -434,37 +456,40 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format, ...@@ -434,37 +456,40 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
* We first try to create a WAVE_FORMAT_IEEE_FLOAT buffer if supported by * We first try to create a WAVE_FORMAT_IEEE_FLOAT buffer if supported by
* the hardware, otherwise we create a WAVE_FORMAT_PCM buffer. * the hardware, otherwise we create a WAVE_FORMAT_PCM buffer.
*/ */
static int CreateDSBufferPCM( audio_output_t *p_aout, vlc_fourcc_t *i_format, static HRESULT CreateDSBufferPCM( vlc_object_t *obj, aout_stream_sys_t *sys,
int i_channels, int i_rate, bool b_probe ) vlc_fourcc_t *i_format, int i_channels,
int i_rate, bool b_probe )
{ {
HRESULT hr;
unsigned i_nb_channels = popcount( i_channels ); unsigned i_nb_channels = popcount( i_channels );
if( var_GetBool( p_aout, "directx-audio-float32" ) if( var_GetBool( obj, "directx-audio-float32" ) )
&& CreateDSBuffer( p_aout, VLC_CODEC_FL32, i_channels, i_nb_channels, {
i_rate, b_probe ) == VLC_SUCCESS ) hr = CreateDSBuffer( obj, sys, VLC_CODEC_FL32, i_channels,
i_nb_channels, i_rate, b_probe );
if( hr == DS_OK )
{ {
*i_format = VLC_CODEC_FL32; *i_format = VLC_CODEC_FL32;
return VLC_SUCCESS; return DS_OK;
}
} }
if( CreateDSBuffer( p_aout, VLC_CODEC_S16N, i_channels, i_nb_channels, hr = CreateDSBuffer( obj, sys, VLC_CODEC_S16N, i_channels, i_nb_channels,
i_rate, b_probe ) == VLC_SUCCESS ) i_rate, b_probe );
if( hr == DS_OK )
{ {
*i_format = VLC_CODEC_S16N; *i_format = VLC_CODEC_S16N;
return VLC_SUCCESS; return DS_OK;
} }
return VLC_EGENERIC; return hr;
} }
/** /**
* Closes the audio device. * Closes the audio device.
*/ */
static void Stop( audio_output_t *p_aout ) static HRESULT Stop( aout_stream_sys_t *p_sys )
{ {
aout_sys_t *p_sys = p_aout->sys;
msg_Dbg( p_aout, "closing audio device" );
if( p_sys->p_notify != NULL ) if( p_sys->p_notify != NULL )
{ {
IDirectSoundNotify_Release(p_sys->p_notify ); IDirectSoundNotify_Release(p_sys->p_notify );
...@@ -473,54 +498,27 @@ static void Stop( audio_output_t *p_aout ) ...@@ -473,54 +498,27 @@ static void Stop( audio_output_t *p_aout )
if( p_sys->p_dsbuffer != NULL ) if( p_sys->p_dsbuffer != NULL )
{ {
IDirectSoundBuffer_Stop( p_sys->p_dsbuffer ); IDirectSoundBuffer_Stop( p_sys->p_dsbuffer );
IDirectSoundBuffer_Release( p_aout->sys->p_dsbuffer ); IDirectSoundBuffer_Release( p_sys->p_dsbuffer );
p_aout->sys->p_dsbuffer = NULL; p_sys->p_dsbuffer = NULL;
} }
if( p_sys->p_dsobject != NULL ) if( p_sys->p_dsobject != NULL )
{ {
IDirectSound_Release( p_sys->p_dsobject ); IDirectSound_Release( p_sys->p_dsobject );
p_sys->p_dsobject = NULL; p_sys->p_dsobject = NULL;
} }
return DS_OK;
} }
/** static void OutputStop( audio_output_t *aout )
* Handles all the gory details of DirectSound initialization.
*/
static int InitDirectSound( audio_output_t *p_aout )
{ {
aout_sys_t *sys = p_aout->sys; msg_Dbg( aout, "closing audio device" );
GUID guid, *p_guid = NULL; Stop( &aout->sys->s );
HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN); }
OurDirectSoundCreate = (void *)
GetProcAddress( p_aout->sys->hdsound_dll,
"DirectSoundCreate" );
if( OurDirectSoundCreate == NULL )
{
msg_Warn( p_aout, "GetProcAddress FAILED" );
goto error;
}
char *dev = var_GetNonEmptyString( p_aout, "directx-audio-device" );
if( dev != NULL )
{
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_guid, &sys->p_dsobject, NULL ) )
{
msg_Warn( p_aout, "cannot create a direct sound device" );
goto error;
}
static HRESULT Start( vlc_object_t *obj, aout_stream_sys_t *sys,
audio_sample_format_t *restrict fmt )
{
#if !VLC_WINSTORE_APP
/* Set DirectSound Cooperative level, ie what control we want over Windows /* Set DirectSound Cooperative level, ie what control we want over Windows
* sound device. In our case, DSSCL_EXCLUSIVE means that we can modify the * sound device. In our case, DSSCL_EXCLUSIVE means that we can modify the
* settings of the primary buffer, but also that only the sound of our * settings of the primary buffer, but also that only the sound of our
...@@ -531,86 +529,20 @@ static int InitDirectSound( audio_output_t *p_aout ) ...@@ -531,86 +529,20 @@ static int InitDirectSound( audio_output_t *p_aout )
* sound without any video, and so what window handle should we use ??? * 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 * The hack for now is to use the Desktop window handle - it seems to be
* working */ * working */
#if !VLC_WINSTORE_APP if( IDirectSound_SetCooperativeLevel( sys->p_dsobject, GetDesktopWindow(),
if( IDirectSound_SetCooperativeLevel( p_aout->sys->p_dsobject,
GetDesktopWindow(),
DSSCL_EXCLUSIVE) ) DSSCL_EXCLUSIVE) )
{ msg_Warn( obj, "cannot set direct sound cooperative level" );
msg_Warn( p_aout, "cannot set direct sound cooperative level" );
}
#endif #endif
return VLC_SUCCESS;
error:
sys->p_dsobject = NULL;
return VLC_EGENERIC;
}
static int VolumeSet( audio_output_t *p_aout, float volume )
{
aout_sys_t *sys = p_aout->sys;
int ret = 0;
/* Directsound doesn't support amplification, so we use software
gain if we need it and only for this */
float gain = volume > 1.f ? volume * volume * volume : 1.f;
aout_GainRequest( p_aout, gain );
/* millibels from linear amplification */
LONG mb = lroundf( 6000.f * log10f( __MIN( volume, 1.f ) ));
/* Clamp to allowed DirectSound range */
static_assert( DSBVOLUME_MIN < DSBVOLUME_MAX, "DSBVOLUME_* confused" );
if( mb > DSBVOLUME_MAX )
{
mb = DSBVOLUME_MAX;
ret = -1;
}
if( mb <= DSBVOLUME_MIN )
mb = DSBVOLUME_MIN;
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 );
if( var_InheritBool( p_aout, "volume-save" ) ) const char *const *ppsz_compare = speaker_list;
config_PutFloat( p_aout, "directx-volume", volume );
return ret;
}
static int MuteSet( audio_output_t *p_aout, bool mute )
{
HRESULT res = DS_OK;
aout_sys_t *sys = p_aout->sys;
sys->volume.mute = mute;
if( sys->p_dsbuffer )
res = IDirectSoundBuffer_SetVolume( sys->p_dsbuffer,
mute? DSBVOLUME_MIN : sys->volume.mb );
aout_MuteReport( p_aout, mute );
return (res != DS_OK);
}
static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
{
char *psz_speaker; char *psz_speaker;
int i = 0; int i = 0;
HRESULT hr;
const char *const *ppsz_compare = speaker_list;
msg_Dbg( p_aout, "Opening DirectSound Audio Output" );
/* Retrieve config values */ /* Retrieve config values */
var_Create( p_aout, "directx-audio-float32", var_Create( obj, "directx-audio-float32",
VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
psz_speaker = var_CreateGetString( p_aout, "directx-audio-speaker" ); psz_speaker = var_CreateGetString( obj, "directx-audio-speaker" );
while ( *ppsz_compare != NULL ) while ( *ppsz_compare != NULL )
{ {
...@@ -623,32 +555,31 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt ) ...@@ -623,32 +555,31 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
if ( *ppsz_compare == NULL ) if ( *ppsz_compare == NULL )
{ {
msg_Err( p_aout, "(%s) isn't valid speaker setup option", psz_speaker ); msg_Err( obj, "(%s) isn't valid speaker setup option", psz_speaker );
msg_Err( p_aout, "Defaulting to Windows default speaker config"); msg_Err( obj, "Defaulting to Windows default speaker config");
i = 0; i = 0;
} }
free( psz_speaker ); free( psz_speaker );
/* Initialise DirectSound */ if( AOUT_FMT_SPDIF( fmt ) && var_InheritBool( obj, "spdif" ) )
if( InitDirectSound( p_aout ) )
{ {
msg_Err( p_aout, "cannot initialize DirectSound" ); hr = CreateDSBuffer( obj, sys, VLC_CODEC_SPDIFL,
goto error; fmt->i_physical_channels,
} aout_FormatNbChannels(fmt), fmt->i_rate, false );
if( hr == DS_OK )
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, false )
== VLC_SUCCESS )
{ {
msg_Dbg( p_aout, "using A/52 pass-through over S/PDIF" ); msg_Dbg( obj, "using A/52 pass-through over S/PDIF" );
fmt->i_format = VLC_CODEC_SPDIFL; fmt->i_format = VLC_CODEC_SPDIFL;
/* Calculate the frame size in bytes */ /* Calculate the frame size in bytes */
fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE; fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE;
fmt->i_frame_length = A52_FRAME_NB; fmt->i_frame_length = A52_FRAME_NB;
} }
}
else else
hr = DSERR_UNSUPPORTED;
if( hr != DS_OK )
{ {
if( i == 0 ) if( i == 0 )
{ {
...@@ -658,11 +589,12 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt ) ...@@ -658,11 +589,12 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
/* Check the speaker configuration to determine which channel /* Check the speaker configuration to determine which channel
* config should be the default */ * config should be the default */
if( FAILED( IDirectSound_GetSpeakerConfig( p_aout->sys->p_dsobject, hr = IDirectSound_GetSpeakerConfig( sys->p_dsobject,
&ui_speaker_config ) ) ) &ui_speaker_config );
if( FAILED(hr) )
{ {
ui_speaker_config = DSSPEAKER_STEREO; ui_speaker_config = DSSPEAKER_STEREO;
msg_Dbg( p_aout, "GetSpeakerConfig failed" ); msg_Dbg( obj, "GetSpeakerConfig failed" );
} }
const char *name = "Unknown"; const char *name = "Unknown";
...@@ -702,7 +634,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt ) ...@@ -702,7 +634,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
if( i_channels >= i_orig_channels ) if( i_channels >= i_orig_channels )
i_channels = i_orig_channels; i_channels = i_orig_channels;
msg_Dbg( p_aout, "%s speaker config: %s and stream has " msg_Dbg( obj, "%s speaker config: %s and stream has "
"%d channels, using %d channels", "Windows", name, "%d channels, using %d channels", "Windows", name,
i_orig_channels, i_channels ); i_orig_channels, i_channels );
...@@ -750,37 +682,153 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt ) ...@@ -750,37 +682,153 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
fmt->i_physical_channels = AOUT_CHANS_7_1; fmt->i_physical_channels = AOUT_CHANS_7_1;
break; break;
} }
msg_Dbg( p_aout, "%s speaker config: %s", "VLC", name ); msg_Dbg( obj, "%s speaker config: %s", "VLC", name );
} }
/* Open the device */ /* Open the device */
aout_FormatPrepare( fmt ); aout_FormatPrepare( fmt );
if( CreateDSBufferPCM( p_aout, &fmt->i_format, hr = CreateDSBufferPCM( obj, sys, &fmt->i_format,
fmt->i_physical_channels, fmt->i_rate, false ) fmt->i_physical_channels, fmt->i_rate, false );
!= VLC_SUCCESS ) if( hr != DS_OK )
{ {
msg_Err( p_aout, "cannot open directx audio device" ); msg_Err( obj, "cannot open directx audio device" );
goto error; goto error;
} }
} }
p_aout->sys->i_write = 0;
sys->i_write = 0;
return DS_OK;
error:
Stop( sys );
return hr;
}
/**
* Handles all the gory details of DirectSound initialization.
*/
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);
OurDirectSoundCreate = (void *)
GetProcAddress( p_aout->sys->hdsound_dll,
"DirectSoundCreate" );
if( OurDirectSoundCreate == NULL )
{
msg_Warn( p_aout, "GetProcAddress FAILED" );
goto error;
}
char *dev = var_GetNonEmptyString( p_aout, "directx-audio-device" );
if( dev != NULL )
{
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_guid, &sys->s.p_dsobject, NULL ) )
{
msg_Warn( p_aout, "cannot create a direct sound device" );
goto error;
}
return VLC_SUCCESS;
error:
sys->s.p_dsobject = NULL;
return VLC_EGENERIC;
}
static int VolumeSet( audio_output_t *p_aout, float volume )
{
aout_sys_t *sys = p_aout->sys;
int ret = 0;
/* Directsound doesn't support amplification, so we use software
gain if we need it and only for this */
float gain = volume > 1.f ? volume * volume * volume : 1.f;
aout_GainRequest( p_aout, gain );
/* millibels from linear amplification */
LONG mb = lroundf( 6000.f * log10f( __MIN( volume, 1.f ) ));
/* Clamp to allowed DirectSound range */
static_assert( DSBVOLUME_MIN < DSBVOLUME_MAX, "DSBVOLUME_* confused" );
if( mb > DSBVOLUME_MAX )
{
mb = DSBVOLUME_MAX;
ret = -1;
}
if( mb <= DSBVOLUME_MIN )
mb = DSBVOLUME_MIN;
sys->volume.mb = mb;
sys->volume.volume = volume;
if( !sys->volume.mute && sys->s.p_dsbuffer != NULL &&
IDirectSoundBuffer_SetVolume( sys->s.p_dsbuffer, mb ) != DS_OK )
return -1;
/* Convert back to UI volume */
aout_VolumeReport( p_aout, volume );
if( var_InheritBool( p_aout, "volume-save" ) )
config_PutFloat( p_aout, "directx-volume", volume );
return ret;
}
static int MuteSet( audio_output_t *p_aout, bool mute )
{
HRESULT res = DS_OK;
aout_sys_t *sys = p_aout->sys;
sys->volume.mute = mute;
if( sys->s.p_dsbuffer != NULL )
res = IDirectSoundBuffer_SetVolume( sys->s.p_dsbuffer,
mute? DSBVOLUME_MIN : sys->volume.mb );
aout_MuteReport( p_aout, mute );
return (res != DS_OK);
}
static int OutputStart( audio_output_t *p_aout,
audio_sample_format_t *restrict fmt )
{
msg_Dbg( p_aout, "Opening DirectSound Audio Output" );
/* Initialise DirectSound */
if( InitDirectSound( p_aout ) )
{
msg_Err( p_aout, "cannot initialize DirectSound" );
return -1;
}
HRESULT hr = Start( VLC_OBJECT(p_aout), &p_aout->sys->s, fmt );
if( FAILED(hr) )
return -1;
/* Force volume update */ /* Force volume update */
VolumeSet( p_aout, p_aout->sys->volume.volume ); VolumeSet( p_aout, p_aout->sys->volume.volume );
MuteSet( p_aout, p_aout->sys->volume.mute ); MuteSet( p_aout, p_aout->sys->volume.mute );
/* then launch the notification thread */ /* then launch the notification thread */
p_aout->time_get = TimeGet; p_aout->time_get = OutputTimeGet;
p_aout->play = Play; p_aout->play = OutputPlay;
p_aout->pause = Pause; p_aout->pause = OutputPause;
p_aout->flush = Flush; p_aout->flush = OutputFlush;
return VLC_SUCCESS; return 0;
error:
Stop( p_aout );
return VLC_EGENERIC;
} }
typedef struct typedef struct
...@@ -876,8 +924,8 @@ static int Open(vlc_object_t *obj) ...@@ -876,8 +924,8 @@ static int Open(vlc_object_t *obj)
sys->hdsound_dll = hdsound_dll; sys->hdsound_dll = hdsound_dll;
aout->sys = sys; aout->sys = sys;
aout->start = Start; aout->start = OutputStart;
aout->stop = Stop; aout->stop = OutputStop;
aout->volume_set = VolumeSet; aout->volume_set = VolumeSet;
aout->mute_set = MuteSet; aout->mute_set = MuteSet;
aout->device_select = DeviceSelect; aout->device_select = DeviceSelect;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment