summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Light <wrl@illest.net>2013-10-08 19:18:13 +0200
committerwm4 <wm4@nowhere>2013-10-08 20:03:57 +0200
commit16450fab3f26823fe5f04121e7087e7c9f9f8c70 (patch)
treeac837ad997b5f00f13133bffa486059867acec81
parent5c3abb90822da7f541701f295f255b042455462a (diff)
downloadmpv-16450fab3f26823fe5f04121e7087e7c9f9f8c70.tar.bz2
mpv-16450fab3f26823fe5f04121e7087e7c9f9f8c70.tar.xz
mp_ring: fix mp_ring_read_cb() when read wraps around
previously, mp_ring_read_cb() would allow reading past the end of the ringbuffer when buffered > available. mp_ring_read() had logic for splitting the read into two, which I duplicated into mp_ring_read_cb().
-rw-r--r--mpvcore/mp_ring.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/mpvcore/mp_ring.c b/mpvcore/mp_ring.c
index aa62c305be..822825e370 100644
--- a/mpvcore/mp_ring.c
+++ b/mpvcore/mp_ring.c
@@ -99,9 +99,17 @@ int mp_ring_read_cb(struct mp_ring *buffer, void *ctx, int len,
int read_len = FFMIN(len, buffered);
int read_ptr = mp_ring_get_rpos(buffer) % size;
- func(ctx, buffer->buffer + read_ptr, read_len);
+ int len1 = FFMIN(size - read_ptr, read_len);
+ int len2 = read_len - len1;
- return mp_ring_drain(buffer, read_len);
+ func(ctx, buffer->buffer + read_ptr, len1);
+ if (len2 > 0)
+ func(ctx, buffer->buffer, len2);
+
+ mp_atomic_add_and_fetch(&buffer->rpos, read_len);
+ mp_memory_barrier();
+
+ return read_len;
}
int mp_ring_write(struct mp_ring *buffer, unsigned char *src, int len)