directx.c 49.5 KB
Newer Older
1
/*****************************************************************************
2
 * directx.c: Windows DirectX audio output method
3
 *****************************************************************************
4
 * Copyright (C) 2001-2009 the VideoLAN team
5
 * $Id$
6
 *
7
 * Authors: Gildas Bazin <gbazin@videolan.org>
8 9 10 11 12 13 14 15 16 17 18 19 20
 *
 * 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
 * (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.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
dionoea's avatar
dionoea committed
21
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
22 23 24 25 26 27
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/

28 29 30 31
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

32
#include <vlc_common.h>
33
#include <vlc_plugin.h>
zorglub's avatar
zorglub committed
34
#include <vlc_aout.h>
35
#include <vlc_charset.h>
36

gbazin's avatar
 
gbazin committed
37
#include <windows.h>
38 39 40
#include <mmsystem.h>
#include <dsound.h>

41 42
#define FRAME_SIZE ((int)p_aout->output.output.i_rate/20) /* Size in samples */
#define FRAMES_NUM 8                                      /* Needs to be > 3 */
gbazin's avatar
 
gbazin committed
43

44 45 46 47 48 49 50
/*****************************************************************************
 * DirectSound GUIDs.
 * Defining them here allows us to get rid of the dxguid library during
 * the linking stage.
 *****************************************************************************/
#include <initguid.h>

gbazin's avatar
 
gbazin committed
51 52 53 54 55 56 57
/*****************************************************************************
 * Useful macros
 *****************************************************************************/
#ifndef WAVE_FORMAT_IEEE_FLOAT
#   define WAVE_FORMAT_IEEE_FLOAT 0x0003
#endif

gbazin's avatar
 
gbazin committed
58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
#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

88 89 90
#ifndef DSSPEAKER_DSSPEAKER_DIRECTOUT
#   define DSSPEAKER_DSSPEAKER_DIRECTOUT         0x00000000
#endif
gbazin's avatar
 
gbazin committed
91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
#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
109 110 111 112 113 114 115 116 117
#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
gbazin's avatar
 
gbazin committed
118

gbazin's avatar
 
gbazin committed
119 120 121 122 123 124 125 126 127 128 129 130 131 132
#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

Jean-Baptiste Kempf's avatar
Jean-Baptiste Kempf committed
133

gbazin's avatar
 
gbazin committed
134 135 136
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 );
gbazin's avatar
 
gbazin committed
137

138 139 140 141 142 143 144
/*****************************************************************************
 * notification_thread_t: DirectX event thread
 *****************************************************************************/
typedef struct notification_thread_t
{
    VLC_COMMON_MEMBERS

145 146 147
    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 */
gbazin's avatar
 
gbazin committed
148 149

    mtime_t start_date;
150
    HANDLE event;
151 152 153 154 155 156 157 158 159 160 161

} notification_thread_t;

/*****************************************************************************
 * aout_sys_t: directx audio output method descriptor
 *****************************************************************************
 * This structure is part of the audio output thread descriptor.
 * It describes the direct sound specific properties of an audio device.
 *****************************************************************************/
struct aout_sys_t
{
gbazin's avatar
 
gbazin committed
162
    HINSTANCE           hdsound_dll;      /* handle of the opened dsound dll */
163

164
    char *              psz_device;         /* user defined device name */
165 166
    LPGUID              p_device_guid;

167 168 169 170 171
    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) */

gbazin's avatar
 
gbazin committed
172
    notification_thread_t *p_notif;                  /* DirectSoundThread id */
173

gbazin's avatar
 
gbazin committed
174
    int b_playing;                                         /* playing status */
175

gbazin's avatar
 
gbazin committed
176
    int i_frame_size;                         /* Size in bytes of one frame */
gbazin's avatar
 
gbazin committed
177

178 179
    int i_speaker_setup;                 /* Speaker setup override */

180
    bool b_chan_reorder;              /* do we need channel reordering */
181
    int pi_chan_table[AOUT_CHAN_MAX];
gbazin's avatar
 
gbazin committed
182
    uint32_t i_channel_mask;
183 184
    uint32_t i_bits_per_sample;
    uint32_t i_channels;
185 186
};

187
static const uint32_t pi_channels_src[] =
gbazin's avatar
 
gbazin committed
188
    { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
189
      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
190
      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
191 192 193 194
      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,
195
      SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, SPEAKER_BACK_CENTER,
196
      SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY, 0 };
gbazin's avatar
 
gbazin committed
197 198
static const uint32_t pi_channels_out[] =
    { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT,
199
      SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY,
gbazin's avatar
 
gbazin committed
200
      SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT,
201
      SPEAKER_BACK_CENTER,
202
      SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT, 0 };
gbazin's avatar
 
gbazin committed
203

204 205 206
/*****************************************************************************
 * Local prototypes.
 *****************************************************************************/
gbazin's avatar
 
gbazin committed
207 208 209
static int  OpenAudio  ( vlc_object_t * );
static void CloseAudio ( vlc_object_t * );
static void Play       ( aout_instance_t * );
210 211

/* local functions */
gbazin's avatar
 
gbazin committed
212 213
static void Probe             ( aout_instance_t * );
static int  InitDirectSound   ( aout_instance_t * );
214
static int  CreateDSBuffer    ( aout_instance_t *, int, int, int, int, int, bool );
215
static int  CreateDSBufferPCM ( aout_instance_t *, vlc_fourcc_t*, int, int, int, bool );
gbazin's avatar
 
gbazin committed
216
static void DestroyDSBuffer   ( aout_instance_t * );
217
static void* DirectSoundThread( vlc_object_t * );
gbazin's avatar
 
gbazin committed
218 219
static int  FillBuffer        ( aout_instance_t *, int, aout_buffer_t * );

220 221 222
static int ReloadDirectXDevices( vlc_object_t *, char const *,
                                vlc_value_t, vlc_value_t, void * );

223 224 225
/* Speaker setup override options list */
static const char *const speaker_list[] = { "Windows default", "Mono", "Stereo",
                                            "Quad", "5.1", "7.1" };
226 227
static const char *const ppsz_adev[] = {"default",  };
static const char *const ppsz_adev_text[] = {"default", };
228

gbazin's avatar
 
gbazin committed
229 230 231
/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
232
#define DEVICE_TEXT N_("Output device")
233
#define DEVICE_LONGTEXT N_("Select your audio output device")
234 235 236 237
#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)." )
238
#define SPEAKER_TEXT N_("Speaker configuration")
239 240
#define SPEAKER_LONGTEXT N_("Select speaker configuration you want to use. " \
    "This option doesn't upmix! So NO e.g. Stereo -> 5.1 conversion." )
241

242 243 244 245 246 247 248
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" )
249 250 251 252
    add_string( "directx-audio-device-name", "default", NULL,
             DEVICE_TEXT, DEVICE_LONGTEXT, false )
    change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
    change_action_add( ReloadDirectXDevices, N_("Refresh list") )
ivoire's avatar
ivoire committed
253
    add_bool( "directx-audio-float32", false, NULL, FLOAT_TEXT,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
254
              FLOAT_LONGTEXT, true )
255 256 257 258
    add_string( "directx-audio-speaker", "Windows default", NULL,
                 SPEAKER_TEXT, SPEAKER_LONGTEXT, true )
        change_string_list( speaker_list, 0, 0 )
        change_need_restart ()
259

260 261
    set_callbacks( OpenAudio, CloseAudio )
vlc_module_end ()
gbazin's avatar
 
gbazin committed
262

263 264 265 266 267
/*****************************************************************************
 * OpenAudio: open the audio device
 *****************************************************************************
 * This function opens and setups Direct Sound.
 *****************************************************************************/
gbazin's avatar
 
gbazin committed
268
static int OpenAudio( vlc_object_t *p_this )
269
{
gbazin's avatar
 
gbazin committed
270
    aout_instance_t * p_aout = (aout_instance_t *)p_this;
gbazin's avatar
 
gbazin committed
271
    vlc_value_t val;
272 273 274 275
    char * psz_speaker;
    int i = 0;

    const char * const * ppsz_compare = speaker_list;
276

gbazin's avatar
 
gbazin committed
277
    msg_Dbg( p_aout, "OpenAudio" );
278 279

   /* Allocate structure */
gbazin's avatar
 
gbazin committed
280 281
    p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
    if( p_aout->output.p_sys == NULL )
282
        return VLC_ENOMEM;
283 284

    /* Initialize some variables */
gbazin's avatar
 
gbazin committed
285 286 287
    p_aout->output.p_sys->p_dsobject = NULL;
    p_aout->output.p_sys->p_dsbuffer = NULL;
    p_aout->output.p_sys->p_notif = NULL;
gbazin's avatar
 
gbazin committed
288
    p_aout->output.p_sys->b_playing = 0;
gbazin's avatar
 
gbazin committed
289 290

    p_aout->output.pf_play = Play;
291
    aout_VolumeSoftInit( p_aout );
292

293 294 295
    /* Retrieve config values */
    var_Create( p_aout, "directx-audio-float32",
                VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
296
    psz_speaker = var_CreateGetString( p_aout, "directx-audio-speaker" );
297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313

    while ( *ppsz_compare != NULL )
    {
        if ( !strncmp( *ppsz_compare, psz_speaker, strlen(*ppsz_compare) ) )
        {
            break;
        }
        ppsz_compare++; i++;
    }

    if ( *ppsz_compare == NULL )
    {
        msg_Err( p_aout, "(%s) isn't valid speaker setup option",
                 psz_speaker );
        msg_Err( p_aout, "Defaulting to Windows default speaker config");
        i = 0;
    }
314
    free( psz_speaker );
315 316
    p_aout->output.p_sys->i_speaker_setup = i;

317 318
    p_aout->output.p_sys->p_device_guid = 0;

319
    /* Initialise DirectSound */
gbazin's avatar
 
gbazin committed
320
    if( InitDirectSound( p_aout ) )
321
    {
gbazin's avatar
 
gbazin committed
322 323
        msg_Err( p_aout, "cannot initialize DirectSound" );
        goto error;
324 325
    }

gbazin's avatar
 
gbazin committed
326 327 328 329 330 331 332 333
    if( var_Type( p_aout, "audio-device" ) == 0 )
    {
        Probe( p_aout );
    }

    if( var_Get( p_aout, "audio-device", &val ) < 0 )
    {
        /* Probe() has failed. */
gbazin's avatar
 
gbazin committed
334
        goto error;
gbazin's avatar
 
gbazin committed
335 336 337
    }

    /* Open the device */
gbazin's avatar
 
gbazin committed
338
    if( val.i_int == AOUT_VAR_SPDIF )
339
    {
340
        p_aout->output.output.i_format = VLC_CODEC_SPDIFL;
gbazin's avatar
 
gbazin committed
341 342 343 344 345 346 347 348

        /* 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;

349
        if( CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL,
gbazin's avatar
 
gbazin committed
350 351 352
                            p_aout->output.output.i_physical_channels,
                            aout_FormatNbChannels( &p_aout->output.output ),
                            p_aout->output.output.i_rate,
353
                            p_aout->output.p_sys->i_frame_size, false )
gbazin's avatar
 
gbazin committed
354 355
            != VLC_SUCCESS )
        {
gbazin's avatar
 
gbazin committed
356
            msg_Err( p_aout, "cannot open directx audio device" );
gbazin's avatar
 
gbazin committed
357 358 359 360 361 362 363 364
            free( p_aout->output.p_sys );
            return VLC_EGENERIC;
        }

        aout_VolumeNoneInit( p_aout );
    }
    else
    {
gbazin's avatar
 
gbazin committed
365
        if( val.i_int == AOUT_VAR_5_1 )
gbazin's avatar
 
gbazin committed
366 367 368 369 370 371
        {
            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;
        }
372 373 374 375 376 377 378 379
        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;
        }
380 381 382 383 384 385
        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;
        }
gbazin's avatar
 
gbazin committed
386
        else if( val.i_int == AOUT_VAR_2F2R )
gbazin's avatar
 
gbazin committed
387 388 389 390 391
        {
            p_aout->output.output.i_physical_channels
                = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
                   | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
        }
gbazin's avatar
 
gbazin committed
392
        else if( val.i_int == AOUT_VAR_MONO )
gbazin's avatar
 
gbazin committed
393 394 395 396 397 398 399 400
        {
            p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
        }
        else
        {
            p_aout->output.output.i_physical_channels
                = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
        }
401

gbazin's avatar
 
gbazin committed
402 403 404
        if( CreateDSBufferPCM( p_aout, &p_aout->output.output.i_format,
                               p_aout->output.output.i_physical_channels,
                               aout_FormatNbChannels( &p_aout->output.output ),
405
                               p_aout->output.output.i_rate, false )
gbazin's avatar
 
gbazin committed
406
            != VLC_SUCCESS )
gbazin's avatar
 
gbazin committed
407
        {
gbazin's avatar
 
gbazin committed
408
            msg_Err( p_aout, "cannot open directx audio device" );
gbazin's avatar
 
gbazin committed
409 410
            free( p_aout->output.p_sys );
            return VLC_EGENERIC;
gbazin's avatar
 
gbazin committed
411
        }
gbazin's avatar
 
gbazin committed
412 413 414 415 416

        /* Calculate the frame size in bytes */
        p_aout->output.i_nb_samples = FRAME_SIZE;
        aout_FormatPrepare( &p_aout->output.output );
        aout_VolumeSoftInit( p_aout );
gbazin's avatar
 
gbazin committed
417
    }
418

419 420 421 422 423 424 425 426 427
    /* 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;

Christophe Massiot's avatar
Christophe Massiot committed
428 429 430 431
    /* 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",
gbazin's avatar
 
gbazin committed
432
                           DirectSoundThread,
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
433
                           VLC_THREAD_PRIORITY_HIGHEST ) )
Christophe Massiot's avatar
Christophe Massiot committed
434 435
    {
        msg_Err( p_aout, "cannot create DirectSoundThread" );
436
        CloseHandle( p_aout->output.p_sys->p_notif->event );
437
        vlc_object_release( p_aout->output.p_sys->p_notif );
438
        p_aout->output.p_sys->p_notif = NULL;
Christophe Massiot's avatar
Christophe Massiot committed
439 440 441 442 443
        goto error;
    }

    vlc_object_attach( p_aout->output.p_sys->p_notif, p_aout );

gbazin's avatar
 
gbazin committed
444
    return VLC_SUCCESS;
Christophe Massiot's avatar
Christophe Massiot committed
445 446

 error:
gbazin's avatar
 
gbazin committed
447
    CloseAudio( VLC_OBJECT(p_aout) );
448
    return VLC_EGENERIC;
gbazin's avatar
 
gbazin committed
449 450
}

gbazin's avatar
 
gbazin committed
451 452 453 454 455
/*****************************************************************************
 * Probe: probe the audio device for available formats and channels
 *****************************************************************************/
static void Probe( aout_instance_t * p_aout )
{
gbazin's avatar
 
gbazin committed
456
    vlc_value_t val, text;
457
    vlc_fourcc_t i_format;
gbazin's avatar
 
gbazin committed
458 459
    unsigned int i_physical_channels;
    DWORD ui_speaker_config;
460
    bool is_default_output_set = false;
gbazin's avatar
 
gbazin committed
461

gbazin's avatar
 
gbazin committed
462
    var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
463
    text.psz_string = _("Audio Device");
gbazin's avatar
 
gbazin committed
464
    var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
gbazin's avatar
 
gbazin committed
465 466 467 468 469 470 471 472

    /* 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,
473
                               p_aout->output.output.i_rate, true )
gbazin's avatar
 
gbazin committed
474 475
            == VLC_SUCCESS )
        {
gbazin's avatar
 
gbazin committed
476
            val.i_int = AOUT_VAR_5_1;
477
            text.psz_string = (char*) "5.1";
gbazin's avatar
 
gbazin committed
478 479
            var_Change( p_aout, "audio-device",
                        VLC_VAR_ADDCHOICE, &val, &text );
480 481
            var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
            is_default_output_set = true;
gbazin's avatar
 
gbazin committed
482 483 484 485
            msg_Dbg( p_aout, "device supports 5.1 channels" );
        }
    }

486 487 488 489 490
    /* 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;
ivoire's avatar
ivoire committed
491 492 493
    if( p_aout->output.output.i_physical_channels == i_physical_channels )
    {
        if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 8,
494
                                  p_aout->output.output.i_rate, true )
ivoire's avatar
ivoire committed
495 496 497 498 499 500 501 502 503 504 505
            == 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" );
        }
    }
506

507 508 509 510 511 512 513
    /* 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,
514
                               p_aout->output.output.i_rate, true )
515 516 517
            == VLC_SUCCESS )
        {
            val.i_int = AOUT_VAR_3F2R;
518
            text.psz_string = _("3 Front 2 Rear");
519 520
            var_Change( p_aout, "audio-device",
                        VLC_VAR_ADDCHOICE, &val, &text );
521 522 523 524 525
            if(!is_default_output_set)
            {
                var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
                is_default_output_set = true;
            }
526 527 528 529
            msg_Dbg( p_aout, "device supports 5 channels" );
        }
    }

gbazin's avatar
 
gbazin committed
530 531 532 533 534 535 536
    /* 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,
537
                               p_aout->output.output.i_rate, true )
gbazin's avatar
 
gbazin committed
538 539
            == VLC_SUCCESS )
        {
gbazin's avatar
 
gbazin committed
540
            val.i_int = AOUT_VAR_2F2R;
541
            text.psz_string = _("2 Front 2 Rear");
gbazin's avatar
 
gbazin committed
542 543
            var_Change( p_aout, "audio-device",
                        VLC_VAR_ADDCHOICE, &val, &text );
544 545 546 547 548
            if(!is_default_output_set)
            {
                var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
                is_default_output_set = true;
            }
gbazin's avatar
 
gbazin committed
549 550 551 552 553 554 555
            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,
556
                           p_aout->output.output.i_rate, true )
gbazin's avatar
 
gbazin committed
557 558
        == VLC_SUCCESS )
    {
gbazin's avatar
 
gbazin committed
559
        val.i_int = AOUT_VAR_STEREO;
560
        text.psz_string = _("Stereo");
gbazin's avatar
 
gbazin committed
561
        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
562 563 564 565 566 567
        if(!is_default_output_set)
        {
            var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
            is_default_output_set = true;
            msg_Dbg( p_aout, "device supports 2 channels (DEFAULT!)" );
        }
568
        else msg_Dbg( p_aout, "device supports 2 channels" );
gbazin's avatar
 
gbazin committed
569 570 571 572 573
    }

    /* Test for mono support */
    i_physical_channels = AOUT_CHAN_CENTER;
    if( CreateDSBufferPCM( p_aout, &i_format, i_physical_channels, 1,
574
                           p_aout->output.output.i_rate, true )
gbazin's avatar
 
gbazin committed
575 576
        == VLC_SUCCESS )
    {
gbazin's avatar
 
gbazin committed
577
        val.i_int = AOUT_VAR_MONO;
578
        text.psz_string = _("Mono");
gbazin's avatar
 
gbazin committed
579
        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
gbazin's avatar
 
gbazin committed
580 581 582 583 584 585 586 587 588
        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;
589
        msg_Dbg( p_aout, "GetSpeakerConfig failed" );
gbazin's avatar
 
gbazin committed
590 591 592
    }
    switch( DSSPEAKER_CONFIG(ui_speaker_config) )
    {
593
    case DSSPEAKER_7POINT1:
594
        msg_Dbg( p_aout, "Windows says your SpeakerConfig is 7.1" );
595 596
        val.i_int = AOUT_VAR_7_1;
        break;
gbazin's avatar
 
gbazin committed
597
    case DSSPEAKER_5POINT1:
598
        msg_Dbg( p_aout, "Windows says your SpeakerConfig is 5.1" );
gbazin's avatar
 
gbazin committed
599
        val.i_int = AOUT_VAR_5_1;
gbazin's avatar
 
gbazin committed
600 601
        break;
    case DSSPEAKER_QUAD:
602
        msg_Dbg( p_aout, "Windows says your SpeakerConfig is Quad" );
gbazin's avatar
 
gbazin committed
603
        val.i_int = AOUT_VAR_2F2R;
gbazin's avatar
 
gbazin committed
604
        break;
gbazin's avatar
 
gbazin committed
605 606
#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. */
gbazin's avatar
 
gbazin committed
607
    case DSSPEAKER_MONO:
gbazin's avatar
 
gbazin committed
608
        val.i_int = AOUT_VAR_MONO;
gbazin's avatar
 
gbazin committed
609
        break;
gbazin's avatar
 
gbazin committed
610
#endif
gbazin's avatar
 
gbazin committed
611
    case DSSPEAKER_SURROUND:
612
        msg_Dbg( p_aout, "Windows says your SpeakerConfig is surround" );
gbazin's avatar
 
gbazin committed
613
    case DSSPEAKER_STEREO:
614
        msg_Dbg( p_aout, "Windows says your SpeakerConfig is stereo" );
gbazin's avatar
 
gbazin committed
615
    default:
616
        /* If nothing else is found, choose stereo output */
gbazin's avatar
 
gbazin committed
617
        val.i_int = AOUT_VAR_STEREO;
gbazin's avatar
 
gbazin committed
618 619
        break;
    }
620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650

    /* Check if we want to override speaker config */
    switch( p_aout->output.p_sys->i_speaker_setup )
    {
    case 0: /* Default value aka Windows default speaker setup */
        break;
    case 1: /* Mono */
        msg_Dbg( p_aout, "SpeakerConfig is forced to Mono" );
        val.i_int = AOUT_VAR_MONO;
        break;
    case 2: /* Stereo */
        msg_Dbg( p_aout, "SpeakerConfig is forced to Stereo" );
        val.i_int = AOUT_VAR_STEREO;
        break;
    case 3: /* Quad */
        msg_Dbg( p_aout, "SpeakerConfig is forced to Quad" );
        val.i_int = AOUT_VAR_2F2R;
        break;
    case 4: /* 5.1 */
        msg_Dbg( p_aout, "SpeakerConfig is forced to 5.1" );
        val.i_int = AOUT_VAR_5_1;
        break;
    case 5: /* 7.1 */
        msg_Dbg( p_aout, "SpeakerConfig is forced to 7.1" );
        val.i_int = AOUT_VAR_7_1;
        break;
    default:
        msg_Dbg( p_aout, "SpeakerConfig is forced to non-existing value" );
        break;
    }

gbazin's avatar
 
gbazin committed
651 652
    var_Set( p_aout, "audio-device", val );

gbazin's avatar
 
gbazin committed
653 654 655
    /* Test for SPDIF support */
    if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
    {
656
        if( CreateDSBuffer( p_aout, VLC_CODEC_SPDIFL,
gbazin's avatar
 
gbazin committed
657 658 659
                            p_aout->output.output.i_physical_channels,
                            aout_FormatNbChannels( &p_aout->output.output ),
                            p_aout->output.output.i_rate,
660
                            AOUT_SPDIF_SIZE, true )
gbazin's avatar
 
gbazin committed
661 662 663
            == VLC_SUCCESS )
        {
            msg_Dbg( p_aout, "device supports A/52 over S/PDIF" );
gbazin's avatar
 
gbazin committed
664
            val.i_int = AOUT_VAR_SPDIF;
665
            text.psz_string = _("A/52 over S/PDIF");
gbazin's avatar
 
gbazin committed
666 667
            var_Change( p_aout, "audio-device",
                        VLC_VAR_ADDCHOICE, &val, &text );
gbazin's avatar
 
gbazin committed
668 669 670 671 672
            if( config_GetInt( p_aout, "spdif" ) )
                var_Set( p_aout, "audio-device", val );
        }
    }

gbazin's avatar
 
gbazin committed
673 674 675 676 677 678 679 680
    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;
    }

gbazin's avatar
 
gbazin committed
681
    var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
682
    var_SetBool( p_aout, "intf-change", true );
gbazin's avatar
 
gbazin committed
683 684
}

gbazin's avatar
 
gbazin committed
685
/*****************************************************************************
gbazin's avatar
 
gbazin committed
686 687 688
 * 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.
gbazin's avatar
 
gbazin committed
689
 *****************************************************************************/
690
static void Play( aout_instance_t *p_aout )
gbazin's avatar
 
gbazin committed
691
{
gbazin's avatar
 
gbazin committed
692 693 694
    if( !p_aout->output.p_sys->b_playing )
    {
        aout_buffer_t *p_buffer;
695
        int i;
gbazin's avatar
 
gbazin committed
696 697 698 699 700 701 702 703

        p_aout->output.p_sys->b_playing = 1;

        /* get the playing date of the first aout buffer */
        p_aout->output.p_sys->p_notif->start_date =
            aout_FifoFirstDate( p_aout, &p_aout->output.fifo );

        /* fill in the first samples */
704 705 706 707 708 709
        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 );
        }
gbazin's avatar
 
gbazin committed
710 711

        /* wake up the audio output thread */
712
        SetEvent( p_aout->output.p_sys->p_notif->event );
gbazin's avatar
 
gbazin committed
713
    }
714 715 716 717 718
}

/*****************************************************************************
 * CloseAudio: close the audio device
 *****************************************************************************/
gbazin's avatar
 
gbazin committed
719
static void CloseAudio( vlc_object_t *p_this )
720
{
gbazin's avatar
 
gbazin committed
721
    aout_instance_t * p_aout = (aout_instance_t *)p_this;
722
    aout_sys_t *p_sys = p_aout->output.p_sys;
723

724
    msg_Dbg( p_aout, "closing audio device" );
725 726

    /* kill the position notification thread, if any */
727
    if( p_sys->p_notif )
728
    {
729
        vlc_object_detach( p_sys->p_notif );
730 731 732
        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 );
gbazin's avatar
 
gbazin committed
733

734
        vlc_thread_join( p_sys->p_notif );
735
        vlc_object_release( p_sys->p_notif );
736 737 738
    }

    /* release the secondary buffer */
gbazin's avatar
 
gbazin committed
739
    DestroyDSBuffer( p_aout );
740 741

    /* finally release the DirectSound object */
742
    if( p_sys->p_dsobject ) IDirectSound_Release( p_sys->p_dsobject );
743

744
    /* free DSOUND.DLL */
745
    if( p_sys->hdsound_dll ) FreeLibrary( p_sys->hdsound_dll );
gbazin's avatar
 
gbazin committed
746

747
    free( p_aout->output.p_sys->p_device_guid );
748
    free( p_sys );
749 750
}

751 752 753 754 755 756
/*****************************************************************************
 * CallBackDirectSoundEnum: callback to enumerate available devices
 *****************************************************************************/
static int CALLBACK CallBackDirectSoundEnum( LPGUID p_guid, LPCSTR psz_desc,
                                             LPCSTR psz_mod, LPVOID _p_aout )
{
757 758
    VLC_UNUSED( psz_mod );

759 760 761 762
    aout_instance_t *p_aout = (aout_instance_t *)_p_aout;

    msg_Dbg( p_aout, "found device: %s", psz_desc );

763
    if( p_aout->output.p_sys->psz_device && !strcmp(p_aout->output.p_sys->psz_device, psz_desc) && p_guid )
764
    {
765
        /* Use the device corresponding to psz_device */
766 767 768 769
        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 );
    }
770 771 772 773 774 775 776 777 778 779 780
    else
    {
        /* If no default device has been selected, chose the first one */
        if( !p_aout->output.p_sys->psz_device && p_guid )
        {
            p_aout->output.p_sys->psz_device = strdup( psz_desc );
            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 );
        }
    }
781 782 783
    return 1;
}

784
/*****************************************************************************
gbazin's avatar
 
gbazin committed
785
 * InitDirectSound: handle all the gory details of DirectSound initialisation
786
 *****************************************************************************/
gbazin's avatar
 
gbazin committed
787
static int InitDirectSound( aout_instance_t *p_aout )
788 789
{
    HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
790
    HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACK, LPVOID);
791

gbazin's avatar
 
gbazin committed
792 793
    p_aout->output.p_sys->hdsound_dll = LoadLibrary("DSOUND.DLL");
    if( p_aout->output.p_sys->hdsound_dll == NULL )
794
    {
gbazin's avatar
 
gbazin committed
795 796
        msg_Warn( p_aout, "cannot open DSOUND.DLL" );
        goto error;
797 798
    }

799 800 801
    OurDirectSoundCreate = (void *)
        GetProcAddress( p_aout->output.p_sys->hdsound_dll,
                        "DirectSoundCreate" );
802 803
    if( OurDirectSoundCreate == NULL )
    {
gbazin's avatar
 
gbazin committed
804 805
        msg_Warn( p_aout, "GetProcAddress FAILED" );
        goto error;
806 807
    }

808 809 810 811 812 813
    /* Get DirectSoundEnumerate */
    OurDirectSoundEnumerate = (void *)
       GetProcAddress( p_aout->output.p_sys->hdsound_dll,
                       "DirectSoundEnumerateA" );
    if( OurDirectSoundEnumerate )
    {
814
        p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name");
815
        /* Attempt enumeration */
816
        if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum,
817 818 819 820 821 822
                                             p_aout ) ) )
        {
            msg_Dbg( p_aout, "enumeration of DirectSound devices failed" );
        }
    }

823
    /* Create the direct sound object */
824
    if FAILED( OurDirectSoundCreate( p_aout->output.p_sys->p_device_guid,
825
                                     &p_aout->output.p_sys->p_dsobject,
gbazin's avatar
 
gbazin committed
826
                                     NULL ) )
827 828
    {
        msg_Warn( p_aout, "cannot create a direct sound device" );
gbazin's avatar
 
gbazin committed
829
        goto error;
830 831 832 833 834 835 836 837 838 839 840 841
    }

    /* Set DirectSound Cooperative level, ie what control we want over Windows
     * 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
     * application will be hearable when it will have the focus.
     * !!! (this is not really working as intended yet because to set the
     * cooperative level you need the window handle of your application, and
     * I don't know of any easy way to get it. Especially since we might play
     * 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 */
gbazin's avatar
 
gbazin committed
842 843 844
    if( IDirectSound_SetCooperativeLevel( p_aout->output.p_sys->p_dsobject,
                                          GetDesktopWindow(),
                                          DSSCL_EXCLUSIVE) )
845 846 847 848
    {
        msg_Warn( p_aout, "cannot set direct sound cooperative level" );
    }

gbazin's avatar
 
gbazin committed
849
    return VLC_SUCCESS;
gbazin's avatar
 
gbazin committed
850 851 852 853 854 855 856 857

 error:
    p_aout->output.p_sys->p_dsobject = NULL;
    if( p_aout->output.p_sys->hdsound_dll )
    {
        FreeLibrary( p_aout->output.p_sys->hdsound_dll );
        p_aout->output.p_sys->hdsound_dll = NULL;
    }
gbazin's avatar
 
gbazin committed
858
    return VLC_EGENERIC;
gbazin's avatar
 
gbazin committed
859

860 861 862
}

/*****************************************************************************
gbazin's avatar
 
gbazin committed
863
 * CreateDSBuffer: Creates a direct sound buffer of the required format.
864 865 866 867 868 869 870 871
 *****************************************************************************
 * This function creates the buffer we'll use to play audio.
 * In DirectSound there are two kinds of buffers:
 * - the primary buffer: which is the actual buffer that the soundcard plays
 * - the secondary buffer(s): these buffers are the one actually used by
 *    applications and DirectSound takes care of mixing them into the primary.
 *
 * Once you create a secondary buffer, you cannot change its format anymore so
gbazin's avatar
 
gbazin committed
872
 * you have to release the current one and create another.
873
 *****************************************************************************/
gbazin's avatar
 
gbazin committed
874 875
static int CreateDSBuffer( aout_instance_t *p_aout, int i_format,
                           int i_channels, int i_nb_channels, int i_rate,
876
                           int i_bytes_per_frame, bool b_probe )
877
{
gbazin's avatar
 
gbazin committed
878
    WAVEFORMATEXTENSIBLE waveformat;
879
    DSBUFFERDESC         dsbdesc;
gbazin's avatar
 
gbazin committed
880
    unsigned int         i;
881

gbazin's avatar
 
gbazin committed
882 883
    /* First set the sound buffer format */
    waveformat.dwChannelMask = 0;
884
    for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
gbazin's avatar
 
gbazin committed
885
    {
886 887
        if( i_channels & pi_channels_src[i] )
            waveformat.dwChannelMask |= pi_channels_in[i];
888
    }
gbazin's avatar
 
gbazin committed
889

gbazin's avatar
 
gbazin committed
890
    switch( i_format )
gbazin's avatar
 
gbazin committed
891
    {
892
    case VLC_CODEC_SPDIFL:
gbazin's avatar
 
gbazin committed
893
        i_nb_channels = 2;
gbazin's avatar
 
gbazin committed
894 895
        /* To prevent channel re-ordering */
        waveformat.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
gbazin's avatar
 
gbazin committed
896 897 898 899
        waveformat.Format.wBitsPerSample = 16;
        waveformat.Samples.wValidBitsPerSample =
            waveformat.Format.wBitsPerSample;
        waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF;
gbazin's avatar
 
gbazin committed
900
        waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
gbazin's avatar
 
gbazin committed
901
        break;
gbazin's avatar
 
gbazin committed
902

903
    case VLC_CODEC_FL32:
gbazin's avatar
 
gbazin committed
904 905 906 907
        waveformat.Format.wBitsPerSample = sizeof(float) * 8;
        waveformat.Samples.wValidBitsPerSample =
            waveformat.Format.wBitsPerSample;
        waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
gbazin's avatar
 
gbazin committed
908
        waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
gbazin's avatar
 
gbazin committed
909 910
        break;

911
    case VLC_CODEC_S16L:
gbazin's avatar
 
gbazin committed
912 913 914 915
        waveformat.Format.wBitsPerSample = 16;
        waveformat.Samples.wValidBitsPerSample =
            waveformat.Format.wBitsPerSample;
        waveformat.Format.wFormatTag = WAVE_FORMAT_PCM;
gbazin's avatar
 
gbazin committed
916
        waveformat.SubFormat = _KSDATAFORMAT_SUBTYPE_PCM;
gbazin's avatar
 
gbazin committed
917 918
        break;
    }