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

Fix compilation errors

Browse source
This commit is contained in:
Laurent Fasnacht 2014-08-11 09:53:06 +02:00
parent 47e3bcfb50
commit f1b303a2d2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/strategies/avx2/dct-avx2.c
View file

@ -411,9 +411,9 @@ static void partial_butterfly_inverse_32_avx2(int16_t *src, int16_t *dst,
#define DCT_NXN_AVX2(n) \ #define DCT_NXN_AVX2(n) \
static void dct_ ## n ## x ## n ## _avx2(int8_t bitdepth, int16_t *block, int16_t *coeff) { \ static void dct_ ## n ## x ## n ## _avx2(int8_t bitdepth, int16_t *block, int16_t *coeff) { \
\ \
int16_t tmp[ ## n ## * ## n ##]; \ int16_t tmp[ n * n ]; \
int32_t shift_1st = g_convert_to_bit[ ## n ## ] + 1 + (bitdepth - 8); \ int32_t shift_1st = g_convert_to_bit[ n ] + 1 + (bitdepth - 8); \
int32_t shift_2nd = g_convert_to_bit[ ## n ## ] + 8; \ int32_t shift_2nd = g_convert_to_bit[ n ] + 8; \
\ \
partial_butterfly_ ## n ## _avx2(block, tmp, shift_1st); \ partial_butterfly_ ## n ## _avx2(block, tmp, shift_1st); \
partial_butterfly_ ## n ## _avx2(tmp, coeff, shift_2nd); \ partial_butterfly_ ## n ## _avx2(tmp, coeff, shift_2nd); \
@ -422,7 +422,7 @@ static void dct_ ## n ## x ## n ## _avx2(int8_t bitdepth, int16_t *block, int16_
#define IDCT_NXN_AVX2(n) \ #define IDCT_NXN_AVX2(n) \
static void idct_ ## n ## x ## n ## _avx2(int8_t bitdepth, int16_t *block, int16_t *coeff) { \ static void idct_ ## n ## x ## n ## _avx2(int8_t bitdepth, int16_t *block, int16_t *coeff) { \
\ \
int16_t tmp[ ## n ## * ## n ##]; \ int16_t tmp[ n * n ]; \
int32_t shift_1st = 7; \ int32_t shift_1st = 7; \
int32_t shift_2nd = 12 - (bitdepth - 8); \ int32_t shift_2nd = 12 - (bitdepth - 8); \
\ \

8
src/strategies/generic/dct-generic.c
View file

@ -407,9 +407,9 @@ static void partial_butterfly_inverse_32_generic(int16_t *src, int16_t *dst,
#define DCT_NXN_GENERIC(n) \ #define DCT_NXN_GENERIC(n) \
static void dct_ ## n ## x ## n ## _generic(int8_t bitdepth, int16_t *block, int16_t *coeff) { \ static void dct_ ## n ## x ## n ## _generic(int8_t bitdepth, int16_t *block, int16_t *coeff) { \
\ \
int16_t tmp[ ## n ## * ## n ##]; \ int16_t tmp[ n * n ]; \
int32_t shift_1st = g_convert_to_bit[ ## n ## ] + 1 + (bitdepth - 8); \ int32_t shift_1st = g_convert_to_bit[ n ] + 1 + (bitdepth - 8); \
int32_t shift_2nd = g_convert_to_bit[ ## n ## ] + 8; \ int32_t shift_2nd = g_convert_to_bit[ n ] + 8; \
\ \
partial_butterfly_ ## n ## _generic(block, tmp, shift_1st); \ partial_butterfly_ ## n ## _generic(block, tmp, shift_1st); \
partial_butterfly_ ## n ## _generic(tmp, coeff, shift_2nd); \ partial_butterfly_ ## n ## _generic(tmp, coeff, shift_2nd); \
@ -418,7 +418,7 @@ static void dct_ ## n ## x ## n ## _generic(int8_t bitdepth, int16_t *block, int
#define IDCT_NXN_GENERIC(n) \ #define IDCT_NXN_GENERIC(n) \
static void idct_ ## n ## x ## n ## _generic(int8_t bitdepth, int16_t *block, int16_t *coeff) { \ static void idct_ ## n ## x ## n ## _generic(int8_t bitdepth, int16_t *block, int16_t *coeff) { \
\ \
int16_t tmp[ ## n ## * ## n ##]; \ int16_t tmp[ n * n ]; \
int32_t shift_1st = 7; \ int32_t shift_1st = 7; \
int32_t shift_2nd = 12 - (bitdepth - 8); \ int32_t shift_2nd = 12 - (bitdepth - 8); \
\ \