Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'

[ffmpeg] / libavcodec / vc1.c

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 208fef33a59463771bf3a0c509fbba93ddf0b646..0eb5e2f642de1df36f2e7bbd48bb118d896b2c2f 100644 (file)
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -576,25 +576,6 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
     return 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);
-}
-
 /* fill lookup tables for intensity compensation */
 #define INIT_LUT(lumscale, lumshift, luty, lutuv, chain)   do {\
     int scale, shift, i;                            \
@@ -619,6 +600,29 @@ static void rotate_luts(VC1Context *v)
     }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);
+    v->curr_use_ic = 0;
+}
+
 int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
 {
     int pqindex, lowquant, status;
@@ -709,9 +713,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
 
     if(v->first_pic_header_flag) {
         rotate_luts(v);
-        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;
     }
 
     switch (v->s.pict_type) {
@@ -866,9 +867,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
         if (fcm) {
             if (fcm == ILACE_FIELD)
                 field_mode = 1;
-            if (!v->warn_interlaced++)
-                av_log(v->s.avctx, AV_LOG_ERROR,
-                       "Interlaced frames/fields support is incomplete\n");
         }
     } else {
         fcm = PROGRESSIVE;
@@ -989,9 +987,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
 
     if(v->first_pic_header_flag) {
         rotate_luts(v);
-        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;
     }
 
     switch (v->s.pict_type) {
@@ -1115,7 +1110,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
                         INIT_LUT(v->lumscale2, v->lumshift2, v->curr_luty[v->cur_field_type^1], v->curr_lutuv[v->cur_field_type^1], 0);
                         INIT_LUT(v->lumscale , v->lumshift , v->last_luty[v->cur_field_type  ], v->last_lutuv[v->cur_field_type  ], 1);
                     }
-                    v->curr_use_ic = 1;
+                    v->next_use_ic = v->curr_use_ic = 1;
                 } else {
                     INIT_LUT(v->lumscale , v->lumshift , v->last_luty[0], v->last_lutuv[0], 1);
                     INIT_LUT(v->lumscale2, v->lumshift2, v->last_luty[1], v->last_lutuv[1], 1);