mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PipeWire) Fix speedup in the video threaded mode (#17406)

Browse Source
This commit is contained in:
Viačasłaŭ 2025-01-13 06:36:17 +03:00 committed by GitHub
parent 41290bb1a8
commit 1d6badb1f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
audio/drivers/pipewire.c
View File

@ -1,5 +1,5 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2024 - Viachaslau Khalikin
* Copyright (C) 2024-2025 - Viachaslau Khalikin
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
@ -82,7 +82,7 @@ static void playback_process_cb(void *data)
buf = b->buffer;
p = buf->datas[0].data;
if (p == NULL)
return;
goto done;
/* calculate the total no of bytes to read data from buffer */
req = b->requested * audio->frame_size;
@ -115,8 +115,10 @@ static void playback_process_cb(void *data)
buf->datas[0].chunk->stride = audio->frame_size;
buf->datas[0].chunk->size = n_bytes;
done:
/* queue the buffer for playback */
pw_stream_queue_buffer(audio->stream, b);
pw_thread_loop_signal(audio->pw->thread_loop, false);
}
static void pipewire_free(void *data);
@ -317,8 +319,7 @@ error:
static ssize_t pipewire_write(void *data, const void *buf_, size_t size)
{
int32_t writable;
int32_t avail;
int32_t filled, avail;
uint32_t index;
pipewire_audio_t *audio = (pipewire_audio_t*)data;
const char *error = NULL;
@ -327,25 +328,44 @@ static ssize_t pipewire_write(void *data, const void *buf_, size_t size)
return 0; /* wait for stream to become ready */
pw_thread_loop_lock(audio->pw->thread_loop);
writable = spa_ringbuffer_get_write_index(&audio->ring, &index);
avail = audio->highwater_mark - writable;
while (size)
{
filled = spa_ringbuffer_get_write_index(&audio->ring, &index);
avail = audio->highwater_mark - filled;
#if 0 /* Useful for tracing */
RARCH_DBG("[PipeWire]: Playback progress: written %d, avail %d, index %d, size %d\n",
writable, avail, index, size);
RARCH_DBG("[PipeWire]: Ringbuffer utilization: filled %d, avail %d, index %d, size %d\n",
filled, avail, index, size);
#endif
if (size > (size_t)avail)
size = avail;
/* in non-blocking mode we play as much as we can
* in blocking mode we expect a freed buffer of at least the given size
*/
if (size > (size_t)avail)
{
if (audio->pw->nonblock)
{
size = avail;
break;
}
else
{
pw_thread_loop_wait(audio->pw->thread_loop);
}
}
else
break;
}
if (writable < 0)
RARCH_ERR("%p: underrun write:%u filled:%d\n", audio, index, writable);
if (filled < 0)
RARCH_ERR("[Pipewire]: %p: underrun write:%u filled:%d\n", audio, index, filled);
else
{
if ((uint32_t) writable + size > RINGBUFFER_SIZE)
if ((uint32_t) filled + size > RINGBUFFER_SIZE)
{
RARCH_ERR("%p: overrun write:%u filled:%d + size:%zu > max:%u\n",
audio, index, writable, size, RINGBUFFER_SIZE);
RARCH_ERR("[PipeWire]: %p: overrun write:%u filled:%d + size:%zu > max:%u\n",
audio, index, filled, size, RINGBUFFER_SIZE);
}
}

6
audio/drivers_microphone/pipewire.c
View File

@ -102,9 +102,8 @@ static void capture_process_cb(void *data)
}
buf = b->buffer;
p = buf->datas[0].data;
if (p == NULL)
return;
if ((p = buf->datas[0].data) == NULL)
goto done;
offs = SPA_MIN(buf->datas[0].chunk->offset, buf->datas[0].maxsize);
n_bytes = SPA_MIN(buf->datas[0].chunk->size, buf->datas[0].maxsize - offs);
@ -125,6 +124,7 @@ static void capture_process_cb(void *data)
index += n_bytes;
spa_ringbuffer_write_update(&microphone->ring, index);
done:
pw_stream_queue_buffer(microphone->stream, b);
}