--- reduced.h	2002/12/08 06:43:34	1.1.2.2
+++ reduced.h	2008/11/26 01:04:34	1.4
@@ -1,48 +1,87 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Reduced VOP header  -
+ *
+ *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
+ *
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * $Id: reduced.h,v 1.4 2008/11/26 01:04:34 Isibaar Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _REDUCED_H_
 #define _REDUCED_H_
 
 #include "../portab.h"
 
-/* decoding prototypes */
-
+/* decoding */
 typedef void (COPY_UPSAMPLED_8X8_16TO8) (uint8_t *Dst, const int16_t *Src, const int BpS);
 typedef void (ADD_UPSAMPLED_8X8_16TO8) (uint8_t *Dst, const int16_t *Src, const int BpS);
 
-/* Note: "Nb"_Blks is the number of 8-pixels blocks to process */
+/* deblocking: Note: "Nb"_Blks is the number of 8-pixels blocks to process */
 typedef void HFILTER_31(uint8_t *Src1, uint8_t *Src2, int Nb_Blks);
 typedef void VFILTER_31(uint8_t *Src1, uint8_t *Src2, const int BpS, int Nb_Blks);
 
+/* encoding: WARNING! These read 1 pixel outside of the input 16x16 block! */
+typedef void FILTER_18X18_TO_8X8(int16_t *Dst, const uint8_t *Src, const int BpS);
+typedef void FILTER_DIFF_18X18_TO_8X8(int16_t *Dst, const uint8_t *Src, const int BpS);
+
 
 extern COPY_UPSAMPLED_8X8_16TO8 * copy_upsampled_8x8_16to8;
 extern COPY_UPSAMPLED_8X8_16TO8 xvid_Copy_Upsampled_8x8_16To8_C;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern COPY_UPSAMPLED_8X8_16TO8 xvid_Copy_Upsampled_8x8_16To8_mmx;
 extern COPY_UPSAMPLED_8X8_16TO8 xvid_Copy_Upsampled_8x8_16To8_xmm;
+#endif
 
 extern ADD_UPSAMPLED_8X8_16TO8 * add_upsampled_8x8_16to8;
 extern ADD_UPSAMPLED_8X8_16TO8 xvid_Add_Upsampled_8x8_16To8_C;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern ADD_UPSAMPLED_8X8_16TO8 xvid_Add_Upsampled_8x8_16To8_mmx;
 extern ADD_UPSAMPLED_8X8_16TO8 xvid_Add_Upsampled_8x8_16To8_xmm;
+#endif
 
 extern VFILTER_31 * vfilter_31;
 extern VFILTER_31 xvid_VFilter_31_C;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern VFILTER_31 xvid_VFilter_31_x86;
+#endif
 
 extern HFILTER_31 * hfilter_31;
 extern HFILTER_31 xvid_HFilter_31_C;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern HFILTER_31 xvid_HFilter_31_x86;
 extern HFILTER_31 xvid_HFilter_31_mmx;
+#endif
 
+extern FILTER_18X18_TO_8X8 * filter_18x18_to_8x8;
+extern FILTER_18X18_TO_8X8 xvid_Filter_18x18_To_8x8_C;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+extern FILTER_18X18_TO_8X8 xvid_Filter_18x18_To_8x8_mmx;
+#endif
+
+extern FILTER_DIFF_18X18_TO_8X8 * filter_diff_18x18_to_8x8;
+extern FILTER_DIFF_18X18_TO_8X8 xvid_Filter_Diff_18x18_To_8x8_C;
+#if defined(ARCH_IS_IA32) || defined(XVID_IS_X86_64)
+extern FILTER_DIFF_18X18_TO_8X8 xvid_Filter_Diff_18x18_To_8x8_mmx;
+#endif
 
 
-
-  /* encoding prototypes */
-  /* WARNING! These read 1 pixel outside of the input 16x16 block! */
-extern void xvid_Filter_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS);
-extern void xvid_Filter_Diff_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS);
-
-  /* MMX version */
-extern void xvid_Filter_18x18_To_8x8_mmx(int16_t *Dst, const uint8_t *Src, const int BpS);
-extern void xvid_Filter_Diff_18x18_To_8x8_mmx(int16_t *Dst, const uint8_t *Src, const int BpS);
-
+/* rrv motion vector scale-up */
+#define RRV_MV_SCALEUP(a)	( (a)>0 ? 2*(a)-1 : (a)<0 ? 2*(a)+1 : (a) )
 
 #endif /* _REDUCED_H_ */