commit 9a34bf3c2235f1859f3efc777fcafc026e2a9710
author Yunqing Wang <yunqingwang@google.com> Thu Nov 15 17:05:01 2018 -0800
committer Yunqing Wang <yunqingwang@google.com> Fri Nov 16 17:38:46 2018 +0000
tree 78bb8f85a09587bc995dda453e85b01a2c70145c
parent ec359c76450f660740738d6a0786c772ef3da1d3

Fix a rare encode/decode mismatch

In issue 2240, an encode/decode mismatch was reported while using
aq-mode=1, deltaq-mode=1 or 2, and speed=6. The investigation found
that the above encoding setting revealed a rare bug in ssse3 and avx
optimizations of aom_quantize_b_32x32 function. This patch disabled
the using of those versions. Later, the optimizations need to be
fixed.

BUG=aomedia:2240

Change-Id: I69815dcefc45a7c5838cdcb93815a87ed8e2ce29

av1/encoder/av1_quantize.c

diff --git a/av1/encoder/av1_quantize.c b/av1/encoder/av1_quantize.c
index 21ab4db..a7baaf8 100644
--- a/av1/encoder/av1_quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -289,10 +289,13 @@
                        sc->iscan);
         break;
       case 1:
-        aom_quantize_b_32x32(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_QTX,
-                             p->quant_QTX, p->quant_shift_QTX, qcoeff_ptr,
-                             dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan,
-                             sc->iscan);
+        // TODO(any): there is a bug in current ssse3 and avx optimizations
+        // (refer to libaom issue 2240), which needs to be fixed. Use c version
+        // for now.
+        aom_quantize_b_32x32_c(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_QTX,
+                               p->quant_QTX, p->quant_shift_QTX, qcoeff_ptr,
+                               dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan,
+                               sc->iscan);
         break;
       case 2:
         aom_quantize_b_64x64(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_QTX,