diff options
| author | wm4 <wm4@nowhere> | 2017-07-07 17:41:16 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-07-07 17:56:18 +0200 |
| commit | 951c1a4907b107ab2da6509fc6aa99ca30591e08 (patch) | |
| tree | 36f0ce8bfb2fb97c82b2f2820565ece9b2bc6845 /audio/out/ao_wasapi.c | |
| parent | 4cb5e53ada84f73f29de0d15a7b67cd32631536a (diff) | |
| download | mpv-951c1a4907b107ab2da6509fc6aa99ca30591e08.tar.bz2 mpv-951c1a4907b107ab2da6509fc6aa99ca30591e08.tar.xz | |
ao_wasapi: drop use of AF_FORMAT_S24
Do conversion directly, using the infrastructure that was added before.
This also rewrites part of format negotation, I guess.
I couldn't test the format that was used for S24 - my hardware does not
report support for it. So I commented it, as it could be buggy. Testing
this with the wasapi_formats[] entry for 24/24 uncommented would be
appreciated.
Diffstat (limited to 'audio/out/ao_wasapi.c')
| -rw-r--r-- | audio/out/ao_wasapi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 1337717f7b..dbca270e00 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -129,8 +129,9 @@ static bool thread_feed(struct ao *ao) BYTE *data[1] = {pData}; - ao_read_data(ao, (void **)data, frame_count, - mp_time_us() + (int64_t)llrint(delay_us)); + ao_read_data_converted(ao, &state->convert_format, + (void **)data, frame_count, + mp_time_us() + (int64_t)llrint(delay_us)); // note, we can't use ao_read_data return value here since we already // committed to frame_count above in the GetBuffer call |