/*
* Copyright (C) 2003 the ffmpeg project
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
AVCodecContext *avctx;
DSPContext dsp;
- AVFrame last_frame;
- AVFrame current_frame;
+ AVFrame frames[2];
+ AVFrame *last_frame;
+ AVFrame *current_frame;
int first_frame;
int y_stride;
int c_stride;
{
unsigned char *yptr;
- yptr = ri->current_frame.data[0] + (y * ri->y_stride) + x;
+ yptr = ri->current_frame->data[0] + (y * ri->y_stride) + x;
*yptr++ = cell->y0;
*yptr++ = cell->y1;
yptr += (ri->y_stride - 2);
*yptr++ = cell->y2;
*yptr++ = cell->y3;
- ri->current_frame.data[1][(y/2) * (ri->c_stride) + x/2] = cell->u;
- ri->current_frame.data[2][(y/2) * (ri->c_stride) + x/2] = cell->v;
+ ri->current_frame->data[1][(y/2) * (ri->c_stride) + x/2] = cell->u;
+ ri->current_frame->data[2][(y/2) * (ri->c_stride) + x/2] = cell->v;
}
static void apply_vector_4x4(RoqContext *ri, int x, int y, roq_cell *cell)
register unsigned char y0, y1, u, v;
unsigned char *yptr, *uptr, *vptr;
- yptr = ri->current_frame.data[0] + (y * ri->y_stride) + x;
- uptr = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2;
- vptr = ri->current_frame.data[2] + (y/2) * (ri->c_stride) + x/2;
+ yptr = ri->current_frame->data[0] + (y * ri->y_stride) + x;
+ uptr = ri->current_frame->data[1] + (y/2) * (ri->c_stride) + x/2;
+ vptr = ri->current_frame->data[2] + (y/2) * (ri->c_stride) + x/2;
row_inc = ri->y_stride - 4;
c_row_inc = (ri->c_stride) - 2;
mx = x + 8 - (mv >> 4) - mean_x;
my = y + 8 - (mv & 0xf) - mean_y;
- pa = ri->current_frame.data[0] + (y * ri->y_stride) + x;
- pb = ri->last_frame.data[0] + (my * ri->y_stride) + mx;
+ /* check MV against frame boundaries */
+ if ((mx < 0) || (mx > ri->avctx->width - 4) ||
+ (my < 0) || (my > ri->avctx->height - 4)) {
+ av_log(ri->avctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n",
+ mx, my, ri->avctx->width, ri->avctx->height);
+ return;
+ }
+
+ pa = ri->current_frame->data[0] + (y * ri->y_stride) + x;
+ pb = ri->last_frame->data[0] + (my * ri->y_stride) + mx;
for(i = 0; i < 4; i++) {
pa[0] = pb[0];
pa[1] = pb[1];
pb += ri->y_stride;
}
-#if 0
- pa = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2;
- pb = ri->last_frame.data[1] + (my/2) * (ri->c_stride) + (mx + 1)/2;
- for(i = 0; i < 2; i++) {
- pa[0] = pb[0];
- pa[1] = pb[1];
- pa += ri->c_stride;
- pb += ri->c_stride;
- }
-
- pa = ri->current_frame.data[2] + (y/2) * (ri->c_stride) + x/2;
- pb = ri->last_frame.data[2] + (my/2) * (ri->c_stride) + (mx + 1)/2;
- for(i = 0; i < 2; i++) {
- pa[0] = pb[0];
- pa[1] = pb[1];
- pa += ri->c_stride;
- pb += ri->c_stride;
- }
-#else
hw = ri->y_stride/2;
- pa = ri->current_frame.data[1] + (y * ri->y_stride)/4 + x/2;
- pb = ri->last_frame.data[1] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
+ pa = ri->current_frame->data[1] + (y * ri->y_stride)/4 + x/2;
+ pb = ri->last_frame->data[1] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
for(i = 0; i < 2; i++) {
switch(((my & 0x01) << 1) | (mx & 0x01)) {
break;
}
- pa = ri->current_frame.data[2] + (y * ri->y_stride)/4 + x/2;
- pb = ri->last_frame.data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
+ pa = ri->current_frame->data[2] + (y * ri->y_stride)/4 + x/2;
+ pb = ri->last_frame->data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
}
-#endif
}
static void apply_motion_8x8(RoqContext *ri, int x, int y,
mx = x + 8 - (mv >> 4) - mean_x;
my = y + 8 - (mv & 0xf) - mean_y;
- pa = ri->current_frame.data[0] + (y * ri->y_stride) + x;
- pb = ri->last_frame.data[0] + (my * ri->y_stride) + mx;
+ /* check MV against frame boundaries */
+ if ((mx < 0) || (mx > ri->avctx->width - 8) ||
+ (my < 0) || (my > ri->avctx->height - 8)) {
+ av_log(ri->avctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n",
+ mx, my, ri->avctx->width, ri->avctx->height);
+ return;
+ }
+
+ pa = ri->current_frame->data[0] + (y * ri->y_stride) + x;
+ pb = ri->last_frame->data[0] + (my * ri->y_stride) + mx;
for(i = 0; i < 8; i++) {
pa[0] = pb[0];
pa[1] = pb[1];
pb += ri->y_stride;
}
-#if 0
- pa = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2;
- pb = ri->last_frame.data[1] + (my/2) * (ri->c_stride) + (mx + 1)/2;
- for(i = 0; i < 4; i++) {
- pa[0] = pb[0];
- pa[1] = pb[1];
- pa[2] = pb[2];
- pa[3] = pb[3];
- pa += ri->c_stride;
- pb += ri->c_stride;
- }
-
- pa = ri->current_frame.data[2] + (y/2) * (ri->c_stride) + x/2;
- pb = ri->last_frame.data[2] + (my/2) * (ri->c_stride) + (mx + 1)/2;
- for(i = 0; i < 4; i++) {
- pa[0] = pb[0];
- pa[1] = pb[1];
- pa[2] = pb[2];
- pa[3] = pb[3];
- pa += ri->c_stride;
- pb += ri->c_stride;
- }
-#else
hw = ri->c_stride;
- pa = ri->current_frame.data[1] + (y * ri->y_stride)/4 + x/2;
- pb = ri->last_frame.data[1] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
+ pa = ri->current_frame->data[1] + (y * ri->y_stride)/4 + x/2;
+ pb = ri->last_frame->data[1] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
for(j = 0; j < 2; j++) {
for(i = 0; i < 4; i++) {
switch(((my & 0x01) << 1) | (mx & 0x01)) {
pa[2] = avg2(pb[2], pb[3]);
pa[3] = avg2(pb[3], pb[4]);
break;
-
+
case 2:
pa[0] = avg2(pb[0], pb[hw]);
pa[1] = avg2(pb[1], pb[hw+1]);
pb += ri->c_stride;
}
- pa = ri->current_frame.data[2] + (y * ri->y_stride)/4 + x/2;
- pb = ri->last_frame.data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
+ pa = ri->current_frame->data[2] + (y * ri->y_stride)/4 + x/2;
+ pb = ri->last_frame->data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
}
-#endif
}
static void roqvideo_decode_frame(RoqContext *ri)
apply_motion_4x4(ri, x, y, 0, 8, 8);
break;
case RoQ_ID_FCC:
- apply_motion_4x4(ri, x, y, buf[bpos++],
+ apply_motion_4x4(ri, x, y, buf[bpos++],
chunk_arg >> 8, chunk_arg & 0xff);
break;
case RoQ_ID_SLD:
}
break;
default:
- printf("Unknown vq code: %d\n", vqid);
+ av_log(ri->avctx, AV_LOG_ERROR, "Unknown vq code: %d\n", vqid);
}
}
s->avctx = avctx;
s->first_frame = 1;
+ s->last_frame = &s->frames[0];
+ s->current_frame = &s->frames[1];
avctx->pix_fmt = PIX_FMT_YUV420P;
- avctx->has_b_frames = 0;
dsputil_init(&s->dsp, avctx);
uiclp = uiclip+512;
{
RoqContext *s = avctx->priv_data;
- *data_size = 0;
-
- if (avctx->get_buffer(avctx, &s->current_frame)) {
- printf (" RoQ: get_buffer() failed\n");
+ if (avctx->get_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];
+ s->y_stride = s->current_frame->linesize[0];
+ s->c_stride = s->current_frame->linesize[1];
s->buf = buf;
s->size = buf_size;
if (s->first_frame)
s->first_frame = 0;
else
- avctx->release_buffer(avctx, &s->last_frame);
-
- /* shuffle frames */
- s->last_frame = s->current_frame;
+ avctx->release_buffer(avctx, s->last_frame);
*data_size = sizeof(AVFrame);
- *(AVFrame*)data = s->current_frame;
+ *(AVFrame*)data = *s->current_frame;
+
+ /* shuffle frames */
+ FFSWAP(AVFrame *, s->current_frame, s->last_frame);
return buf_size;
}
RoqContext *s = avctx->priv_data;
/* release the last frame */
- avctx->release_buffer(avctx, &s->last_frame);
+ if (s->last_frame->data[0])
+ avctx->release_buffer(avctx, s->last_frame);
return 0;
}
projects / ffmpeg / blobdiff