ref: a570bbd418f7bffdf291a1752a198a4b84e717cb
parent: b9a038a5edb157ac74da79d9469a5fb23c3457e2
author: Johann <johannkoenig@google.com>
date: Tue Jul 27 08:10:48 EDT 2010
x86/sse2: disable asm quantizer follow up to Change I0e51492d: neon: disable asm quantizer Now x86 doesn't segfault with --disable-runtime-cpu-detect and -p=2 Change-Id: I8ca127bb299198efebbcbd5a661e81788361933f
--- a/vp8/encoder/x86/csystemdependent.c
+++ b/vp8/encoder/x86/csystemdependent.c
@@ -180,7 +180,10 @@
{// Willamette instruction set available:
vp8_mbuverror = vp8_mbuverror_xmm;
- vp8_fast_quantize_b = vp8_fast_quantize_b_sse;
+ /* The sse quantizer has not been updated to match the new exact
+ * quantizer introduced in commit e04e2935
+ */
+ vp8_fast_quantize_b = vp8_fast_quantize_b_c;
#if 0 //new fdct
vp8_short_fdct4x4 = vp8_short_fdct4x4_mmx;
vp8_short_fdct8x4 = vp8_short_fdct8x4_mmx;
@@ -224,7 +227,10 @@
{// MMX instruction set available:
vp8_mbuverror = vp8_mbuverror_mmx;
- vp8_fast_quantize_b = vp8_fast_quantize_b_mmx;
+ /* The mmx quantizer has not been updated to match the new exact
+ * quantizer introduced in commit e04e2935
+ */
+ vp8_fast_quantize_b = vp8_fast_quantize_b_c;
#if 0 // new fdct
vp8_short_fdct4x4 = vp8_short_fdct4x4_mmx;
vp8_short_fdct8x4 = vp8_short_fdct8x4_mmx;
--- a/vp8/encoder/x86/quantize_x86.h
+++ b/vp8/encoder/x86/quantize_x86.h
@@ -27,8 +27,11 @@
#if !CONFIG_RUNTIME_CPU_DETECT
-#undef vp8_quantize_quantb
-#define vp8_quantize_quantb vp8_regular_quantize_b_sse2
+/* The sse2 quantizer has not been updated to match the new exact
+ * quantizer introduced in commit e04e2935
+ *#undef vp8_quantize_quantb
+ *#define vp8_quantize_quantb vp8_regular_quantize_b_sse2
+ */
#endif