Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'

* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 26 insertions, 29 deletions

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index e4b62fe3de..f7558116d1 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -578,7 +578,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
 }
 
 /* fill lookup tables for intensity compensation */
-#define INIT_LUT(lumscale, lumshift, luty, lutuv, chain)   do {               \
+#define INIT_LUT(lumscale, lumshift, luty, lutuv, chain) do {                 \
         int scale, shift, i;                                                  \
         if (!lumscale) {                                                      \
             scale = -64;                                                      \
@@ -593,34 +593,33 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
                 shift = lumshift << 6;                                        \
         }                                                                     \
         for (i = 0; i < 256; i++) {                                           \
-            int iy = chain ? luty[i] : i;                                     \
+            int iy = chain ? luty[i]  : i;                                    \
             int iu = chain ? lutuv[i] : i;                                    \
             luty[i]  = av_clip_uint8((scale * iy + shift + 32) >> 6);         \
             lutuv[i] = av_clip_uint8((scale * (iu - 128) + 128*64 + 32) >> 6);\
         }                                                                     \
     } while(0)
 
-
 static void rotate_luts(VC1Context *v)
 {
-#define ROTATE(DEF, L, N, C, A) do {\
-        if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) {\
-            C = A;\
-        } else {\
-            DEF;\
-            memcpy(&tmp, &L  , sizeof(tmp));\
-            memcpy(&L  , &N  , sizeof(tmp));\
-            memcpy(&N  , &tmp, sizeof(tmp));\
-            C = N;\
-        }\
-    }while(0)
-
-        ROTATE(int tmp            , v->last_use_ic, v->next_use_ic, v->curr_use_ic, v->aux_use_ic);
-        ROTATE(uint8_t tmp[2][256], v->last_luty , v->next_luty , v->curr_luty , v->aux_luty);
-        ROTATE(uint8_t tmp[2][256], v->last_lutuv, v->next_lutuv, v->curr_lutuv, v->aux_lutuv);
-
-    INIT_LUT(32, 0 , v->curr_luty[0] , v->curr_lutuv[0] , 0);
-    INIT_LUT(32, 0 , v->curr_luty[1] , v->curr_lutuv[1] , 0);
+#define ROTATE(DEF, L, N, C, A) do {                          \
+        if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) { \
+            C = A;                                            \
+        } else {                                              \
+            DEF;                                              \
+            memcpy(&tmp, &L  , sizeof(tmp));                  \
+            memcpy(&L  , &N  , sizeof(tmp));                  \
+            memcpy(&N  , &tmp, sizeof(tmp));                  \
+            C = N;                                            \
+        }                                                     \
+    } while(0)
+
+    ROTATE(int tmp,             v->last_use_ic, v->next_use_ic, v->curr_use_ic, v->aux_use_ic);
+    ROTATE(uint8_t tmp[2][256], v->last_luty,   v->next_luty,   v->curr_luty,   v->aux_luty);
+    ROTATE(uint8_t tmp[2][256], v->last_lutuv,  v->next_lutuv,  v->curr_lutuv,  v->aux_lutuv);
+
+    INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
+    INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
     v->curr_use_ic = 0;
 }
 
@@ -712,9 +711,8 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
             (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'),
             pqindex, v->pq, v->halfpq, v->rangeredfrm);
 
-    if(v->first_pic_header_flag) {
+    if (v->first_pic_header_flag)
         rotate_luts(v);
-    }
 
     switch (v->s.pict_type) {
     case AV_PICTURE_TYPE_P:
@@ -728,10 +726,10 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
             v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)];
             v->lumscale = get_bits(gb, 6);
             v->lumshift = get_bits(gb, 6);
-            v->last_use_ic   = 1;
+            v->last_use_ic = 1;
             /* fill lookup tables for intensity compensation */
-            INIT_LUT(v->lumscale, v->lumshift , v->last_luty[0] , v->last_lutuv[0] , 1);
-            INIT_LUT(v->lumscale, v->lumshift , v->last_luty[1] , v->last_lutuv[1] , 1);
+            INIT_LUT(v->lumscale, v->lumshift, v->last_luty[0], v->last_lutuv[0], 1);
+            INIT_LUT(v->lumscale, v->lumshift, v->last_luty[1], v->last_lutuv[1], 1);
         }
         v->qs_last = v->s.quarter_sample;
         if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
@@ -986,9 +984,8 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
     if (v->parse_only)
         return 0;
 
-    if(v->first_pic_header_flag) {
+    if (v->first_pic_header_flag)
         rotate_luts(v);
-    }
 
     switch (v->s.pict_type) {
     case AV_PICTURE_TYPE_I:
@@ -1086,7 +1083,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
                 mvmode2 = get_unary(gb, 1, 3);
                 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][mvmode2];
                 if (v->field_mode) {
-                    v->intcompfield = decode210(gb)^3;
+                    v->intcompfield = decode210(gb) ^ 3;
                 } else
                     v->intcompfield = 3;