diff options
| author | Marcoen Hirschberg <m.hirschberg@activevideo.com> | 2014-05-27 15:31:09 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-05-28 21:38:15 +0200 |
| commit | 1fa48a2452d67f71a600e601d2a14bb8ad9c78e1 (patch) | |
| tree | 5a260c2eb0b532426f4f061d2b4c6936d63474b6 | |
| parent | 31a10f7c38887294af758d21a19596b7772f328a (diff) | |
| download | mpv-1fa48a2452d67f71a600e601d2a14bb8ad9c78e1.tar.bz2 mpv-1fa48a2452d67f71a600e601d2a14bb8ad9c78e1.tar.xz | |
ao_wasapi: simplify nAvgBytesPerSec calculation
Calculate nBlockAlign seperately to reuse in the calculation of
nAvgBytesPerSec.
| -rwxr-xr-x | audio/out/ao_wasapi_utils.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index 95d2642780..afa2ad6b40 100755 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -125,13 +125,12 @@ const char *wasapi_explain_err(const HRESULT hr) static void set_format(WAVEFORMATEXTENSIBLE *wformat, WORD bytepersample, DWORD samplerate, WORD channels, DWORD chanmask) { + int block_align = channels * bytepersample; wformat->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; /* Only PCM is supported */ wformat->Format.nChannels = channels; wformat->Format.nSamplesPerSec = samplerate; - wformat->Format.nAvgBytesPerSec = wformat->Format.nChannels * - bytepersample * - wformat->Format.nSamplesPerSec; - wformat->Format.nBlockAlign = wformat->Format.nChannels * bytepersample; + wformat->Format.nAvgBytesPerSec = samplerate * block_align; + wformat->Format.nBlockAlign = block_align; wformat->Format.wBitsPerSample = bytepersample * 8; wformat->Format.cbSize = 22; /* must be at least 22 for WAVE_FORMAT_EXTENSIBLE */ |