comparison cinepak.c @ 2009:b13a25ac9f0c libavcodec

buffer hints, use reget_buffer, removed copy from previous frame

2008:fc54b7be8448

typedef struct CinepakContext {

    AVCodecContext *avctx;
    DSPContext dsp;
    AVFrame frame;
    AVFrame prev_frame;

    unsigned char *data;
    int size;

    int width, height;

                                   int chunk_id, int size, uint8_t *data)
{
    uint8_t         *eod = (data + size);
    uint32_t         flag, mask;
    cvid_codebook_t *codebook;
    unsigned int     i, j, x, y;
    uint32_t         iy[4];
    uint32_t         iu[2];
    uint32_t         iv[2];

    flag = 0;

                        s->frame.data[1][iu[1] + 1] = codebook->u;
                        s->frame.data[2][iv[1] + 1] = codebook->v;
                    }

                }
            } else {
                /* copy from the previous frame */
                for (i = 0; i < 4; i++) {
                    for (j = 0; j < 4; j++) {
                        s->frame.data[0][iy[i] + j] =
                            s->prev_frame.data[0][iy[i] + j];
                    }
                }
                for (i = 0; i < 2; i++) {
                    for (j = 0; j < 2; j++) {
                        s->frame.data[1][iu[i] + j] =
                            s->prev_frame.data[1][iu[i] + j];
                        s->frame.data[2][iv[i] + j] =
                            s->prev_frame.data[2][iv[i] + j];
                    }
                }
            }

            iy[0] += 4;  iy[1] += 4;
            iy[2] += 4;  iy[3] += 4;
            iu[0] += 2;  iu[1] += 2;

    avctx->pix_fmt = PIX_FMT_YUV420P;
    avctx->has_b_frames = 0;
    dsputil_init(&s->dsp, avctx);

    s->frame.data[0] = s->prev_frame.data[0] = NULL;

    return 0;
}

static int cinepak_decode_frame(AVCodecContext *avctx,

    CinepakContext *s = (CinepakContext *)avctx->priv_data;

    s->data = buf;
    s->size = buf_size;

    if (avctx->get_buffer(avctx, &s->frame)) {
        av_log(avctx, AV_LOG_ERROR, "  Cinepak: get_buffer() failed\n");
        return -1;
    }

    cinepak_decode(s);

    if (s->prev_frame.data[0])
        avctx->release_buffer(avctx, &s->prev_frame);

    /* shuffle frames */
    s->prev_frame = s->frame;

    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = s->frame;

    /* report that the buffer was completely consumed */
    return buf_size;

static int cinepak_decode_end(AVCodecContext *avctx)
{
    CinepakContext *s = (CinepakContext *)avctx->priv_data;

    if (s->prev_frame.data[0])
        avctx->release_buffer(avctx, &s->prev_frame);

    return 0;
}

AVCodec cinepak_decoder = {

2009:b13a25ac9f0c

typedef struct CinepakContext {

    AVCodecContext *avctx;
    DSPContext dsp;
    AVFrame frame;

    unsigned char *data;
    int size;

    int width, height;

                                   int chunk_id, int size, uint8_t *data)
{
    uint8_t         *eod = (data + size);
    uint32_t         flag, mask;
    cvid_codebook_t *codebook;
    unsigned int     x, y;
    uint32_t         iy[4];
    uint32_t         iu[2];
    uint32_t         iv[2];

    flag = 0;

                        s->frame.data[1][iu[1] + 1] = codebook->u;
                        s->frame.data[2][iv[1] + 1] = codebook->v;
                    }

                }
            }

            iy[0] += 4;  iy[1] += 4;
            iy[2] += 4;  iy[3] += 4;
            iu[0] += 2;  iu[1] += 2;

    avctx->pix_fmt = PIX_FMT_YUV420P;
    avctx->has_b_frames = 0;
    dsputil_init(&s->dsp, avctx);

    s->frame.data[0] = NULL;

    return 0;
}

static int cinepak_decode_frame(AVCodecContext *avctx,

    CinepakContext *s = (CinepakContext *)avctx->priv_data;

    s->data = buf;
    s->size = buf_size;

    s->frame.reference = 1;
    s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
                            FF_BUFFER_HINTS_REUSABLE;
    if (avctx->reget_buffer(avctx, &s->frame)) {
        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
        return -1;
    }

    cinepak_decode(s);

    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = s->frame;

    /* report that the buffer was completely consumed */
    return buf_size;

static int cinepak_decode_end(AVCodecContext *avctx)
{
    CinepakContext *s = (CinepakContext *)avctx->priv_data;

    if (s->frame.data[0])
        avctx->release_buffer(avctx, &s->frame);

    return 0;
}

AVCodec cinepak_decoder = {