mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-04 13:30:12 -05:00
pulse-server: on underrun, pretend we read from the ringbuffer
Also update the ringbuffer read pointer on underrun.
This commit is contained in:
parent
6b2ec6d619
commit
55915f420e
1 changed files with 4 additions and 0 deletions
|
|
@ -1445,10 +1445,12 @@ static void stream_process(void *data)
|
||||||
|
|
||||||
if (stream->direction == PW_DIRECTION_OUTPUT) {
|
if (stream->direction == PW_DIRECTION_OUTPUT) {
|
||||||
int32_t avail = spa_ringbuffer_get_read_index(&stream->ring, &pd.read_index);
|
int32_t avail = spa_ringbuffer_get_read_index(&stream->ring, &pd.read_index);
|
||||||
|
|
||||||
if (stream->rate_match)
|
if (stream->rate_match)
|
||||||
minreq = stream->rate_match->size * stream->frame_size;
|
minreq = stream->rate_match->size * stream->frame_size;
|
||||||
else
|
else
|
||||||
minreq = SPA_MAX(stream->minblock, stream->attr.minreq);
|
minreq = SPA_MAX(stream->minblock, stream->attr.minreq);
|
||||||
|
|
||||||
if (avail <= 0) {
|
if (avail <= 0) {
|
||||||
/* underrun, produce a silence buffer */
|
/* underrun, produce a silence buffer */
|
||||||
size = SPA_MIN(buf->datas[0].maxsize, minreq);
|
size = SPA_MIN(buf->datas[0].maxsize, minreq);
|
||||||
|
|
@ -1462,6 +1464,8 @@ static void stream_process(void *data)
|
||||||
pd.playing_for = size;
|
pd.playing_for = size;
|
||||||
pd.underrun = true;
|
pd.underrun = true;
|
||||||
}
|
}
|
||||||
|
pd.read_index += size;
|
||||||
|
spa_ringbuffer_read_update(&stream->ring, pd.read_index);
|
||||||
} else {
|
} else {
|
||||||
if (avail > (int32_t)stream->attr.maxlength) {
|
if (avail > (int32_t)stream->attr.maxlength) {
|
||||||
/* overrun, reported by other side, here we skip
|
/* overrun, reported by other side, here we skip
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue