Skip to content

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

wasapi: fix indentation

parent 445d8bc2
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 35 deletions
modules/audio_output/wasapi.c
View file @ 50eb6474
...@@ -540,41 +540,40 @@ static void vlc_ToWave(WAVEFORMATEXTENSIBLE *restrict wf, ...@@ -540,41 +540,40 @@ static void vlc_ToWave(WAVEFORMATEXTENSIBLE *restrict wf,
audio->i_format = VLC_CODEC_FL32; audio->i_format = VLC_CODEC_FL32;
wf->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wf->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
break; break;
} }
aout_FormatPrepare (audio); aout_FormatPrepare (audio);
wf->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; wf->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
wf->Format.nChannels = audio->i_channels; wf->Format.nChannels = audio->i_channels;
wf->Format.nSamplesPerSec = audio->i_rate; wf->Format.nSamplesPerSec = audio->i_rate;
wf->Format.nAvgBytesPerSec = audio->i_bytes_per_frame * audio->i_rate; wf->Format.nAvgBytesPerSec = audio->i_bytes_per_frame * audio->i_rate;
wf->Format.nBlockAlign = audio->i_bytes_per_frame; wf->Format.nBlockAlign = audio->i_bytes_per_frame;
wf->Format.wBitsPerSample = audio->i_bitspersample; wf->Format.wBitsPerSample = audio->i_bitspersample;
wf->Format.cbSize = sizeof (*wf) - sizeof (wf->Format); wf->Format.cbSize = sizeof (*wf) - sizeof (wf->Format);
wf->Samples.wValidBitsPerSample = audio->i_bitspersample; wf->Samples.wValidBitsPerSample = audio->i_bitspersample;
wf->dwChannelMask = 0; wf->dwChannelMask = 0;
if (audio->i_physical_channels & AOUT_CHAN_LEFT) if (audio->i_physical_channels & AOUT_CHAN_LEFT)
wf->dwChannelMask |= SPEAKER_FRONT_LEFT; wf->dwChannelMask |= SPEAKER_FRONT_LEFT;
if (audio->i_physical_channels & AOUT_CHAN_RIGHT) if (audio->i_physical_channels & AOUT_CHAN_RIGHT)
wf->dwChannelMask |= SPEAKER_FRONT_RIGHT; wf->dwChannelMask |= SPEAKER_FRONT_RIGHT;
if (audio->i_physical_channels & AOUT_CHAN_CENTER) if (audio->i_physical_channels & AOUT_CHAN_CENTER)
wf->dwChannelMask |= SPEAKER_FRONT_CENTER; wf->dwChannelMask |= SPEAKER_FRONT_CENTER;
if (audio->i_physical_channels & AOUT_CHAN_LFE) if (audio->i_physical_channels & AOUT_CHAN_LFE)
wf->dwChannelMask |= SPEAKER_LOW_FREQUENCY; wf->dwChannelMask |= SPEAKER_LOW_FREQUENCY;
// TODO: reorder if (audio->i_physical_channels & AOUT_CHAN_REARLEFT)
if (audio->i_physical_channels & AOUT_CHAN_REARLEFT) wf->dwChannelMask |= SPEAKER_BACK_LEFT;
wf->dwChannelMask |= SPEAKER_BACK_LEFT; if (audio->i_physical_channels & AOUT_CHAN_REARRIGHT)
if (audio->i_physical_channels & AOUT_CHAN_REARRIGHT) wf->dwChannelMask |= SPEAKER_BACK_RIGHT;
wf->dwChannelMask |= SPEAKER_BACK_RIGHT; /* ... */
/* ... */ if (audio->i_physical_channels & AOUT_CHAN_REARCENTER)
if (audio->i_physical_channels & AOUT_CHAN_REARCENTER) wf->dwChannelMask |= SPEAKER_BACK_CENTER;
wf->dwChannelMask |= SPEAKER_BACK_CENTER; if (audio->i_physical_channels & AOUT_CHAN_MIDDLELEFT)
if (audio->i_physical_channels & AOUT_CHAN_MIDDLELEFT) wf->dwChannelMask |= SPEAKER_SIDE_LEFT;
wf->dwChannelMask |= SPEAKER_SIDE_LEFT; if (audio->i_physical_channels & AOUT_CHAN_MIDDLERIGHT)
if (audio->i_physical_channels & AOUT_CHAN_MIDDLERIGHT) wf->dwChannelMask |= SPEAKER_SIDE_RIGHT;
wf->dwChannelMask |= SPEAKER_SIDE_RIGHT; /* ... */
/* ... */
} }
static int vlc_FromWave(const WAVEFORMATEX *restrict wf, static int vlc_FromWave(const WAVEFORMATEX *restrict wf,
......
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