Skip to content

F
ffmpeg.wasm-core
Commit 5dd97d58 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'db3f61a0' 

* commit 'db3f61a0':
  x86: dsputil_init: Drop some unnecessary parentheses
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 27cab16c db3f61a0
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
libavcodec/x86/dsputil_init.c
View file @ 5dd97d58
...@@ -182,8 +182,8 @@ static void OPNAME ## qpel8_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -182,8 +182,8 @@ static void OPNAME ## qpel8_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half) + 64; \ uint8_t *const halfH = (uint8_t *) half + 64; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, \
...@@ -197,8 +197,8 @@ static void OPNAME ## qpel8_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -197,8 +197,8 @@ static void OPNAME ## qpel8_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half) + 64; \ uint8_t *const halfH = (uint8_t *) half + 64; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \
...@@ -212,8 +212,8 @@ static void OPNAME ## qpel8_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -212,8 +212,8 @@ static void OPNAME ## qpel8_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half) + 64; \ uint8_t *const halfH = (uint8_t *) half + 64; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, \
...@@ -227,8 +227,8 @@ static void OPNAME ## qpel8_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -227,8 +227,8 @@ static void OPNAME ## qpel8_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half) + 64; \ uint8_t *const halfH = (uint8_t *) half + 64; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \
...@@ -242,8 +242,8 @@ static void OPNAME ## qpel8_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -242,8 +242,8 @@ static void OPNAME ## qpel8_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half) + 64; \ uint8_t *const halfH = (uint8_t *) half + 64; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\ ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
...@@ -255,8 +255,8 @@ static void OPNAME ## qpel8_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -255,8 +255,8 @@ static void OPNAME ## qpel8_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half) + 64; \ uint8_t *const halfH = (uint8_t *) half + 64; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\ ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
...@@ -268,7 +268,7 @@ static void OPNAME ## qpel8_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -268,7 +268,7 @@ static void OPNAME ## qpel8_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half); \ uint8_t *const halfH = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, \
...@@ -281,7 +281,7 @@ static void OPNAME ## qpel8_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -281,7 +281,7 @@ static void OPNAME ## qpel8_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[8 + 9]; \ uint64_t half[8 + 9]; \
uint8_t *const halfH = ((uint8_t *) half); \ uint8_t *const halfH = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \ ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \
...@@ -294,7 +294,7 @@ static void OPNAME ## qpel8_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -294,7 +294,7 @@ static void OPNAME ## qpel8_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[9]; \ uint64_t half[9]; \
uint8_t *const halfH = ((uint8_t *) half); \ uint8_t *const halfH = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \ ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
stride, 9); \ stride, 9); \
ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH, \ ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH, \
...@@ -369,8 +369,8 @@ static void OPNAME ## qpel16_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -369,8 +369,8 @@ static void OPNAME ## qpel16_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[16 * 2 + 17 * 2]; \ uint64_t half[16 * 2 + 17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half) + 256; \ uint8_t *const halfH = (uint8_t *) half + 256; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \
...@@ -385,8 +385,8 @@ static void OPNAME ## qpel16_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -385,8 +385,8 @@ static void OPNAME ## qpel16_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[16 * 2 + 17 * 2]; \ uint64_t half[16 * 2 + 17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half) + 256; \ uint8_t *const halfH = (uint8_t *) half + 256; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \
...@@ -401,8 +401,8 @@ static void OPNAME ## qpel16_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -401,8 +401,8 @@ static void OPNAME ## qpel16_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[16 * 2 + 17 * 2]; \ uint64_t half[16 * 2 + 17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half) + 256; \ uint8_t *const halfH = (uint8_t *) half + 256; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \
...@@ -417,8 +417,8 @@ static void OPNAME ## qpel16_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -417,8 +417,8 @@ static void OPNAME ## qpel16_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[16 * 2 + 17 * 2]; \ uint64_t half[16 * 2 + 17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half) + 256; \ uint8_t *const halfH = (uint8_t *) half + 256; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \
...@@ -433,8 +433,8 @@ static void OPNAME ## qpel16_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -433,8 +433,8 @@ static void OPNAME ## qpel16_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[16 * 2 + 17 * 2]; \ uint64_t half[16 * 2 + 17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half) + 256; \ uint8_t *const halfH = (uint8_t *) half + 256; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \ ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
...@@ -447,8 +447,8 @@ static void OPNAME ## qpel16_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -447,8 +447,8 @@ static void OPNAME ## qpel16_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[16 * 2 + 17 * 2]; \ uint64_t half[16 * 2 + 17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half) + 256; \ uint8_t *const halfH = (uint8_t *) half + 256; \
uint8_t *const halfHV = ((uint8_t *) half); \ uint8_t *const halfHV = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \ ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
...@@ -461,7 +461,7 @@ static void OPNAME ## qpel16_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -461,7 +461,7 @@ static void OPNAME ## qpel16_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[17 * 2]; \ uint64_t half[17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half); \ uint8_t *const halfH = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \
...@@ -474,7 +474,7 @@ static void OPNAME ## qpel16_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -474,7 +474,7 @@ static void OPNAME ## qpel16_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[17 * 2]; \ uint64_t half[17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half); \ uint8_t *const halfH = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \ ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \
...@@ -487,7 +487,7 @@ static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \ ...@@ -487,7 +487,7 @@ static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \
ptrdiff_t stride) \ ptrdiff_t stride) \
{ \ { \
uint64_t half[17 * 2]; \ uint64_t half[17 * 2]; \
uint8_t *const halfH = ((uint8_t *) half); \ uint8_t *const halfH = (uint8_t *) half; \
ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \ ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
stride, 17); \ stride, 17); \
ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH, \ ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment