Ticket #5581: vp_interlaced.diff

libavcodec/vp6data.h

@@ -47 +47 @@
     14, 14, 15, 15, 15, 15, 15, 15,
 };
 
+static const uint8_t vp6_il_coeff_reorder[] = {
+     0,  1,  0,  1,  1,  2,  5,  3,
+     2,  2,  2,  2,  4,  7,  8, 10,
+     9,  7,  5,  4,  2,  3,  5,  6,
+     8,  9, 11, 12, 13, 12, 11, 10,
+     9,  7,  5,  4,  6,  7,  9, 11,
+    12, 12, 13, 13, 14, 12, 11,  9,
+     7,  9, 11, 12, 14, 14, 14, 15,
+    13, 11, 13, 15, 15, 15, 15, 15,
+};
+
 static const uint8_t vp6_def_runv_coeff_model[2][14] = {
     { 198, 197, 196, 146, 198, 204, 169, 142, 130, 136, 149, 149, 191, 249 },
     { 135, 201, 181, 154,  98, 117, 132, 126, 146, 169, 184, 240, 246, 254 },

libavcodec/vp56.c

@@ -399 +399 @@
     vp56_frame_t ref_frame;
     int b, ab, b_max, plane, off;
 
+    if (s->interlaced) {
+        int prob = s->il_prob;
+
+        if (row > 0) {
+            if (s->il_block)
+                prob -= prob >> 1;
+            else
+                prob += (256 - prob) >> 1;  /* can be simplified/combined */
+        }
+
+        s->il_block = vp56_rac_get_prob(&s->c, prob);
+
+        if (s->il_block) {
+            s->block_offset[2] -= s->stride[0] * 7;
+            s->block_offset[3] -= s->stride[0] * 7;
+            s->stride[0] *= 2;
+        }
+    }
+
     if (s->framep[VP56_FRAME_CURRENT]->key_frame)
         mb_type = VP56_MB_INTRA;
     else
@@ -457 +476 @@
             }
             break;
     }
+
+    if (s->il_block) {
+        s->stride[0] /= 2;
+        s->block_offset[2] += s->stride[0] * 7;
+        s->block_offset[3] += s->stride[0] * 7;
+    }
 }
 
 static int vp56_size_changed(AVCodecContext *avctx)
@@ -546 +571 @@
 
         s->parse_coeff_models(s);
 
+        if (s->interlaced)
+            s->il_prob = vp56_rac_gets(&s->c, 8);
+
         memset(s->prev_dc, 0, sizeof(s->prev_dc));
         s->prev_dc[1][VP56_FRAME_CURRENT] = 128;
         s->prev_dc[2][VP56_FRAME_CURRENT] = 128;

libavcodec/vp56.h

@@ -120 +120 @@
     vp56_mb_t mb_type;
     vp56_macroblock_t *macroblocks;
     DECLARE_ALIGNED_16(DCTELEM, block_coeff[6][64]);
+    const uint8_t *def_coeff_reorder;/* used in vp6 only */
 
     /* motion vectors */
     vp56_mv_t mv[6];  /* vectors for each block in MB */
@@ -139 +140 @@
 
     int has_alpha;
 
+    /* interlacing params */
+    int interlaced;
+    int il_prob;
+    int il_block;
+
     /* upside-down flipping hints */
     int flip;  /* are we flipping ? */
     int frbi;  /* first row block index in MB */

libavcodec/vp5.c

@@ -50 +50 @@
         if(vp56_rac_gets(c, 5) > 5)
             return 0;
         vp56_rac_gets(c, 2);
-        if (vp56_rac_get(c)) {
-            av_log(s->avctx, AV_LOG_ERROR, "interlacing not supported\n");
-            return 0;
-        }
+        s->interlaced = vp56_rac_get(c);
         rows = vp56_rac_gets(c, 8);  /* number of stored macroblock rows */
         cols = vp56_rac_gets(c, 8);  /* number of stored macroblock cols */
         vp56_rac_gets(c, 8);  /* number of displayed macroblock rows */

libavcodec/vp6.c

@@ -61 +61 @@
         if (sub_version > 8)
             return 0;
         s->filter_header = buf[1] & 0x06;
-        if (buf[1] & 1) {
-            av_log(s->avctx, AV_LOG_ERROR, "interlacing not supported\n");
-            return 0;
-        }
+        s->interlaced = buf[1] & 1;
+        if (s->interlaced)
+            s->def_coeff_reorder = vp6_il_coeff_reorder;
+        else
+            s->def_coeff_reorder = vp6_def_coeff_reorder;
         if (separated_coeff || !s->filter_header) {
             coeff_offset = AV_RB16(buf+2) - 2;
             buf += 2;
@@ -174 +175 @@
     memcpy(model->vector_fdv, vp6_def_fdv_vector_model, sizeof(model->vector_fdv));
     memcpy(model->vector_pdv, vp6_def_pdv_vector_model, sizeof(model->vector_pdv));
     memcpy(model->coeff_runv, vp6_def_runv_coeff_model, sizeof(model->coeff_runv));
-    memcpy(model->coeff_reorder, vp6_def_coeff_reorder, sizeof(model->coeff_reorder));
+    memcpy(model->coeff_reorder, s->def_coeff_reorder, sizeof(model->coeff_reorder));
 
     vp6_coeff_order_table_init(s);
 }