RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao/wasapi: make get_device_delay return an error code

This commit is contained in:
Kevin Mitchell 2014-11-23 00:15:53 -08:00
parent 2658dc712d
commit e4aaaf69df
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
audio/out/ao_wasapi.c
View File

@ -36,18 +36,19 @@
#include "osdep/timer.h" #include "osdep/timer.h"
#include "osdep/io.h" #include "osdep/io.h"
static double get_device_delay(struct wasapi_state *state) { static HRESULT get_device_delay(struct wasapi_state *state, double *delay) {
UINT64 sample_count = atomic_load(&state->sample_count); UINT64 sample_count = atomic_load(&state->sample_count);
UINT64 position, qpc_position; UINT64 position, qpc_position;
HRESULT hr; HRESULT hr;
switch (hr = IAudioClock_GetPosition(state->pAudioClock, &position, &qpc_position)) { hr = IAudioClock_GetPosition(state->pAudioClock, &position, &qpc_position);
case S_OK: case S_FALSE: /* GetPosition succeeded, but the result may be inaccurate due to the length of the call */
break; /* http://msdn.microsoft.com/en-us/library/windows/desktop/dd370889%28v=vs.85%29.aspx */
default: if ( hr == S_FALSE) {
MP_ERR(state, "IAudioClock::GetPosition returned %s (0x%"PRIx32")\n", MP_DBG(state, "Possibly inaccurate device position.\n");
wasapi_explain_err(hr), (uint32_t)hr); hr = S_OK;
} }
EXIT_ON_ERROR(hr);
LARGE_INTEGER qpc_count; LARGE_INTEGER qpc_count;
QueryPerformanceCounter(&qpc_count); QueryPerformanceCounter(&qpc_count);
@ -59,11 +60,15 @@ static double get_device_delay(struct wasapi_state *state) {
position = position * state->format.Format.nSamplesPerSec / state->clock_frequency; position = position * state->format.Format.nSamplesPerSec / state->clock_frequency;
double diff = sample_count - position; double diff = sample_count - position;
double delay = diff / state->format.Format.nSamplesPerSec; *delay = diff / state->format.Format.nSamplesPerSec;
MP_TRACE(state, "Device delay: %g samples (%g ms)\n", diff, delay * 1000); MP_TRACE(state, "Device delay: %g samples (%g ms)\n", diff, *delay * 1000);
return delay; return S_OK;
exit_label:
MP_ERR(state, "Error getting device delay: %s (0x%"PRIx32")\n",
wasapi_explain_err(hr), (uint32_t)hr);
return hr;
} }
static void thread_feed(struct ao *ao) static void thread_feed(struct ao *ao)
@ -81,6 +86,9 @@ static void thread_feed(struct ao *ao)
frame_count -= padding; frame_count -= padding;
MP_TRACE(ao, "Frame to fill: %"PRIu32". Padding: %"PRIu32"\n", frame_count, padding); MP_TRACE(ao, "Frame to fill: %"PRIu32". Padding: %"PRIu32"\n", frame_count, padding);
} }
double delay;
hr = get_device_delay(state, &delay);
EXIT_ON_ERROR(hr);
BYTE *pData; BYTE *pData;
hr = IAudioRenderClient_GetBuffer(state->pRenderClient, hr = IAudioRenderClient_GetBuffer(state->pRenderClient,
@ -88,8 +96,9 @@ static void thread_feed(struct ao *ao)
EXIT_ON_ERROR(hr); EXIT_ON_ERROR(hr);
BYTE *data[1] = {pData}; BYTE *data[1] = {pData};
ao_read_data(ao, (void**)data, frame_count, (int64_t) ( ao_read_data(ao, (void**)data, frame_count, (int64_t) (
mp_time_us() + get_device_delay(state) * 1e6 + mp_time_us() + delay * 1e6 +
frame_count * 1e6 / state->format.Format.nSamplesPerSec)); frame_count * 1e6 / state->format.Format.nSamplesPerSec));
hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient, hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient,