mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
fifo: Make writes atomic.
Prior to this a X bytes write could be seen as less than X bytes being available if the check was done at an unfortunate moment. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
dd1fb65287
commit
9eb0d8bab1
@ -83,22 +83,27 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size)
|
||||
int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
|
||||
{
|
||||
int total = size;
|
||||
uint32_t wndx= f->wndx;
|
||||
uint8_t *wptr= f->wptr;
|
||||
|
||||
do {
|
||||
int len = FFMIN(f->end - f->wptr, size);
|
||||
int len = FFMIN(f->end - wptr, size);
|
||||
if (func) {
|
||||
if (func(src, f->wptr, len) <= 0)
|
||||
if (func(src, wptr, len) <= 0)
|
||||
break;
|
||||
} else {
|
||||
memcpy(f->wptr, src, len);
|
||||
memcpy(wptr, src, len);
|
||||
src = (uint8_t*)src + len;
|
||||
}
|
||||
// Write memory barrier needed for SMP here in theory
|
||||
f->wptr += len;
|
||||
if (f->wptr >= f->end)
|
||||
f->wptr = f->buffer;
|
||||
f->wndx += len;
|
||||
wptr += len;
|
||||
if (wptr >= f->end)
|
||||
wptr = f->buffer;
|
||||
wndx += len;
|
||||
size -= len;
|
||||
} while (size > 0);
|
||||
f->wndx= wndx;
|
||||
f->wptr= wptr;
|
||||
return total - size;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user