ref: 91800fbc49026c68a20f9210a9fcb81192801107
parent: 864ff21021b207153b916de6d727dcc23671796a
parent: f619c16840d5781908f9bddf1b0d237a0fbe2e27
author: zhilwang <zhilwang@cisco.com>
date: Sun Apr 19 14:42:29 EDT 2015
Merge pull request #1900 from mstorsjo/x86-32-asm Hook up the x86_32-only assembly as well
--- a/build/x86-common.mk
+++ b/build/x86-common.mk
@@ -17,6 +17,9 @@
endif
ifeq ($(USE_ASM),Yes)
CFLAGS += -DX86_ASM
+ifneq ($(ENABLE64BIT), Yes)
+CFLAGS += -DX86_32_ASM
+endif
ASM_ARCH = x86
endif
ASM = nasm
--- a/codec/encoder/core/src/set_mb_syn_cavlc.cpp
+++ b/codec/encoder/core/src/set_mb_syn_cavlc.cpp
@@ -274,9 +274,9 @@
void InitCoeffFunc (SWelsFuncPtrList* pFuncList, const uint32_t uiCpuFlag, int32_t iEntropyCodingModeFlag) {pFuncList->pfCavlcParamCal = CavlcParamCal_c;
-#if defined(X86_ASM)
+#if defined(X86_32_ASM)
if (uiCpuFlag & WELS_CPU_SSE2) {- // pFuncList->pfCavlcParamCal = CavlcParamCal_sse2;
+ pFuncList->pfCavlcParamCal = CavlcParamCal_sse2;
}
#endif
if (iEntropyCodingModeFlag) {