hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 10:34:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Removed old unused macro

Browse source
This commit is contained in:
Ari Lemmetti 2014-07-22 11:11:20 +03:00
parent cf0797cafd
commit c81639dd09
1 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/strategies/x86_asm/picture-x86-asm.c
View file

@ -105,32 +105,7 @@ const int width, const int height, const unsigned stride1, const unsigned stride
} }
} }
// Function macro for defining hadamard calculating functions #endif //!defined(KVAZAAR_DISABLE_YASM)
// for fixed size blocks. They calculate hadamard for integer
// multiples of 8x8 with the 8x8 hadamard function.
#define KVZ_SATD_NXN(n, pixel_type, suffix) \
static unsigned kvz_satd_ ## suffix ## _ ## n ## x ## n ## _stride( \
const pixel_type * const block1, const pixel_type * const block2) \
{ \
unsigned x, y; \
unsigned sum = 0; \
for (y = 0; y < (n); y += 8) { \
unsigned row = y * (n); \
for (x = 0; x < (n); x += 8) { \
sum += kvz_satd_8x8_stride_avx(&block1[row + x], (n), &block2[row + x], (n)); \
} \
} \
return sum; \
}
// Declare these functions to make sure the signature of the macro matches.
cost_pixel_nxn_func kvz_satd_8bit_4x4_avx;
cost_pixel_nxn_func kvz_satd_8bit_8x8_avx;
cost_pixel_nxn_func kvz_satd_8bit_16x16_avx;
cost_pixel_nxn_func kvz_satd_8bit_32x32_avx;
cost_pixel_nxn_func kvz_satd_8bit_64x64_avx;
#endif //COMPILE_INTEL_AVX && !defined(KVAZAAR_DISABLE_YASM)
int strategy_register_picture_x86_asm_avx(void* opaque) { int strategy_register_picture_x86_asm_avx(void* opaque) {
bool success = true; bool success = true;
@ -148,6 +123,6 @@ int strategy_register_picture_x86_asm_avx(void* opaque) {
success &= strategyselector_register(opaque, "satd_8bit_16x16", "x86_asm_avx", 30, &kvz_satd_16x16_avx); success &= strategyselector_register(opaque, "satd_8bit_16x16", "x86_asm_avx", 30, &kvz_satd_16x16_avx);
success &= strategyselector_register(opaque, "satd_8bit_32x32", "x86_asm_avx", 30, &kvz_satd_32x32_avx); success &= strategyselector_register(opaque, "satd_8bit_32x32", "x86_asm_avx", 30, &kvz_satd_32x32_avx);
success &= strategyselector_register(opaque, "satd_8bit_64x64", "x86_asm_avx", 30, &kvz_satd_64x64_avx); success &= strategyselector_register(opaque, "satd_8bit_64x64", "x86_asm_avx", 30, &kvz_satd_64x64_avx);
#endif //COMPILE_INTEL_AVX && !defined(KVAZAAR_DISABLE_YASM) #endif //!defined(KVAZAAR_DISABLE_YASM)
return success; return success;
} }