[06/15] vc1dec: Drop mv_f_last, simplify code

Message ID 1369729571-75967-6-git-send-email-martin@martin.st
State Superseded
Headers show

Commit Message

Martin Storsjö May 28, 2013, 8:26 a.m.
From: Michael Niedermayer <michaelni@gmx.at>

---
 libavcodec/vc1.h    |    1 -
 libavcodec/vc1dec.c |   15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

Comments

Kostya Shishkov May 28, 2013, 9:30 a.m. | #1
On Tue, May 28, 2013 at 11:26:02AM +0300, Martin Storsjö wrote:
> From: Michael Niedermayer <michaelni@gmx.at>
> 
> ---
>  libavcodec/vc1.h    |    1 -
>  libavcodec/vc1dec.c |   15 ++-------------
>  2 files changed, 2 insertions(+), 14 deletions(-)

Probably OK though if it was unused before then it makes sense to merge this
into the first patch, otherwise an explanation that it's not used anymore
would be good.

Patch

diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index 1883f11..8439203 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -356,7 +356,6 @@  typedef struct VC1Context{
     int8_t zzi_8x8[64];
     uint8_t *blk_mv_type_base, *blk_mv_type;    ///< 0: frame MV, 1: field MV (interlaced frame)
     uint8_t *mv_f_base, *mv_f[2];               ///< 0: MV obtained from same field, 1: opposite field
-    uint8_t *mv_f_last_base, *mv_f_last[2];
     uint8_t *mv_f_next_base, *mv_f_next[2];
     int field_mode;         ///< 1 for interlaced field pictures
     int fptype;
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 1581633..fb0c5c2 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5463,9 +5463,6 @@  av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
     v->mv_f_base        = av_mallocz(2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
     v->mv_f[0]          = v->mv_f_base + s->b8_stride + 1;
     v->mv_f[1]          = v->mv_f[0] + (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
-    v->mv_f_last_base   = av_mallocz(2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
-    v->mv_f_last[0]     = v->mv_f_last_base + s->b8_stride + 1;
-    v->mv_f_last[1]     = v->mv_f_last[0] + (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
     v->mv_f_next_base   = av_mallocz(2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
     v->mv_f_next[0]     = v->mv_f_next_base + s->b8_stride + 1;
     v->mv_f_next[1]     = v->mv_f_next[0] + (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
@@ -5663,7 +5660,6 @@  av_cold int ff_vc1_decode_end(AVCodecContext *avctx)
     av_freep(&v->mb_type_base);
     av_freep(&v->blk_mv_type_base);
     av_freep(&v->mv_f_base);
-    av_freep(&v->mv_f_last_base);
     av_freep(&v->mv_f_next_base);
     av_freep(&v->block);
     av_freep(&v->cbp_base);
@@ -5988,15 +5984,8 @@  static int vc1_decode_frame(AVCodecContext *avctx, void *data,
             s->linesize                      >>= 1;
             s->uvlinesize                    >>= 1;
             if (v->s.pict_type != AV_PICTURE_TYPE_BI && v->s.pict_type != AV_PICTURE_TYPE_B) {
-                uint8_t *tmp[2];
-                tmp[0]          = v->mv_f_last[0];
-                tmp[1]          = v->mv_f_last[1];
-                v->mv_f_last[0] = v->mv_f_next[0];
-                v->mv_f_last[1] = v->mv_f_next[1];
-                v->mv_f_next[0] = v->mv_f[0];
-                v->mv_f_next[1] = v->mv_f[1];
-                v->mv_f[0] = tmp[0];
-                v->mv_f[1] = tmp[1];
+                FFSWAP(uint8_t *, v->mv_f_next[0], v->mv_f[0]);
+                FFSWAP(uint8_t *, v->mv_f_next[1], v->mv_f[1]);
             }
         }
         av_dlog(s->avctx, "Consumed %i/%i bits\n",