shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: remove condition on high bitdepth using simple block yrd."

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -680,25 +680,6 @@

   const int bw = 4 * num_4x4_w;

   const int bh = 4 * num_4x4_h;

-#if CONFIG_VP9_HIGHBITDEPTH

-  // TODO(jingning): Implement the high bit-depth Hadamard transforms and

-  // remove this check condition.

-  // TODO(marpan): Use this path (model_rd) for 8bit under certain conditions

-  // for now, as the vp9_quantize_fp below for highbitdepth build is slow.

-  if (xd->bd != 8 ||

-      (cpi->oxcf.speed > 5 && cpi->common.frame_type != KEY_FRAME &&

-       bsize < BLOCK_32X32)) {

-    unsigned int var_y, sse_y;

-    (void)tx_size;

-    if (!rd_computed)

-      model_rd_for_sb_y(cpi, bsize, x, xd, &this_rdc->rate, &this_rdc->dist,

-                        &var_y, &sse_y);

-    *sse = INT_MAX;

-    *skippable = 0;

-    return;

-  }

-#endif

-

   if (cpi->sf.use_simple_block_yrd && cpi->common.frame_type != KEY_FRAME &&

       (bsize < BLOCK_32X32 ||

        (cpi->use_svc &&