Convert X264_HIGH_BIT_DEPTH to HIGH_BIT_DEPTH

Less verbose.

diff --git a/Makefile b/Makefile
index 8957ee1014e28ea04871c9de4b6ba15892491a26..8a3a327571eb34ef920824ced2e53db8fa7014ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ ifneq ($(AS),)
 X86SRC0 = const-a.asm cabac-a.asm dct-a.asm deblock-a.asm mc-a.asm \
           mc-a2.asm pixel-a.asm predict-a.asm quant-a.asm \
           cpu-a.asm dct-32.asm bitstream-a.asm
-ifneq ($(findstring X264_HIGH_BIT_DEPTH, $(CONFIG)),)
+ifneq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
 X86SRC0 += sad16-a.asm
 else
 X86SRC0 += sad-a.asm

diff --git a/common/arm/mc-c.c b/common/arm/mc-c.c
index a399a5ca7bb539a27164b47c027230b08f1332d7..d0d08fb4eee5b9ca2db168ae898eac0f271b61f3 100644 (file)
--- a/common/arm/mc-c.c
+++ b/common/arm/mc-c.c
@@ -79,7 +79,7 @@ void x264_hpel_filter_v_neon( uint8_t *, uint8_t *, int16_t *, int, int );
 void x264_hpel_filter_c_neon( uint8_t *, int16_t *, int );
 void x264_hpel_filter_h_neon( uint8_t *, uint8_t *, int );
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 static void x264_weight_cache_neon( x264_t *h, x264_weight_t *w )
 {
     if( w->i_scale == 1<<w->i_denom )
@@ -202,22 +202,22 @@ static void hpel_filter_neon( uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, uint8
         src  += stride;
     }
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 void x264_mc_init_arm( int cpu, x264_mc_functions_t *pf )
 {
     if( !(cpu&X264_CPU_ARMV6) )
         return;
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf->prefetch_fenc = x264_prefetch_fenc_arm;
     pf->prefetch_ref  = x264_prefetch_ref_arm;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
     if( !(cpu&X264_CPU_NEON) )
         return;
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf->copy_16x16_unaligned = x264_mc_copy_w16_neon;
     pf->copy[PIXEL_16x16] = x264_mc_copy_w16_aligned_neon;
     pf->copy[PIXEL_8x8]   = x264_mc_copy_w8_neon;
@@ -242,7 +242,7 @@ void x264_mc_init_arm( int cpu, x264_mc_functions_t *pf )
     pf->get_ref = get_ref_neon;
     pf->hpel_filter = hpel_filter_neon;
     pf->frame_init_lowres_core = x264_frame_init_lowres_core_neon;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 // Apple's gcc stupidly cannot align stack variables, and ALIGNED_ARRAY can't work on structs
 #ifndef SYS_MACOSX

diff --git a/common/arm/predict-c.c b/common/arm/predict-c.c
index 9f97c899f37d6036adc9413a60149d5191c728a3..541b0472a95873bce23a6c17dac74d7aee175b66 100644 (file)
--- a/common/arm/predict-c.c
+++ b/common/arm/predict-c.c
@@ -54,7 +54,7 @@ void x264_predict_4x4_init_arm( int cpu, x264_predict_t pf[12] )
     if (!(cpu&X264_CPU_ARMV6))
         return;
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_4x4_H]   = x264_predict_4x4_h_armv6;
     pf[I_PRED_4x4_DC]  = x264_predict_4x4_dc_armv6;
     pf[I_PRED_4x4_DDR] = x264_predict_4x4_ddr_armv6;
@@ -63,7 +63,7 @@ void x264_predict_4x4_init_arm( int cpu, x264_predict_t pf[12] )
         return;
 
     pf[I_PRED_4x4_DDL] = x264_predict_4x4_ddl_neon;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_8x8c_init_arm( int cpu, x264_predict_t pf[7] )
@@ -71,14 +71,14 @@ void x264_predict_8x8c_init_arm( int cpu, x264_predict_t pf[7] )
     if (!(cpu&X264_CPU_NEON))
         return;
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_CHROMA_DC]      = x264_predict_8x8c_dc_neon;
     pf[I_PRED_CHROMA_DC_TOP]  = x264_predict_8x8c_dc_top_neon;
     pf[I_PRED_CHROMA_DC_LEFT] = x264_predict_8x8c_dc_left_neon;
     pf[I_PRED_CHROMA_H] = x264_predict_8x8c_h_neon;
     pf[I_PRED_CHROMA_V] = x264_predict_8x8c_v_neon;
     pf[I_PRED_CHROMA_P] = x264_predict_8x8c_p_neon;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_8x8_init_arm( int cpu, x264_predict8x8_t pf[12], x264_predict_8x8_filter_t *predict_filter )
@@ -86,10 +86,10 @@ void x264_predict_8x8_init_arm( int cpu, x264_predict8x8_t pf[12], x264_predict_
     if (!(cpu&X264_CPU_NEON))
         return;
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_8x8_DC]  = x264_predict_8x8_dc_neon;
     pf[I_PRED_8x8_H]   = x264_predict_8x8_h_neon;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_16x16_init_arm( int cpu, x264_predict_t pf[7] )
@@ -97,12 +97,12 @@ void x264_predict_16x16_init_arm( int cpu, x264_predict_t pf[7] )
     if (!(cpu&X264_CPU_NEON))
         return;
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_16x16_DC ]    = x264_predict_16x16_dc_neon;
     pf[I_PRED_16x16_DC_TOP] = x264_predict_16x16_dc_top_neon;
     pf[I_PRED_16x16_DC_LEFT]= x264_predict_16x16_dc_left_neon;
     pf[I_PRED_16x16_H ]     = x264_predict_16x16_h_neon;
     pf[I_PRED_16x16_V ]     = x264_predict_16x16_v_neon;
     pf[I_PRED_16x16_P ]     = x264_predict_16x16_p_neon;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/common.h b/common/common.h
index c3bfaf5e3caa7e5edfbebe1da1c2ee4c0bde3a45..7e51ed0600def92ff24453b977fc653de2c780c2 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -110,7 +110,7 @@ typedef union { x264_uint128_t i; uint64_t a[2]; uint32_t b[4]; uint16_t c[8]; u
 #define CP64(dst,src) M64(dst) = M64(src)
 #define CP128(dst,src) M128(dst) = M128(src)
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
     typedef uint16_t pixel;
     typedef uint64_t pixel4;
     typedef int32_t  dctcoef;

diff --git a/common/dct.c b/common/dct.c
index 4b9528ca9147a91301277560a439773b466c4537..975afef9d50657fdb9bcdc675ea99ab87af62c2c 100644 (file)
--- a/common/dct.c
+++ b/common/dct.c
@@ -421,7 +421,7 @@ void x264_dct_init( int cpu, x264_dct_function_t *dctf )
     dctf->dct4x4dc  = dct4x4dc;
     dctf->idct4x4dc = idct4x4dc;
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMX )
     {
@@ -430,7 +430,7 @@ void x264_dct_init( int cpu, x264_dct_function_t *dctf )
         dctf->sub16x16_dct  = x264_sub16x16_dct_mmx;
     }
 #endif // HAVE_MMX
-#else // !X264_HIGH_BIT_DEPTH
+#else // !HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMX )
     {
@@ -528,7 +528,7 @@ void x264_dct_init( int cpu, x264_dct_function_t *dctf )
         dctf->add16x16_idct8= x264_add16x16_idct8_neon;
     }
 #endif
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 }
 
 void x264_dct_init_weights( void )
@@ -722,7 +722,7 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
         pf->sub_8x8    = zigzag_sub_8x8_field;
         pf->sub_4x4    = zigzag_sub_4x4_field;
         pf->sub_4x4ac  = zigzag_sub_4x4ac_field;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if HAVE_MMX
         if( cpu&X264_CPU_MMXEXT )
         {
@@ -740,7 +740,7 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
         if( cpu&X264_CPU_ALTIVEC )
             pf->scan_4x4   = x264_zigzag_scan_4x4_field_altivec;
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
     }
     else
     {
@@ -749,7 +749,7 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
         pf->sub_8x8    = zigzag_sub_8x8_frame;
         pf->sub_4x4    = zigzag_sub_4x4_frame;
         pf->sub_4x4ac  = zigzag_sub_4x4ac_frame;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if HAVE_MMX
         if( cpu&X264_CPU_MMX )
             pf->scan_4x4 = x264_zigzag_scan_4x4_frame_mmx;
@@ -775,16 +775,16 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
         if( cpu&X264_CPU_NEON )
             pf->scan_4x4 = x264_zigzag_scan_4x4_frame_neon;
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
     }
 
     pf->interleave_8x8_cavlc = zigzag_interleave_8x8_cavlc;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMX )
         pf->interleave_8x8_cavlc = x264_zigzag_interleave_8x8_cavlc_mmx;
     if( cpu&X264_CPU_SHUFFLE_IS_FAST )
         pf->interleave_8x8_cavlc = x264_zigzag_interleave_8x8_cavlc_sse2;
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/deblock.c b/common/deblock.c
index 47378824b79d0c5e80efb34ae9df87143176f070..a4a9e0a11e39ebdc7f7d5131c16fceb4102858fa 100644 (file)
--- a/common/deblock.c
+++ b/common/deblock.c
@@ -463,7 +463,7 @@ void x264_deblock_v8_luma_intra_mmxext( uint8_t *pix, int stride, int alpha, int
 void x264_deblock_v_chroma_intra_mmxext( pixel *pix, int stride, int alpha, int beta );
 void x264_deblock_h_chroma_intra_mmxext( pixel *pix, int stride, int alpha, int beta );
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 void x264_deblock_v_luma_mmxext( pixel *pix, int stride, int alpha, int beta, int8_t *tc0 );
 void x264_deblock_v_luma_intra_mmxext( pixel *pix, int stride, int alpha, int beta );
 #else
@@ -478,7 +478,7 @@ static void x264_deblock_v_luma_intra_mmxext( uint8_t *pix, int stride, int alph
     x264_deblock_v8_luma_intra_mmxext( pix,   stride, alpha, beta );
     x264_deblock_v8_luma_intra_mmxext( pix+8, stride, alpha, beta );
 }
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 #endif
 #endif
 
@@ -540,7 +540,7 @@ void x264_deblock_init( int cpu, x264_deblock_function_t *pf )
     }
 #endif
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if HAVE_ALTIVEC
     if( cpu&X264_CPU_ALTIVEC )
     {
@@ -558,5 +558,5 @@ void x264_deblock_init( int cpu, x264_deblock_function_t *pf )
 //      pf->deblock_chroma[0] = x264_deblock_h_chroma_neon;
    }
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/frame.c b/common/frame.c
index 96291f043f66f8baf84438a91c10fa7c2bc2c680..d7e48728e43f572e866e621af3392bcf4667ba40 100644 (file)
--- a/common/frame.c
+++ b/common/frame.c
@@ -263,7 +263,7 @@ int x264_frame_copy_picture( x264_t *h, x264_frame_t *dst, x264_picture_t *src )
         return -1;
     }
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
     if( !(src->img.i_csp & X264_CSP_HIGH_DEPTH) )
     {
         x264_log( h, X264_LOG_ERROR, "This build of x264 requires high depth input. Rebuild to support 8-bit input.\n" );

diff --git a/common/macroblock.h b/common/macroblock.h
index 1f73fbf2c33b162f1270818cc44bf5b5ce699e95..eb5b6f9a31866bbac34391d2ddc2de7feaca1491 100644 (file)
--- a/common/macroblock.h
+++ b/common/macroblock.h
@@ -371,7 +371,7 @@ static ALWAYS_INLINE uint64_t pack32to64( uint32_t a, uint32_t b )
 #endif
 }
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 #   define pack_pixel_1to2 pack16to32
 #   define pack_pixel_2to4 pack32to64
 #else

diff --git a/common/pixel.c b/common/pixel.c
index c932583de5b0f429aec739b9bcdafec9cc68162b..efb2cc6a65bbc47c5482db6fdb975efaed65c5f2 100644 (file)
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -442,14 +442,14 @@ SAD_X( 8x4 )
 SAD_X( 4x8 )
 SAD_X( 4x4 )
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if ARCH_UltraSparc
 SAD_X( 16x16_vis )
 SAD_X( 16x8_vis )
 SAD_X( 8x16_vis )
 SAD_X( 8x8_vis )
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 /****************************************************************************
  * pixel_satd_x4
@@ -484,18 +484,18 @@ SATD_X( 4x4, cpu )
 SATD_X_DECL7()
 #if HAVE_MMX
 SATD_X_DECL7( _mmxext )
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 SATD_X_DECL6( _sse2 )
 SATD_X_DECL7( _ssse3 )
 SATD_X_DECL7( _sse4 )
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 #endif
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if HAVE_ARMV6
 SATD_X_DECL7( _neon )
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 #define INTRA_MBCMP_8x8( mbcmp, cpu )\
 void x264_intra_##mbcmp##_x3_8x8##cpu( pixel *fenc, pixel edge[33], int res[3] )\
@@ -511,7 +511,7 @@ void x264_intra_##mbcmp##_x3_8x8##cpu( pixel *fenc, pixel edge[33], int res[3] )
 
 INTRA_MBCMP_8x8( sad, )
 INTRA_MBCMP_8x8(sa8d, )
-#if X264_HIGH_BIT_DEPTH && HAVE_MMX
+#if HIGH_BIT_DEPTH && HAVE_MMX
 INTRA_MBCMP_8x8( sad, _mmxext)
 INTRA_MBCMP_8x8( sad, _sse2  )
 INTRA_MBCMP_8x8( sad, _ssse3 )
@@ -536,7 +536,7 @@ INTRA_MBCMP(satd,  8, dc, h,  v, c, )
 INTRA_MBCMP( sad, 16,  v, h, dc,  , )
 INTRA_MBCMP(satd, 16,  v, h, dc,  , )
 
-#if X264_HIGH_BIT_DEPTH && HAVE_MMX
+#if HIGH_BIT_DEPTH && HAVE_MMX
 INTRA_MBCMP( sad,  4,  v, h, dc,  , _mmxext)
 INTRA_MBCMP(satd,  4,  v, h, dc,  , _mmxext)
 INTRA_MBCMP( sad,  8, dc, h,  v, c, _mmxext)
@@ -740,7 +740,7 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
     pixf->intra_sad_x3_16x16  = x264_intra_sad_x3_16x16;
     pixf->intra_satd_x3_16x16 = x264_intra_satd_x3_16x16;
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMXEXT )
     {
@@ -827,7 +827,7 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
         pixf->intra_sad_x3_16x16  = x264_intra_sad_x3_16x16_ssse3;
     }
 #endif // HAVE_MMX
-#else // !X264_HIGH_BIT_DEPTH
+#else // !HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMX )
     {
@@ -1055,20 +1055,20 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
         }
     }
 #endif
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 #if HAVE_ALTIVEC
     if( cpu&X264_CPU_ALTIVEC )
     {
         x264_pixel_altivec_init( pixf );
     }
 #endif
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if ARCH_UltraSparc
     INIT4( sad, _vis );
     INIT4( sad_x3, _vis );
     INIT4( sad_x4, _vis );
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
     pixf->ads[PIXEL_8x16] =
     pixf->ads[PIXEL_8x4] =

diff --git a/common/ppc/dct.c b/common/ppc/dct.c
index 723aee53ee16d7fd6714347fd56245e3780f5593..32163be223e42954bbe0654607b80ccc89f5aa43 100644 (file)
--- a/common/ppc/dct.c
+++ b/common/ppc/dct.c
@@ -27,7 +27,7 @@
 #include "common/common.h"
 #include "ppccommon.h"
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #define VEC_DCT(a0,a1,a2,a3,b0,b1,b2,b3) \
     b1 = vec_add( a0, a3 );              \
     b3 = vec_add( a1, a2 );              \
@@ -486,5 +486,5 @@ void x264_zigzag_scan_4x4_field_altivec( int16_t level[16], int16_t dct[16] )
     vec_st( tmp0v, 0x00, level );
     vec_st( tmp1v, 0x10, level );
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 

diff --git a/common/ppc/deblock.c b/common/ppc/deblock.c
index 4d2072e21ef4e7fe7624c4143fe696dd73b913a3..3632d9420646dfb7762e511155352cc0f60796d8 100644 (file)
--- a/common/ppc/deblock.c
+++ b/common/ppc/deblock.c
@@ -26,7 +26,7 @@
 #include "common/common.h"
 #include "ppccommon.h"
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #define transpose4x16(r0, r1, r2, r3)        \
 {                                            \
     register vec_u8_t r4;                    \
@@ -298,4 +298,4 @@ void x264_deblock_h_luma_altivec( uint8_t *pix, int stride, int alpha, int beta,
     transpose4x16(line1, line2, line3, line4);
     write16x4(pix-2, stride, line1, line2, line3, line4);
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH

diff --git a/common/ppc/mc.c b/common/ppc/mc.c
index 4c64a0c5bfd3f1883480ec7f65298084d2b3495c..2271ec649e4a6dab29bfa9d2e895ea340d47667c 100644 (file)
--- a/common/ppc/mc.c
+++ b/common/ppc/mc.c
@@ -36,7 +36,7 @@
 #include "mc.h"
 #include "ppccommon.h"
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 typedef void (*pf_mc_t)( uint8_t *src, int i_src,
                          uint8_t *dst, int i_dst, int i_height );
 
@@ -856,11 +856,11 @@ static void frame_init_lowres_core_altivec( uint8_t *src0, uint8_t *dst0, uint8_
         dstc += dst_stride;
     }
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 void x264_mc_altivec_init( x264_mc_functions_t *pf )
 {
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf->mc_luma   = mc_luma_altivec;
     pf->get_ref   = get_ref_altivec;
     pf->mc_chroma = mc_chroma_altivec;
@@ -870,5 +870,5 @@ void x264_mc_altivec_init( x264_mc_functions_t *pf )
 
     pf->hpel_filter = x264_hpel_filter_altivec;
     pf->frame_init_lowres_core = frame_init_lowres_core_altivec;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
index 06601262bc3faaffeefdc5f1e915b52740bb755c..471499b3e55678071b7cd4aebff1545b20b50c56 100644 (file)
--- a/common/ppc/pixel.c
+++ b/common/ppc/pixel.c
@@ -27,7 +27,7 @@
 #include "common/common.h"
 #include "ppccommon.h"
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 /***********************************************************************
  * SAD routines
  **********************************************************************/
@@ -1983,14 +1983,14 @@ static void ssim_4x4x2_core_altivec( const uint8_t *pix1, int stride1,
     sums[0][3] = temp[0];
     sums[1][3] = temp[1];
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 /****************************************************************************
  * x264_pixel_init:
  ****************************************************************************/
 void x264_pixel_altivec_init( x264_pixel_function_t *pixf )
 {
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pixf->sad[PIXEL_16x16]  = pixel_sad_16x16_altivec;
     pixf->sad[PIXEL_8x16]   = pixel_sad_8x16_altivec;
     pixf->sad[PIXEL_16x8]   = pixel_sad_16x8_altivec;
@@ -2029,5 +2029,5 @@ void x264_pixel_altivec_init( x264_pixel_function_t *pixf )
     pixf->hadamard_ac[PIXEL_8x8]   = x264_pixel_hadamard_ac_8x8_altivec;
 
     pixf->ssim_4x4x2_core = ssim_4x4x2_core_altivec;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/ppc/predict.c b/common/ppc/predict.c
index aa8ba0101bba9440fecb98291abd18c0b7bb6365..6ba7f5ff1619749b004a9738535ef7f29a0bd7ed 100644 (file)
--- a/common/ppc/predict.c
+++ b/common/ppc/predict.c
@@ -28,7 +28,7 @@
 #include "pixel.h"
 #include "ppccommon.h"
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 static void predict_8x8c_p_altivec( uint8_t *src )
 {
     int H = 0, V = 0;
@@ -200,7 +200,7 @@ static void predict_16x16_v_altivec( uint8_t *src )
         src += FDEC_STRIDE;
     }
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 
 /****************************************************************************
@@ -208,7 +208,7 @@ static void predict_16x16_v_altivec( uint8_t *src )
  ****************************************************************************/
 void x264_predict_16x16_init_altivec( x264_predict_t pf[7] )
 {
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_16x16_V ]      = predict_16x16_v_altivec;
     pf[I_PRED_16x16_H ]      = predict_16x16_h_altivec;
     pf[I_PRED_16x16_DC]      = predict_16x16_dc_altivec;
@@ -216,12 +216,12 @@ void x264_predict_16x16_init_altivec( x264_predict_t pf[7] )
     pf[I_PRED_16x16_DC_LEFT] = predict_16x16_dc_left_altivec;
     pf[I_PRED_16x16_DC_TOP ] = predict_16x16_dc_top_altivec;
     pf[I_PRED_16x16_DC_128 ] = predict_16x16_dc_128_altivec;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_8x8c_init_altivec( x264_predict_t pf[7] )
 {
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_CHROMA_P]       = predict_8x8c_p_altivec;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/ppc/quant.c b/common/ppc/quant.c
index eaecf8130f779e12a50c960891de03b82b8db7c2..ccd1166af98cd21ddea397ab84ece381254f8821 100644 (file)
--- a/common/ppc/quant.c
+++ b/common/ppc/quant.c
@@ -27,7 +27,7 @@
 #include "ppccommon.h"
 #include "quant.h"
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 // quant of a whole 4x4 block, unrolled 2x and "pre-scheduled"
 #define QUANT_16_U( idx0, idx1 )                                    \
 {                                                                   \
@@ -366,5 +366,5 @@ void x264_dequant_8x8_altivec( int16_t dct[64], int dequant_mf[6][64], int i_qp
             DEQUANT_SHR();
     }
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 

diff --git a/common/quant.c b/common/quant.c
index a8e9287df4535f15091091a180549fbf9f9ec0c0..baf7a80c239e475724248851a7523d0f2270c058 100644 (file)
--- a/common/quant.c
+++ b/common/quant.c
@@ -285,7 +285,7 @@ void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
     pf->coeff_level_run[  DCT_LUMA_AC] = x264_coeff_level_run15;
     pf->coeff_level_run[ DCT_LUMA_4x4] = x264_coeff_level_run16;
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMX )
     {
@@ -369,7 +369,7 @@ void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
         pf->quant_8x8 = x264_quant_8x8_sse4;
     }
 #endif // HAVE_MMX
-#else // !X264_HIGH_BIT_DEPTH
+#else // !HIGH_BIT_DEPTH
 #if HAVE_MMX
     if( cpu&X264_CPU_MMX )
     {
@@ -508,7 +508,7 @@ void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
         pf->coeff_last[DCT_LUMA_8x8] = x264_coeff_last64_neon;
     }
 #endif
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
     pf->coeff_last[  DCT_LUMA_DC] = pf->coeff_last[DCT_LUMA_4x4];
     pf->coeff_last[DCT_CHROMA_AC] = pf->coeff_last[ DCT_LUMA_AC];
     pf->coeff_level_run[  DCT_LUMA_DC] = pf->coeff_level_run[DCT_LUMA_4x4];

diff --git a/common/x86/dct-a.asm b/common/x86/dct-a.asm
index faf50d60f6af20ef2605e8949d8e55cf35eda395..59260597fb7d479a021ce83798c9c12356f15a6a 100644 (file)
--- a/common/x86/dct-a.asm
+++ b/common/x86/dct-a.asm
@@ -114,7 +114,7 @@ cglobal idct4x4dc_mmx, 1,1
     movq  [r0+24], m3
     RET
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void sub4x4_dct( int32_t dct[4][4], uint16_t *pix1, uint16_t *pix2 )
 ;-----------------------------------------------------------------------------
@@ -132,9 +132,9 @@ cglobal sub4x4_dct_mmx, 3,3
     STORE_DIFF m2, m4, m5, [r0+32], [r0+40]
     STORE_DIFF m3, m4, m5, [r0+48], [r0+56]
     RET
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %macro SUB_DCT4 1
 ;-----------------------------------------------------------------------------
 ; void sub4x4_dct( int16_t dct[4][4], uint8_t *pix1, uint8_t *pix2 )
@@ -162,9 +162,9 @@ cglobal sub4x4_dct_%1, 3,3
 
 SUB_DCT4 mmx
 SUB_DCT4 ssse3
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void add4x4_idct( uint8_t *p_dst, int16_t dct[4][4] )
 ;-----------------------------------------------------------------------------
@@ -236,7 +236,7 @@ cglobal add4x4_idct_sse4, 2,2,6
     movd     [r0+FDEC_STRIDE*2], m0
     pextrd   [r0+FDEC_STRIDE*3], m0, 1
     RET
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 INIT_MMX
 ;-----------------------------------------------------------------------------
@@ -244,14 +244,14 @@ INIT_MMX
 ;-----------------------------------------------------------------------------
 %macro SUB_NxN_DCT 6
 cglobal %1, 3,3,11*(mmsize/16)
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %if mmsize == 8
     pxor m7, m7
 %else
     add r2, 4*FDEC_STRIDE
     mova m7, [hsub_mul]
 %endif
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 .skip_prologue:
 %ifdef WIN64
     sub  rsp, 8
@@ -308,11 +308,11 @@ cglobal %1, 2,2,11*(mmsize/16)
 %endif
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 INIT_MMX
 SUB_NxN_DCT  sub8x8_dct_mmx,    sub4x4_dct_mmx.skip_prologue,  64,  8, 0, 0
 SUB_NxN_DCT  sub16x16_dct_mmx,  sub8x8_dct_mmx.skip_prologue,  64, 16, 8, 8
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 %ifndef ARCH_X86_64
 SUB_NxN_DCT  sub8x8_dct_mmx,    sub4x4_dct_mmx.skip_prologue,  32, 4, 0, 0
 ADD_NxN_IDCT add8x8_idct_mmx,   add4x4_idct_mmx.skip_prologue, 32, 4, 0, 0
@@ -341,7 +341,7 @@ ADD_NxN_IDCT add16x16_idct8_sse2, add8x8_idct8_sse2.skip_prologue, 128, 8, 0, 0
 
 cextern sub8x8_dct8_ssse3.skip_prologue
 SUB_NxN_DCT  sub16x16_dct8_ssse3, sub8x8_dct8_ssse3.skip_prologue, 128, 8, 0, 0
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
 
 ;-----------------------------------------------------------------------------

diff --git a/common/x86/deblock-a.asm b/common/x86/deblock-a.asm
index 7309e4657c5a68275861fa14f5cb7ccbc033c113..85048b9ac09a30fb1ded05bd3080a95c9337f470 100644 (file)
--- a/common/x86/deblock-a.asm
+++ b/common/x86/deblock-a.asm
@@ -43,7 +43,7 @@ cextern pw_4
 cextern pw_00ff
 cextern pw_pixel_max
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ; out: %4 = |%1-%2|-%3
 ; clobbers: %5
 %macro ABS_SUB 5
@@ -781,9 +781,9 @@ INIT_XMM
 DEBLOCK_LUMA sse2
 DEBLOCK_LUMA_INTRA sse2
 %endif
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 ; expands to [base],...,[base+7*stride]
 %define PASS8ROWS(base, base3, stride, stride3) \
     [base], [base+stride], [base+stride*2], [base3], \
@@ -1557,9 +1557,9 @@ DEBLOCK_LUMA_INTRA sse2, v
 INIT_MMX
 DEBLOCK_LUMA_INTRA mmxext, v8
 %endif
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ; in: %1=p0, %2=q0, %3=p1, %4=q1, %5=mask, %6=tmp, %7=tmp
 ; out: %1=p0', %2=q0'
 %macro CHROMA_DEBLOCK_P0_Q0_INTRA 7
@@ -1743,9 +1743,9 @@ DEBLOCK_CHROMA mmxext
 %endif
 INIT_XMM
 DEBLOCK_CHROMA sse2
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %macro CHROMA_V_START 0
     dec    r2d      ; alpha-1
     dec    r3d      ; beta-1
@@ -1909,7 +1909,7 @@ DEBLOCK_CHROMA_INTRA sse2
 INIT_MMX
 DEBLOCK_CHROMA_INTRA mmxext
 %endif
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 
 

diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm
index f51a6ea74d2aff07d43285db95d275af974643fb..a20b85f2d870abff2a606f841b874275d95f29d6 100644 (file)
--- a/common/x86/mc-a.asm
+++ b/common/x86/mc-a.asm
@@ -186,7 +186,7 @@ AVG_WEIGHT ssse3, 16, 7
 ; P frame explicit weighted prediction
 ;=============================================================================
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro WEIGHT_START 1 ; (width)
     movd        m2, [r4+32]         ; denom
     movd        m3, [r4+36]         ; scale
@@ -236,7 +236,7 @@ AVG_WEIGHT ssse3, 16, 7
 %endrep
 %endmacro
 
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 
 %macro WEIGHT_START 1
     mova     m3, [r4]
@@ -351,7 +351,7 @@ AVG_WEIGHT ssse3, 16, 7
 %endrep
 %endmacro
 
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
 ;-----------------------------------------------------------------------------
 ;void mc_weight_wX( uint8_t *dst, int i_dst_stride, uint8_t *src, int i_src_stride, weight_t *weight, int h )
@@ -370,7 +370,7 @@ AVG_WEIGHT ssse3, 16, 7
 %endif
 
 %assign XMMREGS 7
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %assign NUMREGS NUMREGS+1
 %assign XMMREGS 8
 %endif
@@ -399,7 +399,7 @@ INIT_XMM
 WEIGHTER  8, sse2
 WEIGHTER 16, sse2
 WEIGHTER 20, sse2
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 WEIGHTER 12, sse2
 %else
 %define WEIGHT WEIGHT_SSSE3
@@ -573,7 +573,7 @@ AVGH  4,  2, ssse3
 ; pixel avg2
 ;=============================================================================
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void pixel_avg2_wN( uint16_t *dst,  int dst_stride,
 ;                     uint16_t *src1, int src_stride,
@@ -755,9 +755,9 @@ cglobal pixel_avg2_w18_sse2, 6,7,6
     lea     r0, [r0+r1*2]
     jg .height_loop
     REP_RET
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void pixel_avg2_w4( uint8_t *dst, int dst_stride,
 ;                     uint8_t *src1, int src_stride,
@@ -1081,7 +1081,7 @@ AVG16_CACHELINE_LOOP_SSSE3 j, k
 %assign j j+1
 %assign k k+1
 %endrep
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 ;=============================================================================
 ; pixel copy
@@ -1098,7 +1098,7 @@ AVG16_CACHELINE_LOOP_SSSE3 j, k
     %1  [r0+%3],   m3
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro COPY_ONE 6
     COPY4 %1, %2, %3, %4
 %endmacro
@@ -1168,9 +1168,9 @@ INIT_XMM
 MC_COPY ONE,  8, movu, sse2,         0
 MC_COPY TWO, 16, movu, sse2,         8
 MC_COPY TWO, 16, mova, aligned_sse2, 8
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 INIT_MMX
 ;-----------------------------------------------------------------------------
 ; void mc_copy_w4( uint8_t *dst, int i_dst_stride,
@@ -1244,7 +1244,7 @@ COPY_W16_SSE2 mc_copy_w16_sse2, movdqu
 ; but with SSE3 the overhead is zero, so there's no reason not to include it.
 COPY_W16_SSE2 mc_copy_w16_sse3, lddqu
 COPY_W16_SSE2 mc_copy_w16_aligned_sse2, movdqa
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 
 
@@ -1347,7 +1347,7 @@ cglobal prefetch_ref_mmxext, 3,3
     add       r3,  t0            ; src += (dx>>3) + (dy>>3) * src_stride
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro UNPACK_UNALIGNED 4
     movu       %1, [%4+0]
     movu       %2, [%4+4]
@@ -1363,7 +1363,7 @@ cglobal prefetch_ref_mmxext, 3,3
     shufps     %2, %3, 11011101b
 %endif
 %endmacro
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 %macro UNPACK_UNALIGNED_MEM 3
     punpcklwd  %1, %3
 %endmacro
@@ -1372,7 +1372,7 @@ cglobal prefetch_ref_mmxext, 3,3
     movh       %2, %3
     punpcklwd  %1, %2
 %endmacro
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
 ;-----------------------------------------------------------------------------
 ; void mc_chroma( uint8_t *dstu, uint8_t *dstv, int dst_stride,
@@ -1427,7 +1427,7 @@ cglobal mc_chroma_%1, 0,6
     pshufd     m5, m5, 0x55
     jg .width8
 %endif
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     add        r2, r2
     UNPACK_UNALIGNED m0, m1, m2, r3
 %else
@@ -1436,24 +1436,24 @@ cglobal mc_chroma_%1, 0,6
     mova       m1, m0
     pand       m0, [pw_00ff]
     psrlw      m1, 8
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     pmaddwd    m0, m7
     pmaddwd    m1, m7
     packssdw   m0, m1
     SWAP       m3, m0
 ALIGN 4
 .loop2:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     UNPACK_UNALIGNED m0, m1, m2, r3+r4
     pmullw     m3, m6
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movu       m0, [r3+r4]
     UNPACK_UNALIGNED m0, m1, [r3+r4+2]
     pmullw     m3, m6
     mova       m1, m0
     pand       m0, [pw_00ff]
     psrlw      m1, 8
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     pmaddwd    m0, m7
     pmaddwd    m1, m7
     mova       m2, [pw_32]
@@ -1463,7 +1463,7 @@ ALIGN 4
     pmullw     m0, m5
     paddw      m0, m2
     psrlw      m0, 6
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     movh     [r0], m0
 %if mmsize == 8
     psrlq      m0, 32
@@ -1471,7 +1471,7 @@ ALIGN 4
 %else
     movhps   [r1], m0
 %endif
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     packuswb   m0, m0
     movd     [r0], m0
 %if mmsize==8
@@ -1480,7 +1480,7 @@ ALIGN 4
     psrldq     m0, 4
 %endif
     movd     [r1], m0
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     add        r3, r4
     add        r0, r2
     add        r1, r2
@@ -1513,7 +1513,7 @@ ALIGN 4
 %endif
     FIX_STRIDES r2
 .loopx:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     UNPACK_UNALIGNED m0, m2, m4, r3
     UNPACK_UNALIGNED m1, m3, m5, r3+mmsize
 %else
@@ -1539,7 +1539,7 @@ ALIGN 4
     add        r3, r4
 ALIGN 4
 .loop4:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     UNPACK_UNALIGNED m0, m1, m2, r3
     pmaddwd    m0, m7
     pmaddwd    m1, m7
@@ -1548,7 +1548,7 @@ ALIGN 4
     pmaddwd    m1, m7
     pmaddwd    m2, m7
     packssdw   m1, m2
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movu       m0, [r3]
     movu       m1, [r3+mmsize/2]
     UNPACK_UNALIGNED m0, m2, [r3+2]
@@ -1565,7 +1565,7 @@ ALIGN 4
     pmaddwd    m3, m7
     packssdw   m0, m2
     packssdw   m1, m3
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     pmullw     m4, m6
     pmullw     m5, m6
     mova       m2, [pw_32]
@@ -1580,7 +1580,7 @@ ALIGN 4
     paddw      m1, m3
     psrlw      m0, 6
     psrlw      m1, 6
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     movh     [r0], m0
     movh     [r0+mmsize/2], m1
 %if mmsize==8
@@ -1592,7 +1592,7 @@ ALIGN 4
     movhps   [r1], m0
     movhps   [r1+mmsize/2], m1
 %endif
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     packuswb   m0, m1
 %if mmsize==8
     pshufw     m1, m0, 0x8
@@ -1604,7 +1604,7 @@ ALIGN 4
     movq     [r0], m0
     movhps   [r1], m0
 %endif
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     add        r3, r4
     add        r0, r2
     add        r1, r2
@@ -1650,7 +1650,7 @@ ALIGN 4
     movd       m5, r5d
     mov       r6d, 2*SIZEOF_PIXEL
 .mc1d:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %if mmsize == 16
     WIN64_SPILL_XMM 8
 %endif
@@ -1671,7 +1671,7 @@ ALIGN 4
     shr       r5d, 1
 %endif
 .loop1d_w4:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %if mmsize == 8
     movq       m0, [r3+0]
     movq       m2, [r3+8]
@@ -1692,7 +1692,7 @@ ALIGN 4
     SBUTTERFLY wd, 0, 2, 6
     SBUTTERFLY wd, 1, 3, 7
 %endif
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movq       m0, [r3]
     movq       m1, [r3+r6]
 %if mmsize!=8
@@ -1706,7 +1706,7 @@ ALIGN 4
     pand       m1, [pw_00ff]
     psrlw      m2, 8
     psrlw      m3, 8
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     pmullw     m0, m4
     pmullw     m1, m5
     pmullw     m2, m4
@@ -1717,7 +1717,7 @@ ALIGN 4
     paddw      m2, m3
     psrlw      m0, 3
     psrlw      m2, 3
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %if mmsize == 8
     xchg       r4, r11
     xchg       r2, r10
@@ -1730,7 +1730,7 @@ ALIGN 4
     movhps   [r0], m0
     movhps   [r1], m2
 %endif
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     packuswb   m0, m2
 %if mmsize==8
     xchg       r4, r11
@@ -1749,7 +1749,7 @@ ALIGN 4
     movd     [r0], m0
     movd     [r1], m1
 %endif
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     add        r3, r4
     add        r0, r2
     add        r1, r2
@@ -1904,12 +1904,12 @@ cglobal mc_chroma_ssse3%1, 0,6,9
     REP_RET
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 INIT_MMX
 MC_CHROMA mmxext
 INIT_XMM
 MC_CHROMA sse2
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 INIT_MMX
 %define UNPACK_UNALIGNED UNPACK_UNALIGNED_MEM
 MC_CHROMA mmxext
@@ -1919,4 +1919,4 @@ MC_CHROMA sse2_misalign
 MC_CHROMA sse2
 MC_CHROMA_SSSE3
 MC_CHROMA_SSSE3 _cache64
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH

diff --git a/common/x86/mc-a2.asm b/common/x86/mc-a2.asm
index 5a6ba7248f98a755dd880cbb847741fd16c8d59c..b80874aa0ce04e5f6ee051f634ee1565910bc642 100644 (file)
--- a/common/x86/mc-a2.asm
+++ b/common/x86/mc-a2.asm
@@ -148,7 +148,7 @@ cextern pd_128
 ;%define movntps movaps
 ;%define sfence
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void hpel_filter_v( uint16_t *dst, uint16_t *src, int16_t *buf, int stride, int width );
 ;-----------------------------------------------------------------------------
@@ -307,9 +307,9 @@ INIT_MMX
 HPEL_FILTER mmxext
 INIT_XMM
 HPEL_FILTER sse2
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 INIT_MMX
 
 %macro HPEL_V 1-2 0
@@ -822,7 +822,7 @@ HPEL ssse3
 %undef movntq
 %undef movntps
 %undef sfence
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 ;-----------------------------------------------------------------------------
 ; void plane_copy_core( uint8_t *dst, int i_dst,

diff --git a/common/x86/mc-c.c b/common/x86/mc-c.c
index 20f96f4273e9fb3c0f745706cbcd1b6776742534..1ad2917e00abde95036ced8ad4f5181d5713cf5a 100644 (file)
--- a/common/x86/mc-c.c
+++ b/common/x86/mc-c.c
@@ -166,7 +166,7 @@ static void (* const x264_pixel_avg_wtab_##instr[6])( pixel *, int, pixel *, int
     x264_pixel_avg2_w20_##name5,\
 };
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 /* we can replace w12/w20 with w10/w18 as only 9/17 pixels in fact are important */
 #define x264_pixel_avg2_w12_mmxext       x264_pixel_avg2_w10_mmxext
 #define x264_pixel_avg2_w20_mmxext       x264_pixel_avg2_w18_mmxext
@@ -178,12 +178,12 @@ static void (* const x264_pixel_avg_wtab_##instr[6])( pixel *, int, pixel *, int
 #define x264_pixel_avg2_w12_cache64_sse2 x264_pixel_avg2_w16_cache64_sse2
 #define x264_pixel_avg2_w12_sse3         x264_pixel_avg2_w16_sse3
 #define x264_pixel_avg2_w12_sse2         x264_pixel_avg2_w16_sse2
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 
 PIXEL_AVG_WTAB(mmxext, mmxext, mmxext, mmxext, mmxext, mmxext)
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 PIXEL_AVG_WTAB(sse2, mmxext, sse2, sse2, sse2, sse2)
-#else // !X264_HIGH_BIT_DEPTH
+#else // !HIGH_BIT_DEPTH
 #if ARCH_X86
 PIXEL_AVG_WTAB(cache32_mmxext, mmxext, cache32_mmxext, cache32_mmxext, cache32_mmxext, cache32_mmxext)
 PIXEL_AVG_WTAB(cache64_mmxext, mmxext, cache64_mmxext, cache64_mmxext, cache64_mmxext, cache64_mmxext)
@@ -192,7 +192,7 @@ PIXEL_AVG_WTAB(sse2, mmxext, mmxext, sse2, sse2, sse2)
 PIXEL_AVG_WTAB(sse2_misalign, mmxext, mmxext, sse2, sse2, sse2_misalign)
 PIXEL_AVG_WTAB(cache64_sse2, mmxext, cache64_mmxext, cache64_sse2, cache64_sse2, cache64_sse2)
 PIXEL_AVG_WTAB(cache64_ssse3, mmxext, cache64_mmxext, cache64_ssse3, cache64_ssse3, cache64_sse2)
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 
 #define MC_COPY_WTAB(instr, name1, name2, name3)\
 static void (* const x264_mc_copy_wtab_##instr[5])( pixel *, int, pixel *, int, int ) =\
@@ -218,7 +218,7 @@ MC_COPY_WTAB(sse2,mmx,mmx,sse2)
     x264_mc_##function##_w20_##instr,\
 };
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 MC_WEIGHT_WTAB(weight,mmxext,mmxext,mmxext,12)
 MC_WEIGHT_WTAB(weight,sse2,mmxext,sse2,12)
 #else
@@ -274,7 +274,7 @@ static void x264_weight_cache_ssse3( x264_t *h, x264_weight_t *w )
         w->cacheb[i] = w->i_offset;
     }
 }
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 static const uint8_t hpel_ref0[16] = {0,1,1,1,0,1,1,1,2,3,3,3,0,1,1,1};
 static const uint8_t hpel_ref1[16] = {0,0,0,0,2,2,3,2,2,2,3,2,2,2,3,2};
@@ -305,14 +305,14 @@ static void mc_luma_##name( pixel *dst,    int i_dst_stride,\
 
 MC_LUMA(mmxext,mmxext,mmx)
 MC_LUMA(sse2,sse2,sse2)
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if ARCH_X86
 MC_LUMA(cache32_mmxext,cache32_mmxext,mmx)
 MC_LUMA(cache64_mmxext,cache64_mmxext,mmx)
 #endif
 MC_LUMA(cache64_sse2,cache64_sse2,sse2)
 MC_LUMA(cache64_ssse3,cache64_ssse3,sse2)
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 #define GET_REF(name)\
 static pixel *get_ref_##name( pixel *dst,   int *i_dst_stride,\
@@ -347,7 +347,7 @@ static pixel *get_ref_##name( pixel *dst,   int *i_dst_stride,\
 
 GET_REF(mmxext)
 GET_REF(sse2)
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if ARCH_X86
 GET_REF(cache32_mmxext)
 GET_REF(cache64_mmxext)
@@ -355,7 +355,7 @@ GET_REF(cache64_mmxext)
 GET_REF(sse2_misalign)
 GET_REF(cache64_sse2)
 GET_REF(cache64_ssse3)
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 #define HPEL(align, cpu, cpuv, cpuc, cpuh)\
 void x264_hpel_filter_v_##cpuv( pixel *dst, pixel *src, int16_t *buf, int stride, int width);\
@@ -384,9 +384,9 @@ static void x264_hpel_filter_##cpu( pixel *dsth, pixel *dstv, pixel *dstc, pixel
 }
 
 HPEL(8, mmxext, mmxext, mmxext, mmxext)
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
 HPEL(16, sse2, sse2, sse2, sse2 )
-#else // !X264_HIGH_BIT_DEPTH
+#else // !HIGH_BIT_DEPTH
 HPEL(16, sse2_amd, mmxext, mmxext, sse2)
 #if ARCH_X86_64
 void x264_hpel_filter_sse2( uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, uint8_t *src, int stride, int width, int height, int16_t *buf );
@@ -433,7 +433,7 @@ static void x264_plane_copy_interleave_##cpu( uint8_t *dst, int i_dst,\
 
 PLANE_INTERLEAVE(mmxext)
 PLANE_INTERLEAVE(sse2)
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 
 void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf )
 {
@@ -458,7 +458,7 @@ void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf )
     pf->hpel_filter = x264_hpel_filter_mmxext;
     pf->weight = x264_mc_weight_wtab_mmxext;
 
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
     if( !(cpu&X264_CPU_SSE2) )
         return;
 
@@ -489,7 +489,7 @@ void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf )
 
     if( (cpu&X264_CPU_SHUFFLE_IS_FAST) && !(cpu&X264_CPU_SLOW_ATOM) )
         pf->integral_init4v = x264_integral_init4v_ssse3;
-#else // !X264_HIGH_BIT_DEPTH
+#else // !HIGH_BIT_DEPTH
     pf->offsetadd = x264_mc_offsetadd_wtab_mmxext;
     pf->offsetsub = x264_mc_offsetsub_wtab_mmxext;
     pf->weight_cache = x264_weight_cache_mmxext;
@@ -627,5 +627,5 @@ void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf )
 
     pf->integral_init4h = x264_integral_init4h_sse4;
     pf->integral_init8h = x264_integral_init8h_sse4;
-#endif // X264_HIGH_BIT_DEPTH
+#endif // HIGH_BIT_DEPTH
 }

diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm
index 420b04b36611e0d8db74552554a23e5afd0f7079..f2bef19fb0c7a0d3caa044b15620221e97dad565 100644 (file)
--- a/common/x86/pixel-a.asm
+++ b/common/x86/pixel-a.asm
@@ -60,7 +60,7 @@ cextern hsub_mul
 ; SSD
 ;=============================================================================
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; int pixel_ssd_MxN( uint16_t *, int, uint16_t *, int )
 ;-----------------------------------------------------------------------------
@@ -142,9 +142,9 @@ SSD_ONE     8,  8, sse2
 SSD_ONE     8, 16, sse2
 SSD_ONE    16,  8, sse2
 SSD_ONE    16, 16, sse2
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %macro SSD_LOAD_FULL 5
     mova      m1, [t0+%1]
     mova      m2, [t2+%2]
@@ -370,7 +370,7 @@ INIT_MMX
 SSD  4,  4, ssse3
 SSD  4,  8, ssse3
 %assign function_align 16
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 ;-----------------------------------------------------------------------------
 ; void pixel_ssd_nv12_core( uint16_t *pixuv1, int stride1, uint16_t *pixuv2, int stride2,
@@ -384,7 +384,7 @@ SSD  4,  8, ssse3
 ; For 10-bit MMX this means width >= 16416 and for XMM >= 32832. At sane
 ; distortion levels it will take much more than that though.
 ;-----------------------------------------------------------------------------
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro SSD_NV12 1-2 0
 cglobal pixel_ssd_nv12_core_%1, 6,7,7*(mmsize/16)
     shl        r4d, 2
@@ -443,9 +443,9 @@ cglobal pixel_ssd_nv12_core_%1, 6,7,7*(mmsize/16)
     movq      [r4], m5
     RET
 %endmacro ; SSD_NV12
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void pixel_ssd_nv12_core( uint8_t *pixuv1, int stride1, uint8_t *pixuv2, int stride2,
 ;                           int width, int height, uint64_t *ssd_u, uint64_t *ssd_v )
@@ -509,25 +509,25 @@ SSD_NV12 sse2
 %macro VAR_START 1
     pxor  m5, m5    ; sum
     pxor  m6, m6    ; sum squared
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %if %1
     mova  m7, [pw_00ff]
 %else
     pxor  m7, m7    ; zero
 %endif
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 %endmacro
 
 %macro VAR_END 2
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %if mmsize == 8 && %1*%2 == 256
     HADDUW  m5, m2
 %else
     HADDW   m5, m2
 %endif
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     HADDW   m5, m2
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     movd   eax, m5
     HADDD   m6, m1
     movd   edx, m6
@@ -556,28 +556,28 @@ SSD_NV12 sse2
 %macro VAR_2ROW 2
     mov      r2d, %2
 .loop:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mova      m0, [r0]
     mova      m1, [r0+mmsize]
     mova      m3, [r0+%1]
     mova      m4, [r0+%1+mmsize]
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     mova      m0, [r0]
     mova      m1, m0
     mova      m3, [r0+%1]
     mova      m4, m3
     punpcklbw m0, m7
     punpckhbw m1, m7
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %ifidn %1, r1
     lea       r0, [r0+%1*2]
 %else
     add       r0, r1
 %endif
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
     punpcklbw m3, m7
     punpckhbw m4, m7
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
     dec r2d
     VAR_CORE
     jg .loop
@@ -600,7 +600,7 @@ cglobal pixel_var_8x8_mmxext, 2,3
     VAR_END 8, 8
 
 INIT_XMM
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 cglobal pixel_var_16x16_sse2, 2,3,8
     FIX_STRIDES r1
     VAR_START 0
@@ -622,9 +622,9 @@ cglobal pixel_var_8x8_sse2, 2,3,8
     mova      m4, [r0+r2*2]
     VAR_CORE
     VAR_END 8, 8
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 cglobal pixel_var_16x16_sse2, 2,3,8
     VAR_START 1
     mov      r2d, 8
@@ -653,7 +653,7 @@ cglobal pixel_var_8x8_sse2, 2,4,8
     dec r2d
     jg .loop
     VAR_END 8, 8
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 %macro VAR2_END 0
     HADDW   m5, m7
@@ -676,12 +676,12 @@ cglobal pixel_var2_8x8_mmxext, 5,6
     VAR_START 0
     mov      r5d, 8
 .loop:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mova      m0, [r0]
     mova      m1, [r0+mmsize]
     psubw     m0, [r2]
     psubw     m1, [r2+mmsize]
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movq      m0, [r0]
     movq      m1, m0
     movq      m2, [r2]
@@ -692,7 +692,7 @@ cglobal pixel_var2_8x8_mmxext, 5,6
     punpckhbw m3, m7
     psubw     m0, m2
     psubw     m1, m3
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     paddw     m5, m0
     paddw     m5, m1
     pmaddwd   m0, m0
@@ -711,18 +711,18 @@ cglobal pixel_var2_8x8_sse2, 5,6,8
     VAR_START 1
     mov      r5d, 4
 .loop:
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mova      m0, [r0]
     mova      m1, [r0+r1*2]
     mova      m2, [r2]
     mova      m3, [r2+r3*2]
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movq      m1, [r0]
     movhps    m1, [r0+r1]
     movq      m3, [r2]
     movhps    m3, [r2+r3]
     DEINTB    0, 1, 2, 3, 7
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     psubw     m0, m2
     psubw     m1, m3
     paddw     m5, m0
@@ -738,7 +738,7 @@ cglobal pixel_var2_8x8_sse2, 5,6,8
     VAR2_END
     RET
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 cglobal pixel_var2_8x8_ssse3, 5,6,8
     pxor      m5, m5    ; sum
     pxor      m6, m6    ; sum squared
@@ -781,7 +781,7 @@ cglobal pixel_var2_8x8_ssse3, 5,6,8
     jg .loop
     VAR2_END
     RET
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 ;=============================================================================
 ; SATD
@@ -942,17 +942,17 @@ cglobal pixel_var2_8x8_ssse3, 5,6,8
 %endmacro
 
 %macro SATD_END_MMX 0
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     HADDUW      m0, m1
     movd       eax, m0
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     pshufw      m1, m0, 01001110b
     paddw       m0, m1
     pshufw      m1, m0, 10110001b
     paddw       m0, m1
     movd       eax, m0
     and        eax, 0xffff
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     RET
 %endmacro
 
@@ -986,7 +986,7 @@ pixel_satd_8x4_internal_mmxext:
     paddw        m0, m1
     ret
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro SATD_MxN_MMX 3
 cglobal pixel_satd_%1x%2_mmxext, 4,7
     SATD_START_MMX
@@ -1012,9 +1012,9 @@ cglobal pixel_satd_%1x%2_mmxext, 4,7
 SATD_MxN_MMX 16, 16, 4
 SATD_MxN_MMX 16,  8, 4
 SATD_MxN_MMX  8, 16, 8
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 cglobal pixel_satd_16x16_mmxext, 4,6
     SATD_START_MMX
     pxor   m0, m0
@@ -1045,7 +1045,7 @@ cglobal pixel_satd_8x16_mmxext, 4,6
     lea  r2, [r2+4*r3]
     call pixel_satd_8x8_internal_mmxext
     SATD_END_MMX
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 cglobal pixel_satd_8x8_mmxext, 4,6
     SATD_START_MMX
@@ -1247,16 +1247,16 @@ cglobal pixel_satd_8x4_%1, 4,6,8
     %define lh m0
     %define rh [esp+48]
 %endif
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     HADDUW  m0, m1
     paddd   lh, rh
 %else
     paddusw lh, rh
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %endmacro
 
 %macro SA8D 1
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     %define vertical 1
 %elifidn %1, sse2 ; sse2 doesn't seem to like the horizontal way of doing things
     %define vertical 1
@@ -1303,11 +1303,11 @@ cglobal pixel_sa8d_8x8_%1, 4,6,12
     mova m7, [hmul_8p]
 %endif
     call pixel_sa8d_8x8_internal_%1
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     HADDUW m0, m1
 %else
     HADDW m0, m1
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     movd eax, m0
     add eax, 1
     shr eax, 1
@@ -1323,7 +1323,7 @@ cglobal pixel_sa8d_16x16_%1, 4,6,12
     call pixel_sa8d_8x8_internal_%1 ; pix[0]
     add  r2, 8*SIZEOF_PIXEL
     add  r0, 8*SIZEOF_PIXEL
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     HADDUW m0, m1
 %endif
     mova m10, m0
@@ -1338,7 +1338,7 @@ cglobal pixel_sa8d_16x16_%1, 4,6,12
     call pixel_sa8d_8x8_internal_%1 ; pix[8*stride]
     SA8D_INTER
     SWAP m0, m10
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
     HADDUW m0, m1
 %endif
     movd eax, m0
@@ -1406,11 +1406,11 @@ cglobal pixel_sa8d_8x8_%1, 4,7
     lea    r4, [3*r1]
     lea    r5, [3*r3]
     call pixel_sa8d_8x8_internal_%1
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     HADDUW m0, m1
 %else
     HADDW  m0, m1
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     movd  eax, m0
     add   eax, 1
     shr   eax, 1
@@ -1429,7 +1429,7 @@ cglobal pixel_sa8d_16x16_%1, 4,7
     lea  r0, [r0+4*r1]
     lea  r2, [r2+4*r3]
 %endif
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     HADDUW m0, m1
 %endif
     mova [esp+48], m0
@@ -1450,9 +1450,9 @@ cglobal pixel_sa8d_16x16_%1, 4,7
 %endif
     mova [esp+64-mmsize], m0
     call pixel_sa8d_8x8_internal_%1
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     SA8D_INTER
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     paddusw m0, [esp+64-mmsize]
 %if mmsize == 16
     HADDUW m0, m1
@@ -1470,7 +1470,7 @@ cglobal pixel_sa8d_16x16_%1, 4,7
     paddd m0, m2
     HADDD m0, m1
 %endif
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     movd eax, m0
     add  eax, 1
     shr  eax, 1
@@ -1957,12 +1957,12 @@ cglobal intra_satd_x3_8x8c_%1, 0,6
 ; in:  r0=pix, r1=stride, r2=stride*3, r3=tmp, m6=mask_ac4, m7=0
 ; out: [tmp]=hadamard4, m0=satd
 cglobal hadamard_ac_4x4_mmxext
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mova      m0, [r0]
     mova      m1, [r0+r1]
     mova      m2, [r0+r1*2]
     mova      m3, [r0+r2]
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movh      m0, [r0]
     movh      m1, [r0+r1]
     movh      m2, [r0+r1*2]
@@ -1971,7 +1971,7 @@ cglobal hadamard_ac_4x4_mmxext
     punpcklbw m1, m7
     punpcklbw m2, m7
     punpcklbw m3, m7
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     HADAMARD4_2D 0, 1, 2, 3, 4
     mova [r3],    m0
     mova [r3+8],  m1
@@ -1998,40 +1998,40 @@ cglobal hadamard_ac_2x2max_mmxext
     ABS4 m0, m2, m1, m3, m4, m5
     HADAMARD 0, max, 0, 2, 4, 5
     HADAMARD 0, max, 1, 3, 4, 5
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     pmaddwd   m0, m7
     pmaddwd   m1, m7
     paddd     m6, m0
     paddd     m6, m1
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     paddw     m7, m0
     paddw     m7, m1
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     SAVE_MM_PERMUTATION hadamard_ac_2x2max_mmxext
     ret
 
 %macro AC_PREP 2
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     pmaddwd %1, %2
 %endif
 %endmacro
 
 %macro AC_PADD 3
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     AC_PREP %2, %3
     paddd   %1, %2
 %else
     paddw   %1, %2
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %endmacro
 
 cglobal hadamard_ac_8x8_mmxext
     mova      m6, [mask_ac4]
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mova      m7, [pw_1]
 %else
     pxor      m7, m7
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     call hadamard_ac_4x4_mmxext
     add       r0, 4*SIZEOF_PIXEL
     add       r3, 32
@@ -2049,7 +2049,7 @@ cglobal hadamard_ac_8x8_mmxext
     AC_PADD   m5, m0, m7
     sub       r3, 40
     mova [rsp+gprsize+8], m5 ; save satd
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     pxor      m6, m6
 %endif
 %rep 3
@@ -2063,7 +2063,7 @@ cglobal hadamard_ac_8x8_mmxext
     HADAMARD 0, sumsub, 0, 2, 4, 5
     ABS4 m1, m3, m0, m2, m4, m5
     HADAMARD 0, max, 1, 3, 4, 5
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     pand      m0, [mask_ac4]
     pmaddwd   m1, m7
     pmaddwd   m0, m7
@@ -2073,13 +2073,13 @@ cglobal hadamard_ac_8x8_mmxext
     paddd     m6, m6
     paddd     m0, m6
     SWAP      m0, m6
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     pand      m6, m0
     paddw     m7, m1
     paddw     m6, m2
     paddw     m7, m7
     paddw     m6, m7
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     mova [rsp+gprsize], m6 ; save sa8d
     SWAP      m0, m6
     SAVE_MM_PERMUTATION hadamard_ac_8x8_mmxext
@@ -2087,7 +2087,7 @@ cglobal hadamard_ac_8x8_mmxext
 
 %macro HADAMARD_AC_WXH_SUM_MMXEXT 2
     mova    m1, [rsp+1*mmsize]
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %if %1*%2 >= 128
     paddd   m0, [rsp+2*mmsize]
     paddd   m1, [rsp+3*mmsize]
@@ -2104,7 +2104,7 @@ cglobal hadamard_ac_8x8_mmxext
     HADDD   m0, m2
     psrld   m1, 1
     HADDD   m1, m3
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 %if %1*%2 >= 128
     paddusw m0, [rsp+2*mmsize]
     paddusw m1, [rsp+3*mmsize]
@@ -2126,7 +2126,7 @@ cglobal hadamard_ac_8x8_mmxext
 %endif
     psrlw   m1, 1
     HADDW   m1, m3
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %endmacro
 
 %macro HADAMARD_AC_WXH_MMX 2
@@ -2174,7 +2174,7 @@ HADAMARD_AC_WXH_MMX 16,  8
 HADAMARD_AC_WXH_MMX  8,  8
 
 %macro LOAD_INC_8x4W_SSE2 5
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     movu      m%1, [r0]
     movu      m%2, [r0+r1]
     movu      m%3, [r0+r1*2]
@@ -2182,7 +2182,7 @@ HADAMARD_AC_WXH_MMX  8,  8
 %ifidn %1, 0
     lea       r0, [r0+r1*4]
 %endif
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
     movh      m%1, [r0]
     movh      m%2, [r0+r1]
     movh      m%3, [r0+r1*2]
@@ -2194,7 +2194,7 @@ HADAMARD_AC_WXH_MMX  8,  8
     punpcklbw m%2, m%5
     punpcklbw m%3, m%5
     punpcklbw m%4, m%5
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %endmacro
 
 %macro LOAD_INC_8x4W_SSSE3 5
@@ -2219,7 +2219,7 @@ cglobal hadamard_ac_8x8_%1
     %define spill1 [rsp+gprsize+16]
     %define spill2 [rsp+gprsize+32]
 %endif
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     %define vertical 1
 %elifidn %1, sse2
     %define vertical 1
@@ -2307,11 +2307,11 @@ cglobal hadamard_ac_8x8_%1
     AC_PREP   m2, [pw_1]
     AC_PADD   m2, m3, [pw_1]
     AC_PADD   m2, m1, [pw_1]
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     paddd     m2, m2
 %else
     paddw     m2, m2
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
     ABS1      m4, m7
     pand      m0, [mask_ac8]
     ABS1      m0, m7
@@ -2330,7 +2330,7 @@ HADAMARD_AC_WXH_SSE2  8,  8, %1
 
 %macro HADAMARD_AC_WXH_SUM_SSE2 2
     mova    m1, [rsp+2*mmsize]
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %if %1*%2 >= 128
     paddd   m0, [rsp+3*mmsize]
     paddd   m1, [rsp+4*mmsize]
@@ -2344,7 +2344,7 @@ HADAMARD_AC_WXH_SSE2  8,  8, %1
 %endif
     HADDD   m0, m2
     HADDD   m1, m3
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 %if %1*%2 >= 128
     paddusw m0, [rsp+3*mmsize]
     paddusw m1, [rsp+4*mmsize]
@@ -2358,7 +2358,7 @@ HADAMARD_AC_WXH_SSE2  8,  8, %1
 %endif
     HADDUW  m0, m2
     HADDW   m1, m3
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %endmacro
 
 ; struct { int satd, int sa8d; } pixel_hadamard_ac_16x16( uint8_t *pix, int stride )
@@ -2423,7 +2423,7 @@ INIT_XMM
 SA8D sse2
 SATDS_SSE2 sse2
 INTRA_SA8D_SSE2 sse2
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 INTRA_SATDS_MMX mmxext
 %endif
 HADAMARD_AC_SSE2 sse2
@@ -2434,7 +2434,7 @@ HADAMARD_AC_SSE2 sse2
 %define DIFFOP DIFF_SUMSUB_SSSE3
 %define JDUP JDUP_CONROE
 %define LOAD_DUP_4x8P LOAD_DUP_4x8P_CONROE
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %define LOAD_INC_8x4W LOAD_INC_8x4W_SSSE3
 %define LOAD_SUMSUB_8x4P LOAD_SUMSUB_8x4P_SSSE3
 %define LOAD_SUMSUB_16P  LOAD_SUMSUB_16P_SSSE3

diff --git a/common/x86/predict-c.c b/common/x86/predict-c.c
index e32ac256b0255039fb2e693a24141d0f48e29ffd..f8c96d9284fb610e997dfbc6e3070edc5e464269 100644 (file)
--- a/common/x86/predict-c.c
+++ b/common/x86/predict-c.c
@@ -79,7 +79,7 @@
  void x264_predict_16x16_v_sse2( uint8_t *src );
  void x264_predict_16x16_p_core_sse2( uint8_t *src, int i00, int b, int c );
 
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 ALIGNED_8( static const int8_t pb_12345678[8] ) = {1,2,3,4,5,6,7,8};
 ALIGNED_8( static const int8_t pb_m87654321[8] ) = {-8,-7,-6,-5,-4,-3,-2,-1};
 ALIGNED_8( static const int8_t pb_m32101234[8] ) = {-3,-2,-1,0,1,2,3,4};
@@ -369,7 +369,7 @@ INTRA_SA8D_X3(ssse3)
 #else
 INTRA_SA8D_X3(mmxext)
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 
 /****************************************************************************
  * Exported functions:
@@ -378,7 +378,7 @@ void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] )
 {
     if( !(cpu&X264_CPU_MMX) )
         return;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_16x16_V]       = x264_predict_16x16_v_mmx;
     if( !(cpu&X264_CPU_MMXEXT) )
         return;
@@ -404,14 +404,14 @@ void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] )
 #ifdef __GNUC__
     pf[I_PRED_16x16_P]       = x264_predict_16x16_p_ssse3;
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_8x8c_init_mmx( int cpu, x264_predict_t pf[7] )
 {
     if( !(cpu&X264_CPU_MMX) )
         return;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
 #if ARCH_X86_64
     pf[I_PRED_CHROMA_DC_LEFT] = x264_predict_8x8c_dc_left;
 #endif
@@ -433,14 +433,14 @@ void x264_predict_8x8c_init_mmx( int cpu, x264_predict_t pf[7] )
 #ifdef __GNUC__
     pf[I_PRED_CHROMA_P]       = x264_predict_8x8c_p_ssse3;
 #endif
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_8x8_filter_t *predict_8x8_filter )
 {
     if( !(cpu&X264_CPU_MMXEXT) )
         return;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_8x8_V]      = x264_predict_8x8_v_mmxext;
     pf[I_PRED_8x8_H]      = x264_predict_8x8_h_mmxext;
     pf[I_PRED_8x8_DC]     = x264_predict_8x8_dc_mmxext;
@@ -467,14 +467,14 @@ void x264_predict_8x8_init_mmx( int cpu, x264_predict8x8_t pf[12], x264_predict_
     pf[I_PRED_8x8_HD]   = x264_predict_8x8_hd_ssse3;
     pf[I_PRED_8x8_HU]   = x264_predict_8x8_hu_ssse3;
     *predict_8x8_filter = x264_predict_8x8_filter_ssse3;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }
 
 void x264_predict_4x4_init_mmx( int cpu, x264_predict_t pf[12] )
 {
     if( !(cpu&X264_CPU_MMXEXT) )
         return;
-#if !X264_HIGH_BIT_DEPTH
+#if !HIGH_BIT_DEPTH
     pf[I_PRED_4x4_VR]  = x264_predict_4x4_vr_mmxext;
     pf[I_PRED_4x4_DDL] = x264_predict_4x4_ddl_mmxext;
     pf[I_PRED_4x4_VL]  = x264_predict_4x4_vl_mmxext;
@@ -487,5 +487,5 @@ void x264_predict_4x4_init_mmx( int cpu, x264_predict_t pf[12] )
     pf[I_PRED_4x4_DDR] = x264_predict_4x4_ddr_ssse3;
     pf[I_PRED_4x4_VR]  = x264_predict_4x4_vr_ssse3;
     pf[I_PRED_4x4_HD]  = x264_predict_4x4_hd_ssse3;
-#endif // !X264_HIGH_BIT_DEPTH
+#endif // !HIGH_BIT_DEPTH
 }

diff --git a/common/x86/quant-a.asm b/common/x86/quant-a.asm
index 9c2cd1e39b9e274dc835bb5697d86fd9b16613a5..8244e4ed710f4fa929a6b1c8b7e397cf002ccd6f 100644 (file)
--- a/common/x86/quant-a.asm
+++ b/common/x86/quant-a.asm
@@ -79,13 +79,13 @@ cextern pb_01
 %macro QUANT_DC_START_MMX 0
     movd       m6, r1m     ; mf
     movd       m7, r2m     ; bias
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     SPLATD     m6, m6
     SPLATD     m7, m7
 %else
     SPLATW     m6, m6
     SPLATW     m7, m7
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 %endmacro
 
 %macro QUANT_DC_START_SSSE3 0
@@ -167,7 +167,7 @@ cextern pb_01
     setne     al
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro QUANT_ONE_DC_MMX 4
     mova        m0, [%1]
     PABSD       m1, m0
@@ -354,9 +354,9 @@ QUANT_AC 8, 8, sse4
 %undef QUANT_TWO_AC
 %undef QUANT_ONE_DC
 %undef QUANT_TWO_DC
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
-%ifndef X264_HIGH_BIT_DEPTH
+%ifndef HIGH_BIT_DEPTH
 %macro QUANT_ONE 4
 ;;; %1      (m64)       dct[y][x]
 ;;; %2      (m64/mmx)   mf[y][x] or mf[0][0] (as uint16_t)
@@ -461,7 +461,7 @@ INIT_XMM
 QUANT_DC quant_4x4_dc_sse4, 2, 8
 QUANT_AC quant_4x4_sse4, 2
 QUANT_AC quant_8x8_sse4, 8
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 
 
@@ -694,7 +694,7 @@ DEQUANT_DC mmxext
 INIT_XMM
 DEQUANT_DC sse2
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 ;-----------------------------------------------------------------------------
 ; void denoise_dct( int32_t *dct, uint32_t *sum, uint32_t *offset, int size )
 ;-----------------------------------------------------------------------------
@@ -743,7 +743,7 @@ DENOISE_DCT sse2, 8
 %define PSIGND PSIGND_SSSE3
 DENOISE_DCT ssse3, 8
 
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 
 ;-----------------------------------------------------------------------------
 ; void denoise_dct( int16_t *dct, uint32_t *sum, uint16_t *offset, int size )
@@ -797,14 +797,14 @@ DENOISE_DCT sse2, 7
 %define PSIGNW PSIGNW_SSSE3
 DENOISE_DCT ssse3, 7
 
-%endif ; !X264_HIGH_BIT_DEPTH
+%endif ; !HIGH_BIT_DEPTH
 
 ;-----------------------------------------------------------------------------
 ; int decimate_score( dctcoef *dct )
 ;-----------------------------------------------------------------------------
 
 %macro DECIMATE_MASK_SSE2 7
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     movdqa   xmm0, [%3+ 0]
     movdqa   xmm1, [%3+32]
     packssdw xmm0, [%3+16]
@@ -834,7 +834,7 @@ DENOISE_DCT ssse3, 7
 %endmacro
 
 %macro DECIMATE_MASK_MMX 7
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     movq      mm0, [%3+ 0]
     movq      mm1, [%3+16]
     movq      mm2, [%3+32]
@@ -1063,7 +1063,7 @@ DECIMATE8x8 ssse3, 1
     xor %1, %3
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro LAST_MASK4_MMX 2-3
     movq     mm0, [%2]
     packssdw mm0, [%2+8]
@@ -1100,7 +1100,7 @@ DECIMATE8x8 ssse3, 1
     shl       %3, 8
     or        %1, %3
 %endmacro
-%else ; !X264_HIGH_BIT_DEPTH
+%else ; !HIGH_BIT_DEPTH
 %macro LAST_MASK4_MMX 2-3
     movq     mm0, [%2]
     packsswb mm0, mm0
@@ -1153,7 +1153,7 @@ cglobal coeff_last4_%1, 0,3
 COEFF_LAST4 mmxext
 %define LAST LAST_SSE4A
 COEFF_LAST4 mmxext_lzcnt
-%endif ; X264_HIGH_BIT_DEPTH
+%endif ; HIGH_BIT_DEPTH
 
 %macro COEFF_LAST 1
 cglobal coeff_last15_%1, 1,3
@@ -1261,7 +1261,7 @@ cglobal coeff_level_run%2_%1,0,7
     mov   [t1], t4d
 .loop:
     LZCOUNT t3d, t5d, 0x1f
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mov    t2d, [t0+t4*4]
     mov   [t1+t6  +4+16*4], t3b
     mov   [t1+t6*4+ 4], t2d

diff --git a/common/x86/x86util.asm b/common/x86/x86util.asm
index afa87045cbd30dfd059e3ace41de6e0690fc35a9..9acaa3d6c89c016e12a297a66cc8034caf126c58 100644 (file)
--- a/common/x86/x86util.asm
+++ b/common/x86/x86util.asm
@@ -29,7 +29,7 @@
 
 %assign SIZEOF_PIXEL 1
 %assign SIZEOF_DCTCOEF 2
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     %assign SIZEOF_PIXEL 2
     %assign SIZEOF_DCTCOEF 4
 %endif
@@ -491,7 +491,7 @@
 
 
 %macro LOAD_DIFF 5
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
     mova       %1, %4
     psubw      %1, %5
 %elifidn %3, none
@@ -580,7 +580,7 @@
     packuswb   %2, %1
 %endmacro
 
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %macro STORE_DIFF 5
     punpcklwd  %2, %1
     punpckhwd  %3, %1
@@ -632,7 +632,7 @@
 %endmacro
 
 %macro FIX_STRIDES 1-*
-%ifdef X264_HIGH_BIT_DEPTH
+%ifdef HIGH_BIT_DEPTH
 %rep %0
     add %1, %1
     %rotate 1

diff --git a/configure b/configure
index a15e84ebd27bb0851bbf9ef6e048ec6b429287fd..2f3815466c585317c421e9370c451514ad3ab846 100755 (executable)
--- a/configure
+++ b/configure
@@ -723,8 +723,8 @@ if cc_check '' -Wshadow ; then
 fi
 
 if [ "$bit_depth" -gt "8" ]; then
-    define X264_HIGH_BIT_DEPTH
-    ASFLAGS="$ASFLAGS -DX264_HIGH_BIT_DEPTH"
+    define HIGH_BIT_DEPTH
+    ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH"
 fi
 
 define BIT_DEPTH $bit_depth

diff --git a/encoder/encoder.c b/encoder/encoder.c
index a433c22ca1195c70b7641a3632b45855f5a76d38..83a2b115b4c7ef7561b507081fd816bb14cc695b 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2771,7 +2771,7 @@ static int x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
         x264_log( h, X264_LOG_WARNING, "invalid DTS: PTS is less than DTS\n" );
 
     pic_out->img.i_csp = X264_CSP_NV12;
-#if X264_HIGH_BIT_DEPTH
+#if HIGH_BIT_DEPTH
     pic_out->img.i_csp |= X264_CSP_HIGH_DEPTH;
 #endif
     pic_out->img.i_plane = h->fdec->i_plane;