shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "As you go mbmi->skip_coeff"

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

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

@@ -2543,6 +2543,7 @@

   }

   if (!is_inter_block(mbmi)) {

+    mbmi->skip_coeff = 1;

     vp9_encode_intra_block_y(x, MAX(bsize, BLOCK_8X8));

     vp9_encode_intra_block_uv(x, MAX(bsize, BLOCK_8X8));

     if (output_enabled)

@@ -2561,6 +2562,7 @@

   if (!is_inter_block(mbmi)) {

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

   } else if (!x->skip) {

+    mbmi->skip_coeff = 1;

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

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

   } else {

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

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

@@ -451,6 +451,9 @@

     ctx->tl[plane][j] = p->eobs[block] > 0;

   }

+  if (p->eobs[block])

+    *(args->skip_coeff) = 0;

+

   if (x->skip_encode || p->eobs[block] == 0)

     return;

@@ -474,7 +477,6 @@

       assert(0 && "Invalid transform size");

   }

 }

-

 static void encode_block_pass1(int plane, int block, BLOCK_SIZE plane_bsize,

                                TX_SIZE tx_size, void *arg) {

   struct encode_b_args *const args = arg;

@@ -499,7 +501,8 @@

 void vp9_encode_sby(MACROBLOCK *x, BLOCK_SIZE bsize) {

   MACROBLOCKD *const xd = &x->e_mbd;

   struct optimize_ctx ctx;

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

+  MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;

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

   vp9_subtract_sby(x, bsize);

   if (x->optimize)

@@ -511,7 +514,8 @@

 void vp9_encode_sb(MACROBLOCK *x, BLOCK_SIZE bsize) {

   MACROBLOCKD *const xd = &x->e_mbd;

   struct optimize_ctx ctx;

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

+  MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;

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

   if (!x->skip_recode)

     vp9_subtract_sb(x, bsize);

@@ -655,12 +659,15 @@

     default:

       assert(0);

   }

+  if (*eob)

+    *(args->skip_coeff) = 0;

 }

 void vp9_encode_intra_block_y(MACROBLOCK *x, BLOCK_SIZE bsize) {

   MACROBLOCKD* const xd = &x->e_mbd;

   struct optimize_ctx ctx;

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

+  MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;

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

   foreach_transformed_block_in_plane(xd, bsize, 0, vp9_encode_block_intra,

                                      &arg);

@@ -668,7 +675,8 @@

 void vp9_encode_intra_block_uv(MACROBLOCK *x, BLOCK_SIZE bsize) {

   MACROBLOCKD* const xd = &x->e_mbd;

   struct optimize_ctx ctx;

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

+  MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;

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

   foreach_transformed_block_uv(xd, bsize, vp9_encode_block_intra, &arg);

 }

--- a/vp9/encoder/vp9_encodemb.h

+++ b/vp9/encoder/vp9_encodemb.h

@@ -24,6 +24,7 @@

 struct encode_b_args {

   MACROBLOCK *x;

   struct optimize_ctx *ctx;

+  unsigned char *skip_coeff;

 };

 void vp9_encode_sb(MACROBLOCK *x, BLOCK_SIZE bsize);

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -632,7 +632,9 @@

   struct rdcost_block_args *args = arg;

   MACROBLOCK *const x = args->x;

   MACROBLOCKD *const xd = &x->e_mbd;

-  struct encode_b_args encode_args = {x, NULL};

+  MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;

+  struct encode_b_args encode_args = {x, NULL, &mbmi->skip_coeff};

+

   int64_t rd1, rd2, rd;

   if (args->skip)

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -299,8 +299,6 @@

   const int skip_inc = !vp9_segfeature_active(&cm->seg, mbmi->segment_id,

                                               SEG_LVL_SKIP);

   struct tokenize_b_args arg = {cpi, xd, t, mbmi->tx_size, cpi->mb.token_cache};

-

-  mbmi->skip_coeff = sb_is_skippable(&cpi->mb, bsize);

   if (mbmi->skip_coeff) {

     if (!dry_run)

       cm->counts.mbskip[ctx][1] += skip_inc;

-- 

⑨