virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Try to fix the 1 byte cannot be used issue.

Browse Source 
Originally committed as revision 17865 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-03-07 21:02:08 +00:00
parent 5add54b4f9
commit 0a71e78ce4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/fifo.c
View File

@ -24,10 +24,10 @@
int av_fifo_init(AVFifoBuffer *f, unsigned int size) int av_fifo_init(AVFifoBuffer *f, unsigned int size)
{ {
size= FFMAX(size, size+1);
f->wptr = f->rptr = f->wptr = f->rptr =
f->buffer = av_malloc(size); f->buffer = av_malloc(size);
f->end = f->buffer + size; f->end = f->buffer + size;
f->rndx = f->wndx = 0;
if (!f->buffer) if (!f->buffer)
return -1; return -1;
return 0; return 0;
@ -40,10 +40,7 @@ void av_fifo_free(AVFifoBuffer *f)
int av_fifo_size(AVFifoBuffer *f) int av_fifo_size(AVFifoBuffer *f)
{ {
int size = f->wptr - f->rptr; return (uint32_t)(f->wndx - f->rndx);
if (size < 0)
size += f->end - f->buffer;
return size;
} }
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size) int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
@ -60,7 +57,7 @@ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
unsigned int old_size= f->end - f->buffer; unsigned int old_size= f->end - f->buffer;
if(old_size <= new_size){ if(old_size < new_size){
int len= av_fifo_size(f); int len= av_fifo_size(f);
AVFifoBuffer f2; AVFifoBuffer f2;
@ -68,6 +65,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
return -1; return -1;
av_fifo_read(f, f2.buffer, len); av_fifo_read(f, f2.buffer, len);
f2.wptr += len; f2.wptr += len;
f2.wndx += len;
av_free(f->buffer); av_free(f->buffer);
*f= f2; *f= f2;
} }
@ -96,6 +94,7 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void
f->wptr += len; f->wptr += len;
if (f->wptr >= f->end) if (f->wptr >= f->end)
f->wptr = f->buffer; f->wptr = f->buffer;
f->wndx += len;
size -= len; size -= len;
} while (size > 0); } while (size > 0);
return total - size; return total - size;
@ -123,4 +122,5 @@ void av_fifo_drain(AVFifoBuffer *f, int size)
f->rptr += size; f->rptr += size;
if (f->rptr >= f->end) if (f->rptr >= f->end)
f->rptr -= f->end - f->buffer; f->rptr -= f->end - f->buffer;
f->rndx += size;
} }

1
libavutil/fifo.h
View File

@ -31,6 +31,7 @@
typedef struct AVFifoBuffer { typedef struct AVFifoBuffer {
uint8_t *buffer; uint8_t *buffer;
uint8_t *rptr, *wptr, *end; uint8_t *rptr, *wptr, *end;
uint32_t rndx, wndx;
} AVFifoBuffer; } AVFifoBuffer;
/** /**