[vlc-commits] wasapi: don't fallback to PCM if S/PDIF fails

Thomas Guillem git at videolan.org
Wed Sep 14 15:32:03 CEST 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Sep 13 09:00:11 2016 +0200| [96824ae5bb70b2dbf23cec66a0346344b2fc59f4] | committer: Thomas Guillem

wasapi: don't fallback to PCM if S/PDIF fails

Since there is no spdif2pcm converters anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96824ae5bb70b2dbf23cec66a0346344b2fc59f4
---

 modules/audio_output/wasapi.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 76e9333..9aea176 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -410,14 +410,7 @@ static HRESULT Start(aout_stream_t *s, audio_sample_format_t *restrict pfmt,
 
     hr = IAudioClient_IsFormatSupported(sys->client, shared_mode,
                                         &wf.Format, &pwf);
-    if (FAILED(hr) && AOUT_FMT_SPDIF(&fmt))
-    {
-        /* Device may not support SPDIF: try again with FL32 */
-        vlc_ToWave(&wf, &fmt);
-        shared_mode = AUDCLNT_SHAREMODE_SHARED;
-        hr = IAudioClient_IsFormatSupported(sys->client, shared_mode,
-                                            &wf.Format, &pwf);
-    }
+
     if (FAILED(hr))
     {
         msg_Err(s, "cannot negotiate audio format (error 0x%lx)", hr);



More information about the vlc-commits mailing list