Added libxavs2 8/10bit for ffmpeg 7.1/gcc

source/common/avs2_defs.h

@@ -256,7 +256,7 @@ enum sao_class_e {
 #define XAVS2_MIN3(a, b, c)   XAVS2_MIN((a), XAVS2_MIN((b),(c)))
 #define XAVS2_MAX3(a, b, c)   XAVS2_MAX((a), XAVS2_MAX((b),(c)))
 
-#define XAVS2_CLIP1(a)        ((a) > max_pel_value ? max_pel_value : ((a) < 0 ? 0 : (a)))
+//#define XAVS2_CLIP1(a)        ((a) > max_pel_value ? max_pel_value : ((a) < 0 ? 0 : (a)))
 #define XAVS2_CLIP3F(L, H, v) (((v) < (L)) ? (L) : (((v) > (H)) ? (H) : (v)))
 #define XAVS2_CLIP3(L, H, v)  xavs2_clip3(L, H, v)
 #define XAVS2_ABS(A)          ((A) < 0 ? (-(A)) : (A))    // abs macro, faster than procedure
@@ -281,20 +281,20 @@ static void XAVS2_SWAP_PTR(T *&x, T *&y)
  * global variables
  * ===========================================================================
  */
-static const int g_bit_depth   = BIT_DEPTH;
-static const int max_pel_value = (1 << BIT_DEPTH) - 1;
-static const int g_dc_value    = (1 << BIT_DEPTH) >> 1;
+//static const int g_bit_depth   = BIT_DEPTH;
+//static const int max_pel_value = (1 << BIT_DEPTH) - 1;
+//static const int g_dc_value    = (1 << BIT_DEPTH) >> 1;
 
 /**
  * ===========================================================================
  * inline function defines
  * ===========================================================================
  */
 
-static ALWAYS_INLINE pel_t xavs2_clip_pixel(int x)
+/*static ALWAYS_INLINE pel_t xavs2_clip_pixel(int x)
 {
     return (pel_t)((x & ~max_pel_value) ? (-x) >> 31 & max_pel_value : x);
-}
+}*/
 
 static ALWAYS_INLINE int xavs2_clip3(int i_min, int i_max, int v)
 {
@@ -323,19 +323,19 @@ static ALWAYS_INLINE int xavs2_median(int a, int b, int c)
     return b;
 }
 
-// ������ֵ�ķ���λ����������-1�����򷵻�1
+// 返回数值的符号位，负数返回-1，否则返回1
 static ALWAYS_INLINE int xavs2_sign2(int val)
 {
     return ((val >> 31) << 1) + 1;
 }
 
-// ������ֵ�ķ���λ����������-1��0ֵ����0����������1
+// 返回数值的符号位，负数返回-1，0值返回0，正数返回1
 static ALWAYS_INLINE int xavs2_sign3(int val)
 {
     return (val >> 31) | (int)(((uint32_t)-val) >> 31u);
 }
 
-// ������������log2ֵ��0��1ʱ����0����������log2(val)
+// 计算正整数的log2值，0和1时返回0，其他返回log2(val)
 #define xavs2_log2u(val)  xavs2_ctz(val)
 
 

source/common/basic_types.h

@@ -47,11 +47,16 @@
  * basic types
  * ===========================================================================
  */
-typedef uint8_t     pel_t;      /* type for pixel */
-typedef int16_t     itr_t;      /* intra prediction temp */
+
+typedef uint16_t    pel10_t;      /* type for pixel value */
+typedef uint64_t    pixel10_4;     /* type for 4-pixels value */
+typedef int32_t     itr10_t;      /* intra prediction temp */
+typedef uint8_t     pel8_t;      /* type for pixel value */
+typedef uint32_t    pixel8_4;     /* type for 4-pixels value */
+typedef int16_t     itr8_t;      /* intra prediction temp */
+
 typedef uint16_t    sum_t;
 typedef uint32_t    sum2_t;
-typedef uint32_t    pixel4;
 typedef int32_t     ssum2_t;    /* Signed sum */
 typedef int32_t     dist_t;