diff options
| author | Jerome Jiang <jianj@google.com> | 2019-03-21 19:49:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-21 19:49:51 +0000 |
| commit | 674b2cb40cd03e2ec4f1022fbab71f3c8a315a37 (patch) | |
| tree | 11d589fb9932a0d1f734cb729ea98e2b71c788f2 | |
| parent | 80ea2788b168399807121df7e6052a8462c9ed1e (diff) | |
| parent | 633cd97ee9af34ca1a0d4f3ce0d751c07334eace (diff) | |
| download | libvpx-674b2cb40cd03e2ec4f1022fbab71f3c8a315a37.tar libvpx-674b2cb40cd03e2ec4f1022fbab71f3c8a315a37.tar.gz libvpx-674b2cb40cd03e2ec4f1022fbab71f3c8a315a37.tar.bz2 libvpx-674b2cb40cd03e2ec4f1022fbab71f3c8a315a37.zip | |
Merge "vp9: remove condition on high bitdepth using simple block yrd."
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 0f29739fd..54479b59b 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -680,25 +680,6 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *this_rdc, 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 && |