Commit b00bcafe authored by Anton Mitrofanov's avatar Anton Mitrofanov

Cosmetics

parent 7c6b3ad5
......@@ -461,4 +461,3 @@ static ALWAYS_INLINE int x264_mb_transform_8x8_allowed( x264_t *h )
}
#endif
......@@ -23,8 +23,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_MIPS_SAD_H
#define X264_MIPS_SAD_H
#ifndef X264_MIPS_PIXEL_H
#define X264_MIPS_PIXEL_H
#define x264_pixel_sad_16x16_msa x264_template(pixel_sad_16x16_msa)
int32_t x264_pixel_sad_16x16_msa( uint8_t *p_src, intptr_t i_src_stride,
......
......@@ -25,8 +25,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_I386_DCT_H
#define X264_I386_DCT_H
#ifndef X264_X86_DCT_H
#define X264_X86_DCT_H
#define x264_sub4x4_dct_mmx x264_template(sub4x4_dct_mmx)
void x264_sub4x4_dct_mmx ( dctcoef dct [16], pixel *pix1, pixel *pix2 );
......
......@@ -78,6 +78,7 @@ DECL_SUF( x264_pixel_avg_4x16, ( pixel *, intptr_t, pixel *, intptr_t, pixel *,
DECL_SUF( x264_pixel_avg_4x8, ( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t, int ))
DECL_SUF( x264_pixel_avg_4x4, ( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t, int ))
DECL_SUF( x264_pixel_avg_4x2, ( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t, int ))
#undef DECL_SUF
#define x264_mc_weight_w12_mmx2 x264_template(mc_weight_w12_mmx2)
#define x264_mc_weight_w12_sse2 x264_template(mc_weight_w12_sse2)
......@@ -139,7 +140,7 @@ MC_WEIGHT( 20, ssse3 )
MC_WEIGHT( 8, avx2 )
MC_WEIGHT( 16, avx2 )
MC_WEIGHT( 20, avx2 )
#undef MC_OFFSET
#undef MC_WEIGHT_OFFSET
#undef MC_WEIGHT
#define x264_mc_copy_w4_mmx x264_template(mc_copy_w4_mmx)
......@@ -336,6 +337,7 @@ MC_CHROMA(ssse3)
MC_CHROMA(cache64_ssse3)
MC_CHROMA(avx)
MC_CHROMA(avx2)
#undef MC_CHROMA
#define x264_frame_init_lowres_core_avx x264_template(frame_init_lowres_core_avx)
#define x264_frame_init_lowres_core_avx2 x264_template(frame_init_lowres_core_avx2)
......@@ -354,6 +356,7 @@ LOWRES(ssse3)
LOWRES(avx)
LOWRES(xop)
LOWRES(avx2)
#undef LOWRES
#define x264_pixel_avg2_w10_mmx2 x264_template(pixel_avg2_w10_mmx2)
#define x264_pixel_avg2_w10_sse2 x264_template(pixel_avg2_w10_sse2)
......@@ -394,6 +397,8 @@ PIXEL_AVG_WALL(cache64_sse2)
PIXEL_AVG_WALL(sse2)
PIXEL_AVG_WALL(cache64_ssse3)
PIXEL_AVG_WALL(avx2)
#undef PIXEL_AVG_W
#undef PIXEL_AVG_WALL
#define PIXEL_AVG_WTAB(instr, name1, name2, name3, name4, name5)\
static void (* const pixel_avg_wtab_##instr[6])( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t ) =\
......
......@@ -24,8 +24,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_I386_MC_H
#define X264_I386_MC_H
#ifndef X264_X86_MC_H
#define X264_X86_MC_H
#define x264_mc_init_mmx x264_template(mc_init_mmx)
void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf );
......
......@@ -25,8 +25,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_I386_PIXEL_H
#define X264_I386_PIXEL_H
#ifndef X264_X86_PIXEL_H
#define X264_X86_PIXEL_H
#define x264_pixel_ads1_avx x264_template(pixel_ads1_avx)
#define x264_pixel_ads1_avx2 x264_template(pixel_ads1_avx2)
......
......@@ -24,8 +24,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_I386_PREDICT_H
#define X264_I386_PREDICT_H
#ifndef X264_X86_PREDICT_H
#define X264_X86_PREDICT_H
#define x264_predict_16x16_init_mmx x264_template(predict_16x16_init_mmx)
void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] );
......
......@@ -25,8 +25,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_I386_QUANT_H
#define X264_I386_QUANT_H
#ifndef X264_X86_QUANT_H
#define X264_X86_QUANT_H
#define x264_quant_2x2_dc_mmx2 x264_template(quant_2x2_dc_mmx2)
int x264_quant_2x2_dc_mmx2( dctcoef dct[4], int mf, int bias );
......
......@@ -24,8 +24,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_ANALYSE_H
#define X264_ANALYSE_H
#ifndef X264_ENCODER_ANALYSE_H
#define X264_ENCODER_ANALYSE_H
#define x264_analyse_init_costs x264_template(analyse_init_costs)
int x264_analyse_init_costs( x264_t *h );
......
......@@ -213,4 +213,3 @@ static ALWAYS_INLINE void x264_mb_encode_i8x8( x264_t *h, int p, int idx, int i_
}
#endif
......@@ -24,8 +24,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_ME_H
#define X264_ME_H
#ifndef X264_ENCODER_ME_H
#define X264_ENCODER_ME_H
#define COST_MAX (1<<28)
#define COST_MAX64 (1ULL<<60)
......
......@@ -24,8 +24,8 @@
* For more information, contact us at licensing@x264.com.
*****************************************************************************/
#ifndef X264_RATECONTROL_H
#define X264_RATECONTROL_H
#ifndef X264_ENCODER_RATECONTROL_H
#define X264_ENCODER_RATECONTROL_H
/* Completely arbitrary. Ratecontrol lowers relative quality at higher framerates
* and the reverse at lower framerates; this serves as the center of the curve.
......@@ -85,4 +85,3 @@ void x264_threads_merge_ratecontrol( x264_t *h );
void x264_hrd_fullness( x264_t *h );
#endif
......@@ -31,7 +31,7 @@
// Indexed by pic_struct values
static const uint8_t num_clock_ts[10] = { 0, 1, 1, 1, 2, 2, 3, 3, 2, 3 };
const static uint8_t avcintra_uuid[] = {0xF7, 0x49, 0x3E, 0xB3, 0xD4, 0x00, 0x47, 0x96, 0x86, 0x86, 0xC9, 0x70, 0x7B, 0x64, 0x37, 0x2A};
static const uint8_t avcintra_uuid[] = {0xF7, 0x49, 0x3E, 0xB3, 0xD4, 0x00, 0x47, 0x96, 0x86, 0x86, 0xC9, 0x70, 0x7B, 0x64, 0x37, 0x2A};
static void transpose( uint8_t *buf, int w )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment