shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Refactor encode_superblock function"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3617,16 +3617,8 @@

     vp9_build_inter_predictors_sbuv(xd, mi_row, mi_col, MAX(bsize, BLOCK_8X8));

-    if (!x->skip) {

-      mbmi->skip = 1;

-      vp9_encode_sb(x, MAX(bsize, BLOCK_8X8));

-      vp9_tokenize_sb(cpi, t, !output_enabled, MAX(bsize, BLOCK_8X8));

-    } else {

-      mbmi->skip = 1;

-      if (output_enabled && !seg_skip)

-        cm->counts.skip[vp9_get_skip_context(xd)][1]++;

-      reset_skip_context(xd, MAX(bsize, BLOCK_8X8));

-    }

+    vp9_encode_sb(x, MAX(bsize, BLOCK_8X8));

+    vp9_tokenize_sb(cpi, t, !output_enabled, MAX(bsize, BLOCK_8X8));

   }

   if (output_enabled) {

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -574,6 +574,11 @@

   struct encode_b_args arg = {x, &ctx, &mbmi->skip};

   int plane;

+  mbmi->skip = 1;

+

+  if (x->skip)

+    return;

+

   for (plane = 0; plane < MAX_MB_PLANE; ++plane) {

     if (!x->skip_recode)

       vp9_subtract_plane(x, bsize, plane);