comparison fifo.c @ 224:a9880a7685e7 libavutil

remove near duplicate function

223:df2f250bda3f

/**
 * Get data from the fifo (returns -1 if not enough data).
 */
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
{
    int size = av_fifo_size(f);

    if (size < buf_size)
        return -1;
    while (buf_size > 0) {
        int len = FFMIN(f->end - f->rptr, buf_size);
        memcpy(buf, f->rptr, len);
        buf += len;
        f->rptr += len;
        if (f->rptr >= f->end)
            f->rptr = f->buffer;
        buf_size -= len;
    }
    return 0;
}

/**
 * Resizes a FIFO.
 */

    if (size < buf_size)
        return -1;
    while (buf_size > 0) {
        int len = FFMIN(f->end - f->rptr, buf_size);
        func(dest, f->rptr, len);
        f->rptr += len;
        if (f->rptr >= f->end)
            f->rptr = f->buffer;
        buf_size -= len;
    }

224:a9880a7685e7

/**
 * Get data from the fifo (returns -1 if not enough data).
 */
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
{
    return av_fifo_generic_read(f, buf_size, NULL, buf);
}

/**
 * Resizes a FIFO.
 */

    if (size < buf_size)
        return -1;
    while (buf_size > 0) {
        int len = FFMIN(f->end - f->rptr, buf_size);
        if(func) func(dest, f->rptr, len);
        else{
            memcpy(dest, f->rptr, len);
            dest = (uint8_t*)dest + len;
        }
        f->rptr += len;
        if (f->rptr >= f->end)
            f->rptr = f->buffer;
        buf_size -= len;
    }