[vlc-commits] [Git][videolan/vlc][master] Revert "wasapi: fix passthrough with DTS WAV"

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
17e10e0a by Thomas Guillem at 2021-11-11T11:57:27+00:00
Revert "wasapi: fix passthrough with DTS WAV"

I hate the myself of 2years ago for the lack of explanion on the
original commit. But DTS 14b inside WAV is now played as PCM, using the
same receiver with the same Windows machine than 2 years ago.

Reverting this commit fix it (for 14b and 16b). Maybe a receiver or a
Windows update fixed it ?

This reverts commit 3c68e5ff1ff8da2936da1db4bd9b4e2c4c93c06b.

- - - - -


1 changed file:

- modules/audio_output/wasapi.c


Changes:

=====================================
modules/audio_output/wasapi.c
=====================================
@@ -44,11 +44,6 @@ DEFINE_GUID(_KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_DIGITAL,
             WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00,
             0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
-/* 00000001-0000-0010-8000-00aa00389b71 */
-DEFINE_GUID(_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX,
-            WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00,
-            0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-
 /* 00000008-0000-0010-8000-00aa00389b71 */
 DEFINE_GUID(_KSDATAFORMAT_SUBTYPE_IEC61937_DTS,
             WAVE_FORMAT_DTS, 0x0000, 0x0010, 0x80, 0x00,
@@ -434,13 +429,7 @@ static void vlc_SpdifToWave(WAVEFORMATEXTENSIBLE *restrict wf,
     switch (audio->i_format)
     {
     case VLC_CODEC_DTS:
-        if (audio->i_rate < 48000)
-        {
-            /* Wasapi doesn't accept DTS @ 44.1kHz but accept IEC 60958 PCM */
-            wf->SubFormat = _KSDATAFORMAT_SUBTYPE_WAVEFORMATEX;
-        }
-        else
-            wf->SubFormat = _KSDATAFORMAT_SUBTYPE_IEC61937_DTS;
+        wf->SubFormat = _KSDATAFORMAT_SUBTYPE_IEC61937_DTS;
         break;
     case VLC_CODEC_SPDIFL:
     case VLC_CODEC_SPDIFB:



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/17e10e0a403c118f838e4b2c364a087dfb65b28f

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/17e10e0a403c118f838e4b2c364a087dfb65b28f
You're receiving this email because of your account on code.videolan.org.