X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=encoder%2Fmacroblock.c;h=d095b7c2fae793ecace0f54bd7beda595343496f;hb=1d56ef44748dd3ae36751f27263ccefc22d5f543;hp=0888d5d7e1abc86953b978197fc7414deb829a5b;hpb=2f95856be50ec7c744ad4d65408846d3dce75491;p=x264 diff --git a/encoder/macroblock.c b/encoder/macroblock.c index 0888d5d7..d095b7c2 100644 --- a/encoder/macroblock.c +++ b/encoder/macroblock.c @@ -21,71 +21,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#include -#include - #include "common/common.h" #include "macroblock.h" -/* def_quant4_mf only for probe_skip; actual encoding uses matrices from set.c */ -/* FIXME this seems to make better decisions with cqm=jvt, but could screw up - * with general custom matrices. */ -static const int def_quant4_mf[6][4][4] = -{ - { { 13107, 8066, 13107, 8066 }, { 8066, 5243, 8066, 5243 }, - { 13107, 8066, 13107, 8066 }, { 8066, 5243, 8066, 5243 } }, - { { 11916, 7490, 11916, 7490 }, { 7490, 4660, 7490, 4660 }, - { 11916, 7490, 11916, 7490 }, { 7490, 4660, 7490, 4660 } }, - { { 10082, 6554, 10082, 6554 }, { 6554, 4194, 6554, 4194 }, - { 10082, 6554, 10082, 6554 }, { 6554, 4194, 6554, 4194 } }, - { { 9362, 5825, 9362, 5825 }, { 5825, 3647, 5825, 3647 }, - { 9362, 5825, 9362, 5825 }, { 5825, 3647, 5825, 3647 } }, - { { 8192, 5243, 8192, 5243 }, { 5243, 3355, 5243, 3355 }, - { 8192, 5243, 8192, 5243 }, { 5243, 3355, 5243, 3355 } }, - { { 7282, 4559, 7282, 4559 }, { 4559, 2893, 4559, 2893 }, - { 7282, 4559, 7282, 4559 }, { 4559, 2893, 4559, 2893 } } -}; - -/**************************************************************************** - * Scan and Quant functions - ****************************************************************************/ - #define ZIG(i,y,x) level[i] = dct[x][y]; -static inline void scan_zigzag_8x8full( int level[64], int16_t dct[8][8] ) -{ - ZIG( 0,0,0) ZIG( 1,0,1) ZIG( 2,1,0) ZIG( 3,2,0) - ZIG( 4,1,1) ZIG( 5,0,2) ZIG( 6,0,3) ZIG( 7,1,2) - ZIG( 8,2,1) ZIG( 9,3,0) ZIG(10,4,0) ZIG(11,3,1) - ZIG(12,2,2) ZIG(13,1,3) ZIG(14,0,4) ZIG(15,0,5) - ZIG(16,1,4) ZIG(17,2,3) ZIG(18,3,2) ZIG(19,4,1) - ZIG(20,5,0) ZIG(21,6,0) ZIG(22,5,1) ZIG(23,4,2) - ZIG(24,3,3) ZIG(25,2,4) ZIG(26,1,5) ZIG(27,0,6) - ZIG(28,0,7) ZIG(29,1,6) ZIG(30,2,5) ZIG(31,3,4) - ZIG(32,4,3) ZIG(33,5,2) ZIG(34,6,1) ZIG(35,7,0) - ZIG(36,7,1) ZIG(37,6,2) ZIG(38,5,3) ZIG(39,4,4) - ZIG(40,3,5) ZIG(41,2,6) ZIG(42,1,7) ZIG(43,2,7) - ZIG(44,3,6) ZIG(45,4,5) ZIG(46,5,4) ZIG(47,6,3) - ZIG(48,7,2) ZIG(49,7,3) ZIG(50,6,4) ZIG(51,5,5) - ZIG(52,4,6) ZIG(53,3,7) ZIG(54,4,7) ZIG(55,5,6) - ZIG(56,6,5) ZIG(57,7,4) ZIG(58,7,5) ZIG(59,6,6) - ZIG(60,5,7) ZIG(61,6,7) ZIG(62,7,6) ZIG(63,7,7) -} -static inline void scan_zigzag_4x4full( int level[16], int16_t dct[4][4] ) -{ - ZIG( 0,0,0) ZIG( 1,0,1) ZIG( 2,1,0) ZIG( 3,2,0) - ZIG( 4,1,1) ZIG( 5,0,2) ZIG( 6,0,3) ZIG( 7,1,2) - ZIG( 8,2,1) ZIG( 9,3,0) ZIG(10,3,1) ZIG(11,2,2) - ZIG(12,1,3) ZIG(13,2,3) ZIG(14,3,2) ZIG(15,3,3) -} -static inline void scan_zigzag_4x4( int level[15], int16_t dct[4][4] ) -{ - ZIG( 0,0,1) ZIG( 1,1,0) ZIG( 2,2,0) - ZIG( 3,1,1) ZIG( 4,0,2) ZIG( 5,0,3) ZIG( 6,1,2) - ZIG( 7,2,1) ZIG( 8,3,0) ZIG( 9,3,1) ZIG(10,2,2) - ZIG(11,1,3) ZIG(12,2,3) ZIG(13,3,2) ZIG(14,3,3) -} -static inline void scan_zigzag_2x2_dc( int level[4], int16_t dct[2][2] ) +static inline void zigzag_scan_2x2_dc( int level[4], int16_t dct[2][2] ) { ZIG(0,0,0) ZIG(1,0,1) @@ -94,57 +35,6 @@ static inline void scan_zigzag_2x2_dc( int level[4], int16_t dct[2][2] ) } #undef ZIG -#define ZIG(i,y,x) {\ - int oe = x+y*FENC_STRIDE;\ - int od = x+y*FDEC_STRIDE;\ - level[i] = p_src[oe] - p_dst[od];\ - p_dst[od] = p_src[oe];\ -} -static inline void sub_zigzag_4x4full( int level[16], const uint8_t *p_src, uint8_t *p_dst ) -{ - ZIG( 0,0,0) ZIG( 1,0,1) ZIG( 2,1,0) ZIG( 3,2,0) - ZIG( 4,1,1) ZIG( 5,0,2) ZIG( 6,0,3) ZIG( 7,1,2) - ZIG( 8,2,1) ZIG( 9,3,0) ZIG(10,3,1) ZIG(11,2,2) - ZIG(12,1,3) ZIG(13,2,3) ZIG(14,3,2) ZIG(15,3,3) -} -static inline void sub_zigzag_4x4( int level[15], const uint8_t *p_src, uint8_t *p_dst ) -{ - ZIG( 0,0,1) ZIG( 1,1,0) ZIG( 2,2,0) - ZIG( 3,1,1) ZIG( 4,0,2) ZIG( 5,0,3) ZIG( 6,1,2) - ZIG( 7,2,1) ZIG( 8,3,0) ZIG( 9,3,1) ZIG(10,2,2) - ZIG(11,1,3) ZIG(12,2,3) ZIG(13,3,2) ZIG(14,3,3) -} -#undef ZIG - -static void quant_8x8( x264_t *h, int16_t dct[8][8], int quant_mf[6][8][8], int i_qscale, int b_intra ) -{ - const int i_qbits = 16 + i_qscale / 6; - const int i_mf = i_qscale % 6; - const int f = ( 1 << i_qbits ) / ( b_intra ? 3 : 6 ); - h->quantf.quant_8x8_core( dct, quant_mf[i_mf], i_qbits, f ); -} -static void quant_4x4( x264_t *h, int16_t dct[4][4], int quant_mf[6][4][4], int i_qscale, int b_intra ) -{ - const int i_qbits = 15 + i_qscale / 6; - const int i_mf = i_qscale % 6; - const int f = ( 1 << i_qbits ) / ( b_intra ? 3 : 6 ); - h->quantf.quant_4x4_core( dct, quant_mf[i_mf], i_qbits, f ); -} -static void quant_4x4_dc( x264_t *h, int16_t dct[4][4], int quant_mf[6][4][4], int i_qscale ) -{ - const int i_qbits = 16 + i_qscale / 6; - const int i_mf = i_qscale % 6; - const int f = ( 1 << i_qbits ) / 3; - h->quantf.quant_4x4_dc_core( dct, quant_mf[i_mf][0][0], i_qbits, f ); -} -static void quant_2x2_dc( x264_t *h, int16_t dct[2][2], int quant_mf[6][4][4], int i_qscale, int b_intra ) -{ - const int i_qbits = 16 + i_qscale / 6; - const int i_mf = i_qscale % 6; - const int f = ( 1 << i_qbits ) / ( b_intra ? 3 : 6 ); - h->quantf.quant_2x2_dc_core( dct, quant_mf[i_mf][0][0], i_qbits, f ); -} - /* (ref: JVT-B118) * x264_mb_decimate_score: given dct coeffs it returns a score to see if we could empty this dct coeffs * to 0 (low score means set it to null) @@ -195,11 +85,11 @@ void x264_mb_encode_i4x4( x264_t *h, int idx, int i_qscale ) int y = 4 * block_idx_y[idx]; uint8_t *p_src = &h->mb.pic.p_fenc[0][x+y*FENC_STRIDE]; uint8_t *p_dst = &h->mb.pic.p_fdec[0][x+y*FDEC_STRIDE]; - int16_t dct4x4[4][4]; + DECLARE_ALIGNED( int16_t, dct4x4[4][4], 16 ); if( h->mb.b_lossless ) { - sub_zigzag_4x4full( h->dct.block[idx].luma4x4, p_src, p_dst ); + h->zigzagf.sub_4x4( h->dct.block[idx].luma4x4, p_src, p_dst ); return; } @@ -208,9 +98,9 @@ void x264_mb_encode_i4x4( x264_t *h, int idx, int i_qscale ) if( h->mb.b_trellis ) x264_quant_4x4_trellis( h, dct4x4, CQM_4IY, i_qscale, DCT_LUMA_4x4, 1 ); else - quant_4x4( h, dct4x4, h->quant4_mf[CQM_4IY], i_qscale, 1 ); + h->quantf.quant_4x4( dct4x4, h->quant4_mf[CQM_4IY][i_qscale], h->quant4_bias[CQM_4IY][i_qscale] ); - scan_zigzag_4x4full( h->dct.block[idx].luma4x4, dct4x4 ); + h->zigzagf.scan_4x4( h->dct.block[idx].luma4x4, dct4x4 ); h->quantf.dequant_4x4( dct4x4, h->dequant4_mf[CQM_4IY], i_qscale ); /* output samples to fdec */ @@ -223,16 +113,16 @@ void x264_mb_encode_i8x8( x264_t *h, int idx, int i_qscale ) int y = 8 * (idx>>1); uint8_t *p_src = &h->mb.pic.p_fenc[0][x+y*FENC_STRIDE]; uint8_t *p_dst = &h->mb.pic.p_fdec[0][x+y*FDEC_STRIDE]; - int16_t dct8x8[8][8]; + DECLARE_ALIGNED( int16_t, dct8x8[8][8], 16 ); h->dctf.sub8x8_dct8( dct8x8, p_src, p_dst ); if( h->mb.b_trellis ) x264_quant_8x8_trellis( h, dct8x8, CQM_8IY, i_qscale, 1 ); else - quant_8x8( h, dct8x8, h->quant8_mf[CQM_8IY], i_qscale, 1 ); + h->quantf.quant_8x8( dct8x8, h->quant8_mf[CQM_8IY][i_qscale], h->quant8_bias[CQM_8IY][i_qscale] ); - scan_zigzag_8x8full( h->dct.luma8x8[idx], dct8x8 ); + h->zigzagf.scan_8x8( h->dct.luma8x8[idx], dct8x8 ); h->quantf.dequant_8x8( dct8x8, h->dequant8_mf[CQM_8IY], i_qscale ); h->dctf.add8x8_idct8( p_dst, dct8x8 ); } @@ -242,7 +132,7 @@ static void x264_mb_encode_i16x16( x264_t *h, int i_qscale ) uint8_t *p_src = h->mb.pic.p_fenc[0]; uint8_t *p_dst = h->mb.pic.p_fdec[0]; - int16_t dct4x4[16+1][4][4]; + DECLARE_ALIGNED( int16_t, dct4x4[16+1][4][4], 16 ); int i; @@ -252,11 +142,11 @@ static void x264_mb_encode_i16x16( x264_t *h, int i_qscale ) { int oe = block_idx_x[i]*4 + block_idx_y[i]*4*FENC_STRIDE; int od = block_idx_x[i]*4 + block_idx_y[i]*4*FDEC_STRIDE; - sub_zigzag_4x4( h->dct.block[i].residual_ac, p_src+oe, p_dst+od ); - dct4x4[0][block_idx_y[i]][block_idx_x[i]] = p_src[oe] - p_dst[od]; + h->zigzagf.sub_4x4ac( h->dct.block[i].residual_ac, p_src+oe, p_dst+od ); + dct4x4[0][block_idx_x[i]][block_idx_y[i]] = p_src[oe] - p_dst[od]; p_dst[od] = p_src[oe]; } - scan_zigzag_4x4full( h->dct.luma16x16_dc, dct4x4[0] ); + h->zigzagf.scan_4x4( h->dct.luma16x16_dc, dct4x4[0] ); return; } @@ -270,15 +160,15 @@ static void x264_mb_encode_i16x16( x264_t *h, int i_qscale ) if( h->mb.b_trellis ) x264_quant_4x4_trellis( h, dct4x4[1+i], CQM_4IY, i_qscale, DCT_LUMA_AC, 1 ); else - quant_4x4( h, dct4x4[1+i], h->quant4_mf[CQM_4IY], i_qscale, 1 ); + h->quantf.quant_4x4( dct4x4[1+i], h->quant4_mf[CQM_4IY][i_qscale], h->quant4_bias[CQM_4IY][i_qscale] ); - scan_zigzag_4x4( h->dct.block[i].residual_ac, dct4x4[1+i] ); + h->zigzagf.scan_4x4ac( h->dct.block[i].residual_ac, dct4x4[1+i] ); h->quantf.dequant_4x4( dct4x4[1+i], h->dequant4_mf[CQM_4IY], i_qscale ); } h->dctf.dct4x4dc( dct4x4[0] ); - quant_4x4_dc( h, dct4x4[0], h->quant4_mf[CQM_4IY], i_qscale ); - scan_zigzag_4x4full( h->dct.luma16x16_dc, dct4x4[0] ); + h->quantf.quant_4x4_dc( dct4x4[0], h->quant4_mf[CQM_4IY][i_qscale][0]>>1, h->quant4_bias[CQM_4IY][i_qscale][0]<<1 ); + h->zigzagf.scan_4x4( h->dct.luma16x16_dc, dct4x4[0] ); /* output samples to fdec */ h->dctf.idct4x4dc( dct4x4[0] ); @@ -294,7 +184,7 @@ static void x264_mb_encode_i16x16( x264_t *h, int i_qscale ) h->dctf.add16x16_idct( p_dst, &dct4x4[1] ); } -static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) +void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) { int i, ch; int b_decimate = b_inter && (h->sh.i_type == SLICE_TYPE_B || h->param.analyse.b_dct_decimate); @@ -305,8 +195,8 @@ static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) uint8_t *p_dst = h->mb.pic.p_fdec[1+ch]; int i_decimate_score = 0; - int16_t dct2x2[2][2]; - int16_t dct4x4[4][4][4]; + DECLARE_ALIGNED( int16_t, dct2x2[2][2] , 16 ); + DECLARE_ALIGNED( int16_t, dct4x4[4][4][4], 16 ); if( h->mb.b_lossless ) { @@ -314,7 +204,7 @@ static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) { int oe = block_idx_x[i]*4 + block_idx_y[i]*4*FENC_STRIDE; int od = block_idx_x[i]*4 + block_idx_y[i]*4*FDEC_STRIDE; - sub_zigzag_4x4( h->dct.block[16+i+ch*4].residual_ac, p_src+oe, p_dst+od ); + h->zigzagf.sub_4x4ac( h->dct.block[16+i+ch*4].residual_ac, p_src+oe, p_dst+od ); h->dct.chroma_dc[ch][i] = p_src[oe] - p_dst[od]; p_dst[od] = p_src[oe]; } @@ -329,8 +219,8 @@ static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) dct2x2[block_idx_y[i]][block_idx_x[i]] = dct4x4[i][0][0]; /* no trellis; it doesn't seem to help chroma noticeably */ - quant_4x4( h, dct4x4[i], h->quant4_mf[CQM_4IC + b_inter], i_qscale, !b_inter ); - scan_zigzag_4x4( h->dct.block[16+i+ch*4].residual_ac, dct4x4[i] ); + h->quantf.quant_4x4( dct4x4[i], h->quant4_mf[CQM_4IC+b_inter][i_qscale], h->quant4_bias[CQM_4IC+b_inter][i_qscale] ); + h->zigzagf.scan_4x4ac( h->dct.block[16+i+ch*4].residual_ac, dct4x4[i] ); if( b_decimate ) { @@ -339,8 +229,8 @@ static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) } h->dctf.dct2x2dc( dct2x2 ); - quant_2x2_dc( h, dct2x2, h->quant4_mf[CQM_4IC + b_inter], i_qscale, !b_inter ); - scan_zigzag_2x2_dc( h->dct.chroma_dc[ch], dct2x2 ); + h->quantf.quant_2x2_dc( dct2x2, h->quant4_mf[CQM_4IC+b_inter][i_qscale][0]>>1, h->quant4_bias[CQM_4IC+b_inter][i_qscale][0]<<1 ); + zigzag_scan_2x2_dc( h->dct.chroma_dc[ch], dct2x2 ); /* output samples to fdec */ h->dctf.idct2x2dc( dct2x2 ); @@ -350,7 +240,7 @@ static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) { /* Near null chroma 8x8 block so make it null (bits saving) */ memset( &h->dct.block[16+ch*4], 0, 4 * sizeof( *h->dct.block ) ); - if( !array_non_zero( (int*)dct2x2, sizeof(dct2x2)/sizeof(int) ) ) + if( !array_non_zero( dct2x2 ) ) continue; memset( dct4x4, 0, sizeof( dct4x4 ) ); } @@ -364,6 +254,19 @@ static void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale ) dct4x4[i][0][0] = dct2x2[0][i]; h->dctf.add8x8_idct( p_dst, dct4x4 ); } + + /* coded block pattern */ + h->mb.i_cbp_chroma = 0; + for( i = 0; i < 8; i++ ) + { + int nz = array_non_zero_count( h->dct.block[16+i].residual_ac, 15 ); + h->mb.cache.non_zero_count[x264_scan8[16+i]] = nz; + h->mb.i_cbp_chroma |= nz; + } + if( h->mb.i_cbp_chroma ) + h->mb.i_cbp_chroma = 2; /* dc+ac (we can't do only ac) */ + else if( array_non_zero( h->dct.chroma_dc ) ) + h->mb.i_cbp_chroma = 1; /* dc only */ } static void x264_macroblock_encode_skip( x264_t *h ) @@ -393,17 +296,17 @@ void x264_macroblock_encode_pskip( x264_t *h ) h->mb.mv_min[1], h->mb.mv_max[1] ); /* Motion compensation XXX probably unneeded */ - h->mc.mc_luma( h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0], - h->mb.pic.p_fdec[0], FDEC_STRIDE, + h->mc.mc_luma( h->mb.pic.p_fdec[0], FDEC_STRIDE, + h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0], mvx, mvy, 16, 16 ); /* Chroma MC */ - h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4], h->mb.pic.i_stride[1], - h->mb.pic.p_fdec[1], FDEC_STRIDE, + h->mc.mc_chroma( h->mb.pic.p_fdec[1], FDEC_STRIDE, + h->mb.pic.p_fref[0][0][4], h->mb.pic.i_stride[1], mvx, mvy, 8, 8 ); - h->mc.mc_chroma( h->mb.pic.p_fref[0][0][5], h->mb.pic.i_stride[2], - h->mb.pic.p_fdec[2], FDEC_STRIDE, + h->mc.mc_chroma( h->mb.pic.p_fdec[2], FDEC_STRIDE, + h->mb.pic.p_fref[0][0][5], h->mb.pic.i_stride[2], mvx, mvy, 8, 8 ); x264_macroblock_encode_skip( h ); @@ -417,8 +320,26 @@ void x264_macroblock_encode( x264_t *h ) int i_cbp_dc = 0; int i_qp = h->mb.i_qp; int b_decimate = h->sh.i_type == SLICE_TYPE_B || h->param.analyse.b_dct_decimate; + int b_force_no_skip = 0; int i; + if( h->sh.b_mbaff + && h->mb.i_mb_xy == h->sh.i_first_mb + h->mb.i_mb_stride + && IS_SKIP(h->mb.type[h->sh.i_first_mb]) ) + { + /* The first skip is predicted to be a frame mb pair. + * We don't yet support the aff part of mbaff, so force it to non-skip + * so that we can pick the aff flag. */ + b_force_no_skip = 1; + if( IS_SKIP(h->mb.i_type) ) + { + if( h->mb.i_type == P_SKIP ) + h->mb.i_type = P_L0; + else if( h->mb.i_type == B_SKIP ) + h->mb.i_type = B_DIRECT; + } + } + if( h->mb.i_type == P_SKIP ) { /* A bit special */ @@ -445,20 +366,38 @@ void x264_macroblock_encode( x264_t *h ) } else if( h->mb.i_type == I_8x8 ) { + DECLARE_ALIGNED( uint8_t, edge[33], 16 ); h->mb.b_transform_8x8 = 1; - for( i = 0; i < 4; i++ ) + /* If we already encoded 3 of the 4 i8x8 blocks, we don't have to do them again. */ + if( h->mb.i_skip_intra ) + { + h->mc.copy[PIXEL_16x16]( h->mb.pic.p_fdec[0], FDEC_STRIDE, h->mb.pic.i8x8_fdec_buf, 16, 16 ); + /* In RD mode, restore the now-overwritten DCT data. */ + if( h->mb.i_skip_intra == 2 ) + h->mc.memcpy_aligned( h->dct.luma8x8, h->mb.pic.i8x8_dct_buf, sizeof(h->mb.pic.i8x8_dct_buf) ); + } + for( i = h->mb.i_skip_intra ? 3 : 0 ; i < 4; i++ ) { uint8_t *p_dst = &h->mb.pic.p_fdec[0][8 * (i&1) + 8 * (i>>1) * FDEC_STRIDE]; int i_mode = h->mb.cache.intra4x4_pred_mode[x264_scan8[4*i]]; - h->predict_8x8[i_mode]( p_dst, h->mb.i_neighbour8[i] ); + x264_predict_8x8_filter( p_dst, edge, h->mb.i_neighbour8[i], x264_pred_i4x4_neighbors[i_mode] ); + h->predict_8x8[i_mode]( p_dst, edge ); x264_mb_encode_i8x8( h, i, i_qp ); } } else if( h->mb.i_type == I_4x4 ) { h->mb.b_transform_8x8 = 0; - for( i = 0; i < 16; i++ ) + /* If we already encoded 15 of the 16 i4x4 blocks, we don't have to do them again. */ + if( h->mb.i_skip_intra ) + { + h->mc.copy[PIXEL_16x16]( h->mb.pic.p_fdec[0], FDEC_STRIDE, h->mb.pic.i4x4_fdec_buf, 16, 16 ); + /* In RD mode, restore the now-overwritten DCT data. */ + if( h->mb.i_skip_intra == 2 ) + h->mc.memcpy_aligned( h->dct.block, h->mb.pic.i4x4_dct_buf, sizeof(h->mb.pic.i4x4_dct_buf) ); + } + for( i = h->mb.i_skip_intra ? 15 : 0 ; i < 16; i++ ) { uint8_t *p_dst = &h->mb.pic.p_fdec[0][4 * block_idx_x[i] + 4 * block_idx_y[i] * FDEC_STRIDE]; int i_mode = h->mb.cache.intra4x4_pred_mode[x264_scan8[i]]; @@ -485,14 +424,14 @@ void x264_macroblock_encode( x264_t *h ) { int x = 4*block_idx_x[i4x4]; int y = 4*block_idx_y[i4x4]; - sub_zigzag_4x4full( h->dct.block[i4x4].luma4x4, + h->zigzagf.sub_4x4( h->dct.block[i4x4].luma4x4, h->mb.pic.p_fenc[0]+x+y*FENC_STRIDE, h->mb.pic.p_fdec[0]+x+y*FDEC_STRIDE ); } } else if( h->mb.b_transform_8x8 ) { - int16_t dct8x8[4][8][8]; + DECLARE_ALIGNED( int16_t, dct8x8[4][8][8], 16 ); int nnz8x8[4] = {1,1,1,1}; b_decimate &= !h->mb.b_trellis; // 8x8 trellis is inherently optimal decimation h->dctf.sub16x16_dct8( dct8x8, h->mb.pic.p_fenc[0], h->mb.pic.p_fdec[0] ); @@ -504,9 +443,9 @@ void x264_macroblock_encode( x264_t *h ) if( h->mb.b_trellis ) x264_quant_8x8_trellis( h, dct8x8[idx], CQM_8PY, i_qp, 0 ); else - quant_8x8( h, dct8x8[idx], h->quant8_mf[CQM_8PY], i_qp, 0 ); + h->quantf.quant_8x8( dct8x8[idx], h->quant8_mf[CQM_8PY][i_qp], h->quant8_bias[CQM_8PY][i_qp] ); - scan_zigzag_8x8full( h->dct.luma8x8[idx], dct8x8[idx] ); + h->zigzagf.scan_8x8( h->dct.luma8x8[idx], dct8x8[idx] ); if( b_decimate ) { @@ -520,7 +459,7 @@ void x264_macroblock_encode( x264_t *h ) } } else - nnz8x8[idx] = array_non_zero( (int*)dct8x8[idx], sizeof(*dct8x8)/sizeof(int) ); + nnz8x8[idx] = array_non_zero( dct8x8[idx] ); } if( i_decimate_mb < 6 && b_decimate ) @@ -537,7 +476,7 @@ void x264_macroblock_encode( x264_t *h ) } else { - int16_t dct4x4[16][4][4]; + DECLARE_ALIGNED( int16_t, dct4x4[16][4][4], 16 ); int nnz8x8[4] = {1,1,1,1}; h->dctf.sub16x16_dct( dct4x4, h->mb.pic.p_fenc[0], h->mb.pic.p_fdec[0] ); @@ -556,9 +495,9 @@ void x264_macroblock_encode( x264_t *h ) if( h->mb.b_trellis ) x264_quant_4x4_trellis( h, dct4x4[idx], CQM_4PY, i_qp, DCT_LUMA_4x4, 0 ); else - quant_4x4( h, dct4x4[idx], h->quant4_mf[CQM_4PY], i_qp, 0 ); + h->quantf.quant_4x4( dct4x4[idx], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); - scan_zigzag_4x4full( h->dct.block[idx].luma4x4, dct4x4[idx] ); + h->zigzagf.scan_4x4( h->dct.block[idx].luma4x4, dct4x4[idx] ); if( b_decimate ) i_decimate_8x8 += x264_mb_decimate_score( h->dct.block[idx].luma4x4, 16 ); @@ -590,7 +529,6 @@ void x264_macroblock_encode( x264_t *h ) } /* encode chroma */ - i_qp = i_chroma_qp_table[x264_clip3( i_qp + h->pps->i_chroma_qp_index_offset, 0, 51 )]; if( IS_INTRA( h->mb.i_type ) ) { const int i_mode = h->mb.i_chroma_pred_mode; @@ -599,9 +537,9 @@ void x264_macroblock_encode( x264_t *h ) } /* encode the 8x8 blocks */ - x264_mb_encode_8x8_chroma( h, !IS_INTRA( h->mb.i_type ), i_qp ); + x264_mb_encode_8x8_chroma( h, !IS_INTRA( h->mb.i_type ), h->mb.i_chroma_qp ); - /* Calculate the Luma/Chroma patern and non_zero_count */ + /* coded block pattern and non_zero_count */ h->mb.i_cbp_luma = 0x00; if( h->mb.i_type == I_16x16 ) { @@ -619,7 +557,7 @@ void x264_macroblock_encode( x264_t *h ) * the full non_zero_count is done only in CAVLC. */ for( i = 0; i < 4; i++ ) { - const int nz = array_non_zero( h->dct.luma8x8[i], 64 ); + const int nz = array_non_zero( h->dct.luma8x8[i] ); int j; for( j = 0; j < 4; j++ ) h->mb.cache.non_zero_count[x264_scan8[4*i+j]] = nz; @@ -638,27 +576,11 @@ void x264_macroblock_encode( x264_t *h ) } } - /* Calculate the chroma patern */ - h->mb.i_cbp_chroma = 0x00; - for( i = 0; i < 8; i++ ) - { - const int nz = array_non_zero_count( h->dct.block[16+i].residual_ac, 15 ); - h->mb.cache.non_zero_count[x264_scan8[16+i]] = nz; - if( nz > 0 ) - { - h->mb.i_cbp_chroma = 0x02; /* dc+ac (we can't do only ac) */ - } - } - if( h->mb.i_cbp_chroma == 0x00 && array_non_zero( h->dct.chroma_dc[0], 8 ) ) - { - h->mb.i_cbp_chroma = 0x01; /* dc only */ - } - if( h->param.b_cabac ) { - i_cbp_dc = ( h->mb.i_type == I_16x16 && array_non_zero( h->dct.luma16x16_dc, 16 ) ) - | array_non_zero( h->dct.chroma_dc[0], 4 ) << 1 - | array_non_zero( h->dct.chroma_dc[1], 4 ) << 2; + i_cbp_dc = ( h->mb.i_type == I_16x16 && array_non_zero( h->dct.luma16x16_dc ) ) + | array_non_zero( h->dct.chroma_dc[0] ) << 1 + | array_non_zero( h->dct.chroma_dc[1] ) << 2; } /* store cbp */ @@ -667,25 +589,23 @@ void x264_macroblock_encode( x264_t *h ) /* Check for P_SKIP * XXX: in the me perhaps we should take x264_mb_predict_mv_pskip into account * (if multiple mv give same result)*/ - if( h->mb.i_type == P_L0 && h->mb.i_partition == D_16x16 && - h->mb.i_cbp_luma == 0x00 && h->mb.i_cbp_chroma== 0x00 && - h->mb.cache.ref[0][x264_scan8[0]] == 0 ) + if( !b_force_no_skip ) { - int mvp[2]; - - x264_mb_predict_mv_pskip( h, mvp ); - if( h->mb.cache.mv[0][x264_scan8[0]][0] == mvp[0] && - h->mb.cache.mv[0][x264_scan8[0]][1] == mvp[1] ) + if( h->mb.i_type == P_L0 && h->mb.i_partition == D_16x16 && + h->mb.i_cbp_luma == 0x00 && h->mb.i_cbp_chroma == 0x00 && + h->mb.cache.mv[0][x264_scan8[0]][0] == h->mb.cache.pskip_mv[0] && + h->mb.cache.mv[0][x264_scan8[0]][1] == h->mb.cache.pskip_mv[1] && + h->mb.cache.ref[0][x264_scan8[0]] == 0 ) { h->mb.i_type = P_SKIP; } - } - /* Check for B_SKIP */ - if( h->mb.i_type == B_DIRECT && - h->mb.i_cbp_luma == 0x00 && h->mb.i_cbp_chroma== 0x00 ) - { - h->mb.i_type = B_SKIP; + /* Check for B_SKIP */ + if( h->mb.i_type == B_DIRECT && + h->mb.i_cbp_luma == 0x00 && h->mb.i_cbp_chroma== 0x00 ) + { + h->mb.i_type = B_SKIP; + } } } @@ -694,7 +614,7 @@ void x264_macroblock_encode( x264_t *h ) * Check if the current MB could be encoded as a [PB]_SKIP (it supposes you use * the previous QP *****************************************************************************/ -int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) +int x264_macroblock_probe_skip( x264_t *h, const int b_bidir ) { DECLARE_ALIGNED( int16_t, dct4x4[16][4][4], 16 ); DECLARE_ALIGNED( int16_t, dct2x2[2][2], 16 ); @@ -710,13 +630,12 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) if( !b_bidir ) { /* Get the MV */ - x264_mb_predict_mv_pskip( h, mvp ); - mvp[0] = x264_clip3( mvp[0], h->mb.mv_min[0], h->mb.mv_max[0] ); - mvp[1] = x264_clip3( mvp[1], h->mb.mv_min[1], h->mb.mv_max[1] ); + mvp[0] = x264_clip3( h->mb.cache.pskip_mv[0], h->mb.mv_min[0], h->mb.mv_max[0] ); + mvp[1] = x264_clip3( h->mb.cache.pskip_mv[1], h->mb.mv_min[1], h->mb.mv_max[1] ); /* Motion compensation */ - h->mc.mc_luma( h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0], - h->mb.pic.p_fdec[0], FDEC_STRIDE, + h->mc.mc_luma( h->mb.pic.p_fdec[0], FDEC_STRIDE, + h->mb.pic.p_fref[0][0], h->mb.pic.i_stride[0], mvp[0], mvp[1], 16, 16 ); } @@ -731,8 +650,8 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) { const int idx = i8x8 * 4 + i4x4; - quant_4x4( h, dct4x4[idx], (int(*)[4][4])def_quant4_mf, i_qp, 0 ); - scan_zigzag_4x4full( dctscan, dct4x4[idx] ); + h->quantf.quant_4x4( dct4x4[idx], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); + h->zigzagf.scan_4x4( dctscan, dct4x4[idx] ); i_decimate_mb += x264_mb_decimate_score( dctscan, 16 ); @@ -745,7 +664,7 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) } /* encode chroma */ - i_qp = i_chroma_qp_table[x264_clip3( i_qp + h->pps->i_chroma_qp_index_offset, 0, 51 )]; + i_qp = h->mb.i_chroma_qp; for( ch = 0; ch < 2; ch++ ) { @@ -754,8 +673,8 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) if( !b_bidir ) { - h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4+ch], h->mb.pic.i_stride[1+ch], - h->mb.pic.p_fdec[1+ch], FDEC_STRIDE, + h->mc.mc_chroma( h->mb.pic.p_fdec[1+ch], FDEC_STRIDE, + h->mb.pic.p_fref[0][0][4+ch], h->mb.pic.i_stride[1+ch], mvp[0], mvp[1], 8, 8 ); } @@ -767,7 +686,7 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) dct2x2[1][0] = dct4x4[2][0][0]; dct2x2[1][1] = dct4x4[3][0][0]; h->dctf.dct2x2dc( dct2x2 ); - quant_2x2_dc( h, dct2x2, (int(*)[4][4])def_quant4_mf, i_qp, 0 ); + h->quantf.quant_2x2_dc( dct2x2, h->quant4_mf[CQM_4PC][i_qp][0]>>1, h->quant4_bias[CQM_4PC][i_qp][0]<<1 ); if( dct2x2[0][0] || dct2x2[0][1] || dct2x2[1][0] || dct2x2[1][1] ) { /* can't be */ @@ -777,8 +696,8 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) /* calculate dct coeffs */ for( i4x4 = 0, i_decimate_mb = 0; i4x4 < 4; i4x4++ ) { - quant_4x4( h, dct4x4[i4x4], (int(*)[4][4])def_quant4_mf, i_qp, 0 ); - scan_zigzag_4x4( dctscan, dct4x4[i4x4] ); + h->quantf.quant_4x4( dct4x4[i4x4], h->quant4_mf[CQM_4PC][i_qp], h->quant4_bias[CQM_4PC][i_qp] ); + h->zigzagf.scan_4x4ac( dctscan, dct4x4[i4x4] ); i_decimate_mb += x264_mb_decimate_score( dctscan, 15 ); if( i_decimate_mb >= 7 ) @@ -802,7 +721,7 @@ void x264_noise_reduction_update( x264_t *h ) for( cat = 0; cat < 2; cat++ ) { int size = cat ? 64 : 16; - const int *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab; + const uint16_t *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab; if( h->nr_count[cat] > (cat ? (1<<16) : (1<<18)) ) { @@ -867,15 +786,15 @@ void x264_macroblock_encode_p8x8( x264_t *h, int i8 ) if( h->mb.b_transform_8x8 ) { - int16_t dct8x8[8][8]; + DECLARE_ALIGNED( int16_t, dct8x8[8][8], 16 ); h->dctf.sub8x8_dct8( dct8x8, p_fenc, p_fdec ); - quant_8x8( h, dct8x8, h->quant8_mf[CQM_8PY], i_qp, 0 ); - scan_zigzag_8x8full( h->dct.luma8x8[i8], dct8x8 ); + h->quantf.quant_8x8( dct8x8, h->quant8_mf[CQM_8PY][i_qp], h->quant8_bias[CQM_8PY][i_qp] ); + h->zigzagf.scan_8x8( h->dct.luma8x8[i8], dct8x8 ); if( b_decimate ) nnz8x8 = 4 <= x264_mb_decimate_score( h->dct.luma8x8[i8], 64 ); else - nnz8x8 = array_non_zero( (int*)dct8x8, sizeof(dct8x8)/sizeof(int) ); + nnz8x8 = array_non_zero( dct8x8 ); if( nnz8x8 ) { @@ -886,14 +805,14 @@ void x264_macroblock_encode_p8x8( x264_t *h, int i8 ) else { int i4; - int16_t dct4x4[4][4][4]; + DECLARE_ALIGNED( int16_t, dct4x4[4][4][4], 16 ); h->dctf.sub8x8_dct( dct4x4, p_fenc, p_fdec ); - quant_4x4( h, dct4x4[0], h->quant4_mf[CQM_4PY], i_qp, 0 ); - quant_4x4( h, dct4x4[1], h->quant4_mf[CQM_4PY], i_qp, 0 ); - quant_4x4( h, dct4x4[2], h->quant4_mf[CQM_4PY], i_qp, 0 ); - quant_4x4( h, dct4x4[3], h->quant4_mf[CQM_4PY], i_qp, 0 ); + h->quantf.quant_4x4( dct4x4[0], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); + h->quantf.quant_4x4( dct4x4[1], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); + h->quantf.quant_4x4( dct4x4[2], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); + h->quantf.quant_4x4( dct4x4[3], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); for( i4 = 0; i4 < 4; i4++ ) - scan_zigzag_4x4full( h->dct.block[i8*4+i4].luma4x4, dct4x4[i4] ); + h->zigzagf.scan_4x4( h->dct.block[i8*4+i4].luma4x4, dct4x4[i4] ); if( b_decimate ) { @@ -903,7 +822,7 @@ void x264_macroblock_encode_p8x8( x264_t *h, int i8 ) nnz8x8 = 4 <= i_decimate_8x8; } else - nnz8x8 = array_non_zero( (int*)dct4x4, sizeof(dct4x4)/sizeof(int) ); + nnz8x8 = array_non_zero( dct4x4 ); if( nnz8x8 ) { @@ -913,18 +832,18 @@ void x264_macroblock_encode_p8x8( x264_t *h, int i8 ) } } - i_qp = i_chroma_qp_table[x264_clip3( i_qp + h->pps->i_chroma_qp_index_offset, 0, 51 )]; + i_qp = h->mb.i_chroma_qp; for( ch = 0; ch < 2; ch++ ) { - int16_t dct4x4[4][4]; + DECLARE_ALIGNED( int16_t, dct4x4[4][4], 16 ); p_fenc = h->mb.pic.p_fenc[1+ch] + (i8&1)*4 + (i8>>1)*4*FENC_STRIDE; p_fdec = h->mb.pic.p_fdec[1+ch] + (i8&1)*4 + (i8>>1)*4*FDEC_STRIDE; h->dctf.sub4x4_dct( dct4x4, p_fenc, p_fdec ); - quant_4x4( h, dct4x4, h->quant4_mf[CQM_4PC], i_qp, 0 ); - scan_zigzag_4x4( h->dct.block[16+i8+ch*4].residual_ac, dct4x4 ); - if( array_non_zero( (int*)dct4x4, sizeof(dct4x4)/sizeof(int) ) ) + h->quantf.quant_4x4( dct4x4, h->quant4_mf[CQM_4PC][i_qp], h->quant4_bias[CQM_4PC][i_qp] ); + h->zigzagf.scan_4x4ac( h->dct.block[16+i8+ch*4].residual_ac, dct4x4 ); + if( array_non_zero( dct4x4 ) ) { h->quantf.dequant_4x4( dct4x4, h->dequant4_mf[CQM_4PC], i_qp ); h->dctf.add4x4_idct( p_fdec, dct4x4 );