From: hui su <huisu@google.com>
Date: Mon, 22 Jun 2015 16:54:42 +0000 (-0700)
Subject: Bug fix in tx-skip
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=315351e9deca6a1122831176f758c64053745b80;p=libvpx

Bug fix in tx-skip

This patch avoids using tx_size larger than 16x16 in lossless mode.
Big block quantization (32x32 or larger) is not lossless.

Change-Id: I69cd84d4f3fd06d641048d6096da1bfde18ad24e
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index a201e35dc..9825416d3 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -793,7 +793,7 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
 
 #if CONFIG_TX_SKIP
   if (xd->lossless && tx_size != TX_4X4 &&
-      !xd->mi[0].src_mi->mbmi.tx_skip[plane != 0]) {
+      (!xd->mi[0].src_mi->mbmi.tx_skip[plane != 0] || tx_size >= TX_32X32)) {
     *rate       = INT_MAX;
     *distortion = INT64_MAX;
     *sse        = INT64_MAX;