diff options
| -rw-r--r-- | mpvcore/mp_ring.c | 12 |
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) |