/*
* Copyright (C) 2003 the ffmpeg project
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
*/
/**
- * @file roqvideodec.c
- * Id RoQ Video Decoder by Dr. Tim Ferguson
- * For more information about the Id RoQ format, visit:
+ * @file
+ * id RoQ Video Decoder by Dr. Tim Ferguson
+ * For more information about the id RoQ format, visit:
* http://www.csse.monash.edu.au/~timf/
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "avcodec.h"
#include "bytestream.h"
-#include "dsputil.h"
#include "roqvideo.h"
-#define avg2(a,b) av_clip_uint8(((int)(a)+(int)(b)+1)>>1)
-#define avg4(a,b,c,d) av_clip_uint8(((int)(a)+(int)(b)+(int)(c)+(int)(d)+2)>>2)
-
-#define get_byte(in_buffer) *(in_buffer++)
-
static void roqvideo_decode_frame(RoqContext *ri)
{
unsigned int chunk_id = 0, chunk_arg = 0;
int vqid, bpos, xpos, ypos, xp, yp, x, y, mx, my;
int frame_stats[2][4] = {{0},{0}};
roq_qcell *qcell;
- unsigned char *buf = ri->buf;
- unsigned char *buf_end = ri->buf + ri->size;
+ const unsigned char *buf = ri->buf;
+ const unsigned char *buf_end = ri->buf + ri->size;
while (buf < buf_end) {
chunk_id = bytestream_get_le16(&buf);
if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size)
nv2 = 256;
for(i = 0; i < nv1; i++) {
- ri->cells[i].y[0] = get_byte(buf);
- ri->cells[i].y[1] = get_byte(buf);
- ri->cells[i].y[2] = get_byte(buf);
- ri->cells[i].y[3] = get_byte(buf);
- ri->cells[i].u = get_byte(buf);
- ri->cells[i].v = get_byte(buf);
+ ri->cb2x2[i].y[0] = *buf++;
+ ri->cb2x2[i].y[1] = *buf++;
+ ri->cb2x2[i].y[2] = *buf++;
+ ri->cb2x2[i].y[3] = *buf++;
+ ri->cb2x2[i].u = *buf++;
+ ri->cb2x2[i].v = *buf++;
}
for(i = 0; i < nv2; i++)
for(j = 0; j < 4; j++)
- ri->qcells[i].idx[j] = get_byte(buf);
+ ri->cb4x4[i].idx[j] = *buf++;
}
}
switch(vqid) {
case RoQ_ID_MOT:
- ff_apply_motion_8x8(ri, xp, yp, 0, 0);
break;
case RoQ_ID_FCC:
mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
ff_apply_motion_8x8(ri, xp, yp, mx, my);
break;
case RoQ_ID_SLD:
- qcell = ri->qcells + buf[bpos++];
- ff_apply_vector_4x4(ri, xp, yp, ri->cells + qcell->idx[0]);
- ff_apply_vector_4x4(ri, xp+4, yp, ri->cells + qcell->idx[1]);
- ff_apply_vector_4x4(ri, xp, yp+4, ri->cells + qcell->idx[2]);
- ff_apply_vector_4x4(ri, xp+4, yp+4, ri->cells + qcell->idx[3]);
+ qcell = ri->cb4x4 + buf[bpos++];
+ ff_apply_vector_4x4(ri, xp, yp, ri->cb2x2 + qcell->idx[0]);
+ ff_apply_vector_4x4(ri, xp+4, yp, ri->cb2x2 + qcell->idx[1]);
+ ff_apply_vector_4x4(ri, xp, yp+4, ri->cb2x2 + qcell->idx[2]);
+ ff_apply_vector_4x4(ri, xp+4, yp+4, ri->cb2x2 + qcell->idx[3]);
break;
case RoQ_ID_CCC:
for (k = 0; k < 4; k++) {
vqflg_pos--;
switch(vqid) {
case RoQ_ID_MOT:
- ff_apply_motion_4x4(ri, x, y, 0, 0);
break;
case RoQ_ID_FCC:
mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
ff_apply_motion_4x4(ri, x, y, mx, my);
break;
case RoQ_ID_SLD:
- qcell = ri->qcells + buf[bpos++];
- ff_apply_vector_2x2(ri, x, y, ri->cells + qcell->idx[0]);
- ff_apply_vector_2x2(ri, x+2, y, ri->cells + qcell->idx[1]);
- ff_apply_vector_2x2(ri, x, y+2, ri->cells + qcell->idx[2]);
- ff_apply_vector_2x2(ri, x+2, y+2, ri->cells + qcell->idx[3]);
+ qcell = ri->cb4x4 + buf[bpos++];
+ ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + qcell->idx[0]);
+ ff_apply_vector_2x2(ri, x+2, y, ri->cb2x2 + qcell->idx[1]);
+ ff_apply_vector_2x2(ri, x, y+2, ri->cb2x2 + qcell->idx[2]);
+ ff_apply_vector_2x2(ri, x+2, y+2, ri->cb2x2 + qcell->idx[3]);
break;
case RoQ_ID_CCC:
- ff_apply_vector_2x2(ri, x, y, ri->cells + buf[bpos]);
- ff_apply_vector_2x2(ri, x+2, y, ri->cells + buf[bpos+1]);
- ff_apply_vector_2x2(ri, x, y+2, ri->cells + buf[bpos+2]);
- ff_apply_vector_2x2(ri, x+2, y+2, ri->cells + buf[bpos+3]);
+ ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + buf[bpos]);
+ ff_apply_vector_2x2(ri, x+2, y, ri->cb2x2 + buf[bpos+1]);
+ ff_apply_vector_2x2(ri, x, y+2, ri->cb2x2 + buf[bpos+2]);
+ ff_apply_vector_2x2(ri, x+2, y+2, ri->cb2x2 + buf[bpos+3]);
bpos += 4;
break;
}
}
xpos += 16;
- if (xpos >= ri->avctx->width) {
- xpos -= ri->avctx->width;
+ if (xpos >= ri->width) {
+ xpos -= ri->width;
ypos += 16;
}
- if(ypos >= ri->avctx->height)
+ if(ypos >= ri->height)
break;
}
}
-static int roq_decode_init(AVCodecContext *avctx)
+static av_cold int roq_decode_init(AVCodecContext *avctx)
{
RoqContext *s = avctx->priv_data;
s->avctx = avctx;
- s->first_frame = 1;
+ s->width = avctx->width;
+ s->height = avctx->height;
s->last_frame = &s->frames[0];
s->current_frame = &s->frames[1];
- avctx->pix_fmt = PIX_FMT_YUV420P;
- dsputil_init(&s->dsp, avctx);
+ avctx->pix_fmt = PIX_FMT_YUV444P;
return 0;
}
static int roq_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
RoqContext *s = avctx->priv_data;
+ int copy= !s->current_frame->data[0];
- if (avctx->get_buffer(avctx, s->current_frame)) {
+ s->current_frame->reference = 3;
+ if (avctx->reget_buffer(avctx, s->current_frame)) {
av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n");
return -1;
}
- s->y_stride = s->current_frame->linesize[0];
- s->c_stride = s->current_frame->linesize[1];
+
+ if(copy)
+ av_picture_copy((AVPicture*)s->current_frame, (AVPicture*)s->last_frame,
+ avctx->pix_fmt, avctx->width, avctx->height);
s->buf = buf;
s->size = buf_size;
roqvideo_decode_frame(s);
- /* release the last frame if it is allocated */
- if (s->first_frame)
- s->first_frame = 0;
- else
- avctx->release_buffer(avctx, s->last_frame);
-
*data_size = sizeof(AVFrame);
*(AVFrame*)data = *s->current_frame;
return buf_size;
}
-static int roq_decode_end(AVCodecContext *avctx)
+static av_cold int roq_decode_end(AVCodecContext *avctx)
{
RoqContext *s = avctx->priv_data;
/* release the last frame */
if (s->last_frame->data[0])
avctx->release_buffer(avctx, s->last_frame);
+ if (s->current_frame->data[0])
+ avctx->release_buffer(avctx, s->current_frame);
return 0;
}
-AVCodec roq_decoder = {
- "roqvideo",
- CODEC_TYPE_VIDEO,
- CODEC_ID_ROQ,
- sizeof(RoqContext),
- roq_decode_init,
- NULL,
- roq_decode_end,
- roq_decode_frame,
- CODEC_CAP_DR1,
+AVCodec ff_roq_decoder = {
+ .name = "roqvideo",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_ROQ,
+ .priv_data_size = sizeof(RoqContext),
+ .init = roq_decode_init,
+ .close = roq_decode_end,
+ .decode = roq_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
};
projects / ffmpeg / blobdiff