RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 08:37:59 +00:00
Code Issues Releases Wiki Activity

ao_wasapi: handle AOPLAY_FINAL_CHUNK

Browse Source 
Used for writing down all samples to the audio driver, even if it's not
a full chunk; needed at EOF on weird files.
This commit is contained in:
Diogo Franco (Kovensky) 2013-12-08 19:04:42 -03:00
parent 8f4380d6d5
commit c7064ce5e5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/out/ao_wasapi.c
View File

@ -87,6 +87,7 @@ typedef struct wasapi_state {
/* Play */ /* Play */
HANDLE hPlay; HANDLE hPlay;
int is_playing; int is_playing;
int final_chunk;
/* Reset */ /* Reset */
HANDLE hReset; HANDLE hReset;
@ -1032,6 +1033,7 @@ static void thread_feed(wasapi_state *state,int force_feed)
/* should be smaller than buffer block size by now */ /* should be smaller than buffer block size by now */
memset(pData,0,client_buffer); memset(pData,0,client_buffer);
mp_ring_read(state->ringbuff, (unsigned char *)pData, client_buffer); mp_ring_read(state->ringbuff, (unsigned char *)pData, client_buffer);
state->final_chunk = 0;
} else { } else {
/* buffer underrun?! abort */ /* buffer underrun?! abort */
hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient, hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient,
@ -1053,7 +1055,7 @@ exit_label:
static void thread_play(wasapi_state *state) static void thread_play(wasapi_state *state)
{ {
thread_feed(state, 0); thread_feed(state, state->final_chunk);
state->is_playing = 1; state->is_playing = 1;
IAudioClient_Start(state->pAudioClient); IAudioClient_Start(state->pAudioClient);
return; return;
@ -1154,7 +1156,7 @@ static DWORD __stdcall ThreadLoop(void *lpParameter)
case (WAIT_OBJECT_0 + 6): /* feed */ case (WAIT_OBJECT_0 + 6): /* feed */
if (state->is_playing) if (state->is_playing)
feedwatch = 1; feedwatch = 1;
thread_feed(state, 0); thread_feed(state, state->final_chunk);
break; break;
case WAIT_TIMEOUT: /* Did our feed die? */ case WAIT_TIMEOUT: /* Did our feed die? */
if (feedwatch) if (feedwatch)
@ -1202,6 +1204,7 @@ static int get_space(struct ao *ao)
static void reset_buffers(struct wasapi_state *state) static void reset_buffers(struct wasapi_state *state)
{ {
state->final_chunk = 0;
mp_ring_reset(state->ringbuff); mp_ring_reset(state->ringbuff);
} }
@ -1351,6 +1354,7 @@ static int play(struct ao *ao, void **data, int samples, int flags)
int ret = mp_ring_write(state->ringbuff, data[0], samples * ao->sstride); int ret = mp_ring_write(state->ringbuff, data[0], samples * ao->sstride);
state->final_chunk |= flags & AOPLAY_FINAL_CHUNK;
if (!state->is_playing) { if (!state->is_playing) {
/* start playing */ /* start playing */
state->is_playing = 1; state->is_playing = 1;