shithub: libvpx

Info  •  Files  •  Log  •  Branches

Simplify model_rd_for_sb HBD ifdefs

Change-Id: Ic1ce346a053800ae3b2d77178f46e6a388357f6d

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

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

@@ -172,6 +172,12 @@

   const int shift = 6;

   int rate;

   int64_t dist;

+  const int dequant_shift =

+#if CONFIG_VP9_HIGHBITDEPTH

+      (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) ?

+          xd->bd - 5 :

+#endif  // CONFIG_VP9_HIGHBITDEPTH

+          3;

   x->pred_sse[ref] = 0;

@@ -237,12 +243,7 @@

     if (cpi->sf.simple_model_rd_from_var) {

       int64_t rate;

       const int64_t square_error = sum_sse;

-      int quantizer = (pd->dequant[1] >> 3);

-#if CONFIG_VP9_HIGHBITDEPTH

-      if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {

-        quantizer >>= (xd->bd - 8);

-      }

-#endif  // CONFIG_VP9_HIGHBITDEPTH

+      int quantizer = (pd->dequant[1] >> dequant_shift);

       if (quantizer < 120)

         rate = (square_error * (280 - quantizer)) >> 8;

@@ -252,19 +253,9 @@

       rate_sum += rate;

       dist_sum += dist;

     } else {

-#if CONFIG_VP9_HIGHBITDEPTH

-      if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {

-        vp9_model_rd_from_var_lapndz(sum_sse, num_pels_log2_lookup[bs],

-                                     pd->dequant[1] >> (xd->bd - 5),

-                                     &rate, &dist);

-      } else {

-        vp9_model_rd_from_var_lapndz(sum_sse, num_pels_log2_lookup[bs],

-                                     pd->dequant[1] >> 3, &rate, &dist);

-      }

-#else

       vp9_model_rd_from_var_lapndz(sum_sse, num_pels_log2_lookup[bs],

-                                   pd->dequant[1] >> 3, &rate, &dist);

-#endif  // CONFIG_VP9_HIGHBITDEPTH

+                                   pd->dequant[1] >> dequant_shift,

+                                   &rate, &dist);

       rate_sum += rate;

       dist_sum += dist;

     }