diff options
Diffstat (limited to 'k9decmpeg')
| -rwxr-xr-x | k9decmpeg/mmx.h | 2 | ||||
| -rwxr-xr-x | k9decmpeg/motion_comp_mmx.cpp | 14 | ||||
| -rwxr-xr-x | k9decmpeg/motion_comp_vis.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/k9decmpeg/mmx.h b/k9decmpeg/mmx.h index bbbca78..a410caa 100755 --- a/k9decmpeg/mmx.h +++ b/k9decmpeg/mmx.h @@ -218,7 +218,7 @@ typedef union { : "m" (mem)) -#define tqmaskmovq(regs,tqmaskreg) mmx_r2ri (tqmaskmovq, regs, tqmaskreg) +#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) #define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) diff --git a/k9decmpeg/motion_comp_mmx.cpp b/k9decmpeg/motion_comp_mmx.cpp index f3c30ef..e6c8f78 100755 --- a/k9decmpeg/motion_comp_mmx.cpp +++ b/k9decmpeg/motion_comp_mmx.cpp @@ -636,7 +636,7 @@ static inline void MC_avg2_16 (int height, uint8_t * dest, const uint8_t * ref, } while (--height); } -static mmx_t tqmask_one = {0x0101010101010101LL}; +static mmx_t mask_one = {0x0101010101010101LL}; static inline void MC_put4_8 (int height, uint8_t * dest, const uint8_t * ref, const int stride, const int cpu) @@ -664,7 +664,7 @@ static inline void MC_put4_8 (int height, uint8_t * dest, const uint8_t * ref, pand_r2r (mm5, mm7); pavg_r2r (mm2, mm0); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); psubusb_r2r (mm7, mm0); @@ -695,7 +695,7 @@ static inline void MC_put4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_r2m (mm0, *dest); @@ -714,7 +714,7 @@ static inline void MC_put4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); ref += stride; @@ -741,7 +741,7 @@ static inline void MC_avg4_8 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*dest, mm1); @@ -770,7 +770,7 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*dest, mm1); @@ -791,7 +791,7 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*(dest+8), mm1); diff --git a/k9decmpeg/motion_comp_vis.cpp b/k9decmpeg/motion_comp_vis.cpp index 49e1b69..eb01501 100755 --- a/k9decmpeg/motion_comp_vis.cpp +++ b/k9decmpeg/motion_comp_vis.cpp @@ -37,7 +37,7 @@ * (x+y+1)>>1 == (x|y)-((x^y)>>1) * * This allows us to average 8 bytes at a time in a 64-bit FPU reg. - * We avoid overflows by tqmasking before we do the shift, and we + * We avoid overflows by masking before we do the shift, and we * implement the shift by multiplying by 1/2 using mul8x16. So in * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating tqmask * of '0xfe' is in f4, a repeating tqmask of '0x7f' is in f6, and |