Showing the changes to test/processing/ProcessUT_DownSample.cpp (1 of 7 files). Show all
Unified · Split
| @@ -9,8 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | using namespace WelsVP; |
| 10 | 10 | |
| 11 | 11 | void DyadicBilinearDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride, |
| 12 | − uint8_t* pSrc, const int32_t kiSrcStride, | |
| 13 | − const int32_t kiSrcWidth, const int32_t kiSrcHeight) { | |
| 12 | + uint8_t* pSrc, const int32_t kiSrcStride, | |
| 13 | + const int32_t kiSrcWidth, const int32_t kiSrcHeight) { | |
| 14 | 14 | uint8_t* pDstLine = pDst; |
| 15 | 15 | uint8_t* pSrcLine = pSrc; |
| 16 | 16 | const int32_t kiSrcStridex2 = kiSrcStride << 1; |
| @@ -30,8 +30,9 @@ void DyadicBilinearDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride, · 13 unmodified lines | ||
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | −void GeneralBilinearFastDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth, const int32_t kiDstHeight, | |
| 34 | − uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) { | |
| 33 | +void GeneralBilinearFastDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth, | |
| 34 | + const int32_t kiDstHeight, | |
| 35 | + uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) { | |
| 35 | 36 | const uint32_t kuiScaleBitWidth = 16, kuiScaleBitHeight = 15; |
| 36 | 37 | const uint32_t kuiScaleWidth = (1 << kuiScaleBitWidth), kuiScaleHeight = (1 << kuiScaleBitHeight); |
| 37 | 38 | int32_t fScalex = WELS_ROUND ((float)kiSrcWidth / (float)kiDstWidth * kuiScaleWidth); |
| @@ -98,7 +99,8 @@ void GeneralBilinearFastDownsampler_ref (uint8_t* pDst, const int32_t kiDstStrid · 60 unmodified lines | ||
| 98 | 99 | } |
| 99 | 100 | } |
| 100 | 101 | |
| 101 | −void GeneralBilinearAccurateDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth, const int32_t kiDstHeight, | |
| 102 | +void GeneralBilinearAccurateDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth, | |
| 103 | + const int32_t kiDstHeight, | |
| 102 | 104 | uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) { |
| 103 | 105 | const int32_t kiScaleBit = 15; |
| 104 | 106 | const int32_t kiScale = (1 << kiScaleBit); |
| @@ -243,7 +245,8 @@ TEST (DownSampleTest, func) { \ · 138 unmodified lines | ||
| 243 | 245 | |
| 244 | 246 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsampler_c, 0, 0) |
| 245 | 247 | GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearFastDownsampler_c, GeneralBilinearFastDownsampler_ref, 0, 0) |
| 246 | −GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsampler_c, GeneralBilinearAccurateDownsampler_ref, 0, 0) | |
| 248 | +GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsampler_c, GeneralBilinearAccurateDownsampler_ref, 0, | |
| 249 | + 0) | |
| 247 | 250 | |
| 248 | 251 | #if defined(X86_ASM) |
| 249 | 252 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx32_sse, 1, WELS_CPU_SSE) |
| @@ -256,20 +259,24 @@ GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx16_ssse3, · 6 unmodified lines | ||
| 256 | 259 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx32_sse4, 1, WELS_CPU_SSE41) |
| 257 | 260 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx16_sse4, 1, WELS_CPU_SSE41) |
| 258 | 261 | |
| 259 | −GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearFastDownsamplerWrap_sse2, GeneralBilinearFastDownsampler_ref, 1, WELS_CPU_SSE2) | |
| 260 | −GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_sse2, GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_SSE2) | |
| 262 | +GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearFastDownsamplerWrap_sse2, GeneralBilinearFastDownsampler_ref, 1, | |
| 263 | + WELS_CPU_SSE2) | |
| 264 | +GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_sse2, | |
| 265 | + GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_SSE2) | |
| 261 | 266 | #endif |
| 262 | 267 | |
| 263 | 268 | #if defined(HAVE_NEON) |
| 264 | 269 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx32_neon, 1, WELS_CPU_NEON) |
| 265 | 270 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsampler_neon, 1, WELS_CPU_NEON) |
| 266 | 271 | |
| 267 | −GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_neon, GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_NEON) | |
| 272 | +GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_neon, | |
| 273 | + GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_NEON) | |
| 268 | 274 | #endif |
| 269 | 275 | |
| 270 | 276 | #if defined(HAVE_NEON_AARCH64) |
| 271 | 277 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx32_AArch64_neon, 1, WELS_CPU_NEON) |
| 272 | 278 | GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsampler_AArch64_neon, 1, WELS_CPU_NEON) |
| 273 | 279 | |
| 274 | −GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_AArch64_neon, GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_NEON) | |
| 280 | +GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_AArch64_neon, | |
| 281 | + GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_NEON) | |
| 275 | 282 | #endif |