--- quant.h 2003/10/07 14:16:29 1.1.2.1 +++ quant.h 2005/01/05 23:02:15 1.4 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: quant.h,v 1.1.2.1 2003/10/07 14:16:29 edgomez Exp $ + * $Id: quant.h,v 1.4 2005/01/05 23:02:15 edgomez Exp $ * ****************************************************************************/ @@ -35,7 +35,8 @@ typedef uint32_t (quant_intraFunc) (int16_t * coeff, const int16_t * data, const uint32_t quant, - const uint32_t dcscalar); + const uint32_t dcscalar, + const uint16_t * mpeg_quant_matrices); typedef quant_intraFunc *quant_intraFuncPtr; @@ -66,6 +67,15 @@ quant_intraFunc quant_h263_intra_ia64; #endif +#ifdef ARCH_IS_PPC +quant_intraFunc quant_h263_intra_altivec_c; +#endif + +#ifdef ARCH_IS_X86_64 +quant_intraFunc quant_h263_intra_x86_64; +quant_intraFunc quant_mpeg_intra_x86_64; +#endif + /* DeQuant functions */ quant_intraFunc dequant_h263_intra_c; quant_intraFunc dequant_mpeg_intra_c; @@ -84,13 +94,23 @@ quanth263_intraFunc dequant_intra_ia64; #endif +#ifdef ARCH_IS_PPC +quant_intraFunc dequant_h263_intra_altivec_c; +#endif + +#ifdef ARCH_IS_X86_64 +quant_intraFunc dequant_h263_intra_x86_64; +quant_intraFunc dequant_mpeg_intra_x86_64; +#endif + /***************************************************************************** * Common API for Inter (de)Quant functions ****************************************************************************/ typedef uint32_t (quant_interFunc) (int16_t * coeff, const int16_t * data, - const uint32_t quant); + const uint32_t quant, + const uint16_t * mpeg_quant_matrices); typedef quant_interFunc *quant_interFuncPtr; @@ -120,6 +140,15 @@ quant_interFunc quant_h263_inter_ia64; #endif +#ifdef ARCH_IS_PPC +quant_interFunc quant_h263_inter_altivec_c; +#endif + +#ifdef ARCH_IS_X86_64 +quant_interFunc quant_h263_inter_x86_64; +quant_interFunc quant_mpeg_inter_x86_64; +#endif + quant_interFunc dequant_h263_inter_c; quant_interFunc dequant_mpeg_inter_c; @@ -137,4 +166,13 @@ quant_interFunc dequant_h263_inter_ia64; #endif +#ifdef ARCH_IS_PPC +quant_interFunc dequant_h263_inter_altivec_c; +#endif + +#ifdef ARCH_IS_X86_64 +quant_interFunc dequant_h263_inter_x86_64; +quant_interFunc dequant_mpeg_inter_x86_64; +#endif + #endif /* _QUANT_H_ */