shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_ethread: fix me consts initialization to support aq_mode=3 encoding"

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

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

@@ -3767,7 +3767,7 @@

   vp9_frame_init_quantizer(cpi);

   vp9_initialize_rd_consts(cpi);

-  vp9_initialize_me_consts(cpi, cm->base_qindex);

+  vp9_initialize_me_consts(cpi, x, cm->base_qindex);

   init_encode_frame_mb_context(cpi);

   cm->use_prev_frame_mvs = !cm->error_resilient_mode &&

                            cm->width == cm->last_width &&

--- a/vp9/encoder/vp9_quantize.c

+++ b/vp9/encoder/vp9_quantize.c

@@ -683,7 +683,7 @@

   x->errorperbit = rdmult >> 6;

   x->errorperbit += (x->errorperbit == 0);

-  vp9_initialize_me_consts(cpi, x->q_index);

+  vp9_initialize_me_consts(cpi, x, x->q_index);

 }

 void vp9_frame_init_quantizer(VP9_COMP *cpi) {

--- a/vp9/encoder/vp9_rd.c

+++ b/vp9/encoder/vp9_rd.c

@@ -204,27 +204,28 @@

   return MAX((int)(pow(q, RD_THRESH_POW) * 5.12), 8);

 }

-void vp9_initialize_me_consts(VP9_COMP *cpi, int qindex) {

+void vp9_initialize_me_consts(VP9_COMP *cpi, MACROBLOCK *x, int qindex) {

 #if CONFIG_VP9_HIGHBITDEPTH

   switch (cpi->common.bit_depth) {

     case VPX_BITS_8:

-      cpi->td.mb.sadperbit16 = sad_per_bit16lut_8[qindex];

-      cpi->td.mb.sadperbit4 = sad_per_bit4lut_8[qindex];

+      x->sadperbit16 = sad_per_bit16lut_8[qindex];

+      x->sadperbit4 = sad_per_bit4lut_8[qindex];

       break;

     case VPX_BITS_10:

-      cpi->td.mb.sadperbit16 = sad_per_bit16lut_10[qindex];

-      cpi->td.mb.sadperbit4 = sad_per_bit4lut_10[qindex];

+      x->sadperbit16 = sad_per_bit16lut_10[qindex];

+      x->sadperbit4 = sad_per_bit4lut_10[qindex];

       break;

     case VPX_BITS_12:

-      cpi->td.mb.sadperbit16 = sad_per_bit16lut_12[qindex];

-      cpi->td.mb.sadperbit4 = sad_per_bit4lut_12[qindex];

+      x->sadperbit16 = sad_per_bit16lut_12[qindex];

+      x->sadperbit4 = sad_per_bit4lut_12[qindex];

       break;

     default:

       assert(0 && "bit_depth should be VPX_BITS_8, VPX_BITS_10 or VPX_BITS_12");

   }

 #else

-  cpi->td.mb.sadperbit16 = sad_per_bit16lut_8[qindex];

-  cpi->td.mb.sadperbit4 = sad_per_bit4lut_8[qindex];

+  (void)cpi;

+  x->sadperbit16 = sad_per_bit16lut_8[qindex];

+  x->sadperbit4 = sad_per_bit4lut_8[qindex];

 #endif  // CONFIG_VP9_HIGHBITDEPTH

 }

--- a/vp9/encoder/vp9_rd.h

+++ b/vp9/encoder/vp9_rd.h

@@ -132,7 +132,7 @@

 void vp9_initialize_rd_consts(struct VP9_COMP *cpi);

-void vp9_initialize_me_consts(struct VP9_COMP *cpi, int qindex);

+void vp9_initialize_me_consts(struct VP9_COMP *cpi, MACROBLOCK *x, int qindex);

 void vp9_model_rd_from_var_lapndz(unsigned int var, unsigned int n,

                                   unsigned int qstep, int *rate,