From 66117b97c5c7a164ded875b37274da3e741bd56f Mon Sep 17 00:00:00 2001 From: Peter de Rivaz Date: Wed, 26 Apr 2017 11:40:58 +0100 Subject: [PATCH] VP9: enable trellis for high bitdepth intra BUG=webm:1409 Change-Id: I5236595aac1c09386c60ffe8ad621e01422ed5a7 --- vp9/encoder/vp9_encodemb.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 0940d9a61..16eea8fa2 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -810,6 +810,9 @@ void vp9_encode_block_intra(int plane, int block, int row, int col, qcoeff, dqcoeff, pd->dequant, eob, scan_order->scan, scan_order->iscan); } + if (args->enable_coeff_opt && !x->skip_recode) { + *a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; + } if (!x->skip_encode && *eob) { vp9_highbd_idct32x32_add(dqcoeff, dst, dst_stride, *eob, xd->bd); } @@ -827,6 +830,9 @@ void vp9_encode_block_intra(int plane, int block, int row, int col, pd->dequant, eob, scan_order->scan, scan_order->iscan); } + if (args->enable_coeff_opt && !x->skip_recode) { + *a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; + } if (!x->skip_encode && *eob) { vp9_highbd_iht16x16_add(tx_type, dqcoeff, dst, dst_stride, *eob, xd->bd); @@ -845,6 +851,9 @@ void vp9_encode_block_intra(int plane, int block, int row, int col, pd->dequant, eob, scan_order->scan, scan_order->iscan); } + if (args->enable_coeff_opt && !x->skip_recode) { + *a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; + } if (!x->skip_encode && *eob) { vp9_highbd_iht8x8_add(tx_type, dqcoeff, dst, dst_stride, *eob, xd->bd); @@ -863,7 +872,9 @@ void vp9_encode_block_intra(int plane, int block, int row, int col, pd->dequant, eob, scan_order->scan, scan_order->iscan); } - + if (args->enable_coeff_opt && !x->skip_recode) { + *a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; + } if (!x->skip_encode && *eob) { if (tx_type == DCT_DCT) { // this is like vp9_short_idct4x4 but has a special case around -- 2.40.0