comparison rpza.c @ 1607:9ef0d51e809b libavcodec

Set buffer hints, use cr where available

1606:a1ac8e675b95

        switch (opcode & 0xe0) {

        /* Skip blocks */
        case 0x80:
            while (n_blocks--) {
                block_ptr = row_ptr + pixel_ptr;
                for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                    for (pixel_x = 0; pixel_x < 4; pixel_x++){
                        pixels[block_ptr] = prev_pixels[block_ptr];
                        block_ptr++;
                    }
                    block_ptr += row_inc;
                }
                ADVANCE_BLOCK();
            }
            break;

        /* Fill blocks with one color */
        case 0xa0:

                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
{
    RpzaContext *s = (RpzaContext *)avctx->priv_data;

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

    s->frame.reference = 1;
    if (avctx->get_buffer(avctx, &s->frame)) {
        av_log(avctx, AV_LOG_ERROR, "  RPZA Video: get_buffer() failed\n");
        return -1;
    }

    rpza_decode_stream(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;

    sizeof(RpzaContext),
    rpza_decode_init,
    NULL,
    rpza_decode_end,
    rpza_decode_frame,
    CODEC_CAP_DR1,
};

1607:9ef0d51e809b

        switch (opcode & 0xe0) {

        /* Skip blocks */
        case 0x80:
            while (n_blocks--) {
              if (!s->avctx->cr_available) {
                block_ptr = row_ptr + pixel_ptr;
                for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                    for (pixel_x = 0; pixel_x < 4; pixel_x++){
                        pixels[block_ptr] = prev_pixels[block_ptr];
                        block_ptr++;
                    }
                    block_ptr += row_inc;
                }
              }
              ADVANCE_BLOCK();
            }
            break;

        /* Fill blocks with one color */
        case 0xa0:

                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
{
    RpzaContext *s = (RpzaContext *)avctx->priv_data;

	/* no supplementary picture */
	if (buf_size == 0)
		return 0;

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

    s->frame.reference = 1;
	s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE;
    if (avctx->cr_available)
        s->frame.buffer_hints |= FF_BUFFER_HINTS_REUSABLE;
    else
        s->frame.buffer_hints |= FF_BUFFER_HINTS_READABLE;
    if (avctx->get_buffer(avctx, &s->frame)) {
        av_log(avctx, AV_LOG_ERROR, "  RPZA Video: get_buffer() failed\n");
        return -1;
    }

    if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0]))
        av_log(avctx, AV_LOG_ERROR, "Buffer linesize changed: current %u, previous %u.\n"
                "Expect wrong image and/or crash!\n",
                s->frame.linesize[0], s->prev_frame.linesize[0]);

    rpza_decode_stream(s);

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

    /* shuffle frames */
  if (!avctx->cr_available)
    s->prev_frame = s->frame;

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

    sizeof(RpzaContext),
    rpza_decode_init,
    NULL,
    rpza_decode_end,
    rpza_decode_frame,
    CODEC_CAP_DR1 | CODEC_CAP_CR,
};