--- qpel.c 2004/10/17 10:20:15 1.4 +++ qpel.c 2005/11/22 10:23:01 1.8 @@ -19,12 +19,14 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: qpel.c,v 1.4 2004/10/17 10:20:15 edgomez Exp $ + * $Id: qpel.c,v 1.8 2005/11/22 10:23:01 suxen_drol Exp $ * ****************************************************************************/ #ifndef XVID_AUTO_INCLUDE +#include + #include "../portab.h" #include "qpel.h" @@ -197,8 +199,8 @@ /* Global scope hooks ****************************************************************************/ -XVID_QP_FUNCS *xvid_QP_Funcs = 0; -XVID_QP_FUNCS *xvid_QP_Add_Funcs = 0; +XVID_QP_FUNCS *xvid_QP_Funcs = NULL; +XVID_QP_FUNCS *xvid_QP_Add_Funcs = NULL; /* Reference plain C impl. declaration ****************************************************************************/ @@ -340,38 +342,115 @@ #endif /* ARCH_IS_PPC */ +/* mmx impl. (for 64bit bus) declaration (see. qpel_mmx.asm + ****************************************************************************/ + +#ifdef ARCH_IS_X86_64 +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_Up_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_Up_16_x86_64); + +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_8_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_8_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_Up_8_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_8_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_8_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_Up_8_x86_64); + +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Add_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_Add_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_Up_Add_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Add_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_Add_16_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_Up_Add_16_x86_64); + +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_8_Add_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_8_Add_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_Up_8_Add_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_8_Add_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_8_Add_x86_64); +extern XVID_QP_PASS_SIGNATURE(xvid_V_Pass_Avrg_Up_8_Add_x86_64); + +XVID_QP_FUNCS xvid_QP_Funcs_x86_64 = { + xvid_H_Pass_16_x86_64, xvid_H_Pass_Avrg_16_x86_64, xvid_H_Pass_Avrg_Up_16_x86_64, + xvid_V_Pass_16_x86_64, xvid_V_Pass_Avrg_16_x86_64, xvid_V_Pass_Avrg_Up_16_x86_64, + + xvid_H_Pass_8_x86_64, xvid_H_Pass_Avrg_8_x86_64, xvid_H_Pass_Avrg_Up_8_x86_64, + xvid_V_Pass_8_x86_64, xvid_V_Pass_Avrg_8_x86_64, xvid_V_Pass_Avrg_Up_8_x86_64 +}; + +XVID_QP_FUNCS xvid_QP_Add_Funcs_x86_64 = { + xvid_H_Pass_Add_16_x86_64, xvid_H_Pass_Avrg_Add_16_x86_64, xvid_H_Pass_Avrg_Up_Add_16_x86_64, + xvid_V_Pass_Add_16_x86_64, xvid_V_Pass_Avrg_Add_16_x86_64, xvid_V_Pass_Avrg_Up_Add_16_x86_64, + + xvid_H_Pass_8_Add_x86_64, xvid_H_Pass_Avrg_8_Add_x86_64, xvid_H_Pass_Avrg_Up_8_Add_x86_64, + xvid_V_Pass_8_Add_x86_64, xvid_V_Pass_Avrg_8_Add_x86_64, xvid_V_Pass_Avrg_Up_8_Add_x86_64, +}; +#endif /* ARCH_IS_X86_64 */ + /* tables for ASM ****************************************************************************/ + +#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) +/* These symbols will be used outsie this file, so tell the compiler + * they're global. Only ia32 will define them in this file, x86_64 + * will do in the assembly files */ +extern uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */ + +extern int16_t xvid_FIR_1_0_0_0[256][4]; +extern int16_t xvid_FIR_3_1_0_0[256][4]; +extern int16_t xvid_FIR_6_3_1_0[256][4]; +extern int16_t xvid_FIR_14_3_2_1[256][4]; +extern int16_t xvid_FIR_20_6_3_1[256][4]; +extern int16_t xvid_FIR_20_20_6_3[256][4]; +extern int16_t xvid_FIR_23_19_6_3[256][4]; +extern int16_t xvid_FIR_7_20_20_6[256][4]; +extern int16_t xvid_FIR_6_20_20_6[256][4]; +extern int16_t xvid_FIR_6_20_20_7[256][4]; +extern int16_t xvid_FIR_3_6_20_20[256][4]; +extern int16_t xvid_FIR_3_6_19_23[256][4]; +extern int16_t xvid_FIR_1_3_6_20[256][4]; +extern int16_t xvid_FIR_1_2_3_14[256][4]; +extern int16_t xvid_FIR_0_1_3_6[256][4]; +extern int16_t xvid_FIR_0_0_1_3[256][4]; +extern int16_t xvid_FIR_0_0_0_1[256][4]; +#endif + +/* Arrays definitions, according to the target platform */ #ifdef ARCH_IS_IA32 uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */ #endif -/* Alternate way of filtering (cf. USE_TABLES flag in qpel_mmx.asm) - * - * 17 tables, 2K each => 34K - * Mirroring can be acheived composing 11 basic tables - * (for instance: (23,19,-6,3)=(20,20,-6,3)+(3,-1,0,0) - * Using Symmetries (and bswap) could reduce further - * the memory to 7 tables (->14K). */ - -int16_t xvid_FIR_1_0_0_0[256][4]; -int16_t xvid_FIR_3_1_0_0[256][4]; -int16_t xvid_FIR_6_3_1_0[256][4]; -int16_t xvid_FIR_14_3_2_1[256][4]; -int16_t xvid_FIR_20_6_3_1[256][4]; -int16_t xvid_FIR_20_20_6_3[256][4]; -int16_t xvid_FIR_23_19_6_3[256][4]; -int16_t xvid_FIR_7_20_20_6[256][4]; -int16_t xvid_FIR_6_20_20_6[256][4]; -int16_t xvid_FIR_6_20_20_7[256][4]; -int16_t xvid_FIR_3_6_20_20[256][4]; -int16_t xvid_FIR_3_6_19_23[256][4]; -int16_t xvid_FIR_1_3_6_20[256][4]; -int16_t xvid_FIR_1_2_3_14[256][4]; -int16_t xvid_FIR_0_1_3_6[256][4]; -int16_t xvid_FIR_0_0_1_3[256][4]; -int16_t xvid_FIR_0_0_0_1[256][4]; +#if !defined(ARCH_IS_X86_64) +/* Only ia32 will use these tables outside this file so mark them +* static for all other archs */ +#if defined(ARCH_IS_IA32) +#define __SCOPE +#else +#define __SCOPE static +#endif +__SCOPE int16_t xvid_FIR_1_0_0_0[256][4]; +__SCOPE int16_t xvid_FIR_3_1_0_0[256][4]; +__SCOPE int16_t xvid_FIR_6_3_1_0[256][4]; +__SCOPE int16_t xvid_FIR_14_3_2_1[256][4]; +__SCOPE int16_t xvid_FIR_20_6_3_1[256][4]; +__SCOPE int16_t xvid_FIR_20_20_6_3[256][4]; +__SCOPE int16_t xvid_FIR_23_19_6_3[256][4]; +__SCOPE int16_t xvid_FIR_7_20_20_6[256][4]; +__SCOPE int16_t xvid_FIR_6_20_20_6[256][4]; +__SCOPE int16_t xvid_FIR_6_20_20_7[256][4]; +__SCOPE int16_t xvid_FIR_3_6_20_20[256][4]; +__SCOPE int16_t xvid_FIR_3_6_19_23[256][4]; +__SCOPE int16_t xvid_FIR_1_3_6_20[256][4]; +__SCOPE int16_t xvid_FIR_1_2_3_14[256][4]; +__SCOPE int16_t xvid_FIR_0_1_3_6[256][4]; +__SCOPE int16_t xvid_FIR_0_0_1_3[256][4]; +__SCOPE int16_t xvid_FIR_0_0_0_1[256][4]; +#endif static void Init_FIR_Table(int16_t Tab[][4], int A, int B, int C, int D) @@ -386,7 +465,7 @@ } -void xvid_Init_QP() +void xvid_Init_QP(void) { #ifdef ARCH_IS_IA32 int i;