[x264-devel] Fix "--asm avx"

[Loren Merritt]

x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Wed Aug  3 14:40:01 2011 +0000| [fafa6a2fca75967ff90f98a8acc59d3ffdd8bb7f] | committer: Jason Garrett-Glaser

Fix "--asm avx"
Previously required "--asm sse2fast,fastshuffle,sse4.2,avx".

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=fafa6a2fca75967ff90f98a8acc59d3ffdd8bb7f
---

 common/common.c |    4 ++++
 common/cpu.c    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/common/common.c b/common/common.c
index 6705d8e..4aff737 100644
--- a/common/common.c
+++ b/common/common.c
@@ -596,6 +596,10 @@ int x264_param_parse( x264_param_t *p, const char *name, const char *value )
                     b_error = 1;
             }
             free( buf );
+            if( p->cpu & X264_CPU_SSSE3 )
+                p->cpu |= X264_CPU_SSE2_IS_FAST;
+            if( p->cpu & X264_CPU_SSE4 )
+                p->cpu |= X264_CPU_SHUFFLE_IS_FAST;
         }
     }
     OPT("threads")
diff --git a/common/cpu.c b/common/cpu.c
index 02f4c34..a28502b 100644
--- a/common/cpu.c
+++ b/common/cpu.c
@@ -59,8 +59,9 @@ const x264_cpu_name_t x264_cpu_names[] =
     {"SSSE3",   X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3},
     {"FastShuffle",   X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SHUFFLE_IS_FAST},
     {"SSE4.1",  X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4},
+    {"SSE4",    X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4},
     {"SSE4.2",  X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4|X264_CPU_SSE42},
-    {"AVX", X264_CPU_AVX},
+    {"AVX",     X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4|X264_CPU_SSE42|X264_CPU_AVX},
     {"Cache32", X264_CPU_CACHELINE_32},
     {"Cache64", X264_CPU_CACHELINE_64},
     {"SSEMisalign", X264_CPU_SSE_MISALIGN},