RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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().
This commit is contained in:
William Light 2013-10-08 19:18:13 +02:00 committed by wm4
parent 5c3abb9082
commit 16450fab3f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mpvcore/mp_ring.c
View File

@ -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)