mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: fix seek modes

Browse source 
Adjust missing when seeking and update the filled level correctly.

Fixes #653
This commit is contained in:
Wim Taymans 2021-02-02 15:13:49 +01:00
parent 2b44f42845
commit 0d2b9104d1
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -4985,7 +4985,7 @@ static int handle_memblock(struct client *client, struct message *msg)
struct stream *stream;
uint32_t channel, flags, index;
int64_t offset;
int32_t filled;
int32_t filled, diff;
int res = 0;
channel = ntohl(client->desc.channel);
@ -5005,22 +5005,28 @@ static int handle_memblock(struct client *client, struct message *msg)
}
filled = spa_ringbuffer_get_write_index(&stream->ring, &index);
pw_log_debug("new block %p %p/%u filled:%d index:%d flags:%02x offset:%08"PRIx64,
pw_log_info("new block %p %p/%u filled:%d index:%d flags:%02x offset:%"PRIu64,
msg, msg->data, msg->length, filled, index, flags, offset);
switch (flags & FLAG_SEEKMASK) {
case SEEK_RELATIVE:
index += offset;
filled -= offset;
filled += offset;
stream->missing -= offset;
break;
case SEEK_ABSOLUTE:
filled -= (int32_t)(offset - (uint64_t)index);
index = offset;
diff = (int32_t)(offset - (uint64_t)index);
index += diff;
filled += diff;
stream->missing -= diff;
break;
case SEEK_RELATIVE_ON_READ:
case SEEK_RELATIVE_END:
index = index - filled + offset;
filled = 0;
diff = (int32_t)(offset - (uint64_t)filled);
index += diff;
filled += diff;
stream->missing -= diff;
break;
}