[FFmpeg-cvslog] r9168 - in trunk/libavcodec: roqvideo.h roqvideodec.c

[michael]

Author: michael
Date: Fri Jun  1 23:17:05 2007
New Revision: 9168

Log:
fix skiped blocks
fixes decoding of (http://icculus.org/~riot/bf2introseg.bz2)


Modified:
   trunk/libavcodec/roqvideo.h
   trunk/libavcodec/roqvideodec.c

Modified: trunk/libavcodec/roqvideo.h
==============================================================================
--- trunk/libavcodec/roqvideo.h	(original)
+++ trunk/libavcodec/roqvideo.h	Fri Jun  1 23:17:05 2007
@@ -38,7 +38,6 @@ typedef struct RoqContext {
     AVFrame frames[2];
     AVFrame *last_frame;
     AVFrame *current_frame;
-    int first_frame;
     int y_stride;
     int c_stride;
 

Modified: trunk/libavcodec/roqvideodec.c
==============================================================================
--- trunk/libavcodec/roqvideodec.c	(original)
+++ trunk/libavcodec/roqvideodec.c	Fri Jun  1 23:17:05 2007
@@ -92,7 +92,6 @@ static void roqvideo_decode_frame(RoqCon
 
                 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));
@@ -122,7 +121,6 @@ static void roqvideo_decode_frame(RoqCon
                         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));
@@ -167,7 +165,6 @@ static int roq_decode_init(AVCodecContex
     RoqContext *s = avctx->priv_data;
 
     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;
@@ -182,7 +179,7 @@ static int roq_decode_frame(AVCodecConte
 {
     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");
         return -1;
     }
@@ -193,12 +190,6 @@ static int roq_decode_frame(AVCodecConte
     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;
 
@@ -215,6 +206,8 @@ static int roq_decode_end(AVCodecContext
     /* 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;
 }