virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

fix skipped blocks

Browse Source 
fixes decoding of (http://samples.mplayerhq.hu/game-formats/idroq/bf2introseg.roq)

Originally committed as revision 9168 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-06-01 21:17:05 +00:00
parent 1fee8b3a8c
commit 29b29011e5
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/roqvideo.h
-1
View File
@@ -38,7 +38,6 @@ typedef struct RoqContext {
AVFrame frames[2]; AVFrame frames[2];
AVFrame *last_frame; AVFrame *last_frame;
AVFrame *current_frame; AVFrame *current_frame;
int first_frame;
int y_stride; int y_stride;
int c_stride; int c_stride;
libavcodec/roqvideodec.c
+3 -10
View File
@@ -92,7 +92,6 @@ static void roqvideo_decode_frame(RoqContext *ri)
switch(vqid) { switch(vqid) {
case RoQ_ID_MOT: case RoQ_ID_MOT:
ff_apply_motion_8x8(ri, xp, yp, 0, 0);
break; break;
case RoQ_ID_FCC: case RoQ_ID_FCC:
mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8)); mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
@@ -122,7 +121,6 @@ static void roqvideo_decode_frame(RoqContext *ri)
vqflg_pos--; vqflg_pos--;
switch(vqid) { switch(vqid) {
case RoQ_ID_MOT: case RoQ_ID_MOT:
ff_apply_motion_4x4(ri, x, y, 0, 0);
break; break;
case RoQ_ID_FCC: case RoQ_ID_FCC:
mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8)); mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
@@ -167,7 +165,6 @@ static int roq_decode_init(AVCodecContext *avctx)
RoqContext *s = avctx->priv_data; RoqContext *s = avctx->priv_data;
s->avctx = avctx; s->avctx = avctx;
s->first_frame = 1;
s->last_frame = &s->frames[0]; s->last_frame = &s->frames[0];
s->current_frame = &s->frames[1]; s->current_frame = &s->frames[1];
avctx->pix_fmt = PIX_FMT_YUV420P; avctx->pix_fmt = PIX_FMT_YUV420P;
@@ -182,7 +179,7 @@ static int roq_decode_frame(AVCodecContext *avctx,
{ {
RoqContext *s = avctx->priv_data; RoqContext *s = avctx->priv_data;
if (avctx->get_buffer(avctx, s->current_frame)) { if (avctx->reget_buffer(avctx, s->current_frame)) {
av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n");
return -1; return -1;
} }
@@ -193,12 +190,6 @@ static int roq_decode_frame(AVCodecContext *avctx,
s->size = buf_size; s->size = buf_size;
roqvideo_decode_frame(s); 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); *data_size = sizeof(AVFrame);
*(AVFrame*)data = *s->current_frame; *(AVFrame*)data = *s->current_frame;
@@ -215,6 +206,8 @@ static int roq_decode_end(AVCodecContext *avctx)
/* release the last frame */ /* release the last frame */
if (s->last_frame->data[0]) if (s->last_frame->data[0])
avctx->release_buffer(avctx, s->last_frame); avctx->release_buffer(avctx, s->last_frame);
if (s->current_frame->data[0])
avctx->release_buffer(avctx, s->current_frame);
return 0; return 0;
} }