rename namespace and funciton name to avoid conflicts with old library

ruil2 committed 12 years ago

Commit 3ff145e1 parent 25b723c8 files · +17 −17Browse files

Showing the changes to test/processing/ProcessUT_VaaCalc.cpp (1 of 8 files). Show all

Unified · Split

test/processing/ProcessUT_VaaCalc.cpp+2−2

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	#include "IWelsVP.h"	6	#include "IWelsVP.h"
7	#include "vaacalculation.h"	7	#include "vaacalculation.h"
8		8
9	using namespace nsWelsVP;	9	using namespace WelsVP;
10		10
11	void VAACalcSadSsd_ref (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,	11	void VAACalcSadSsd_ref (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
12	int32_t iPicStride,	12	int32_t iPicStride,
@@ -844,4 +844,4 @@ GENERATE_VAACalcSadBgd_UT (VAACalcSadBgd_AArch64_neon, 1, WELS_CPU_NEON) · 831 unmodified lines
844	GENERATE_VAACalcSadSsdBgd_UT (VAACalcSadSsdBgd_AArch64_neon, 1, WELS_CPU_NEON)	844	GENERATE_VAACalcSadSsdBgd_UT (VAACalcSadSsdBgd_AArch64_neon, 1, WELS_CPU_NEON)
845	GENERATE_VAACalcSadSsd_UT (VAACalcSadSsd_AArch64_neon, 1, WELS_CPU_NEON)	845	GENERATE_VAACalcSadSsd_UT (VAACalcSadSsd_AArch64_neon, 1, WELS_CPU_NEON)
846	GENERATE_VAACalcSadVar_UT (VAACalcSadVar_AArch64_neon, 1, WELS_CPU_NEON)	846	GENERATE_VAACalcSadVar_UT (VAACalcSadVar_AArch64_neon, 1, WELS_CPU_NEON)
847	#endif	847	#endif