X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=encoder%2Fmacroblock.c;h=d095b7c2fae793ecace0f54bd7beda595343496f;hb=1d56ef44748dd3ae36751f27263ccefc22d5f543;hp=d0d2d2cc75725901b278f8913bd57074110ddbcd;hpb=1ab45c8f7411f7b4453ddff66919910e823ed33b;p=x264 diff --git a/encoder/macroblock.c b/encoder/macroblock.c index d0d2d2cc..d095b7c2 100644 --- a/encoder/macroblock.c +++ b/encoder/macroblock.c @@ -21,156 +21,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#include -#include -#include - #include "common/common.h" #include "macroblock.h" -static const uint8_t block_idx_x[16] = -{ - 0, 1, 0, 1, 2, 3, 2, 3, 0, 1, 0, 1, 2, 3, 2, 3 -}; -static const uint8_t block_idx_y[16] = -{ - 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 -}; -static const uint8_t block_idx_xy[4][4] = -{ - { 0, 2, 8, 10 }, - { 1, 3, 9, 11 }, - { 4, 6, 12, 14 }, - { 5, 7, 13, 15 } -}; - -static const int quant_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 } } -}; - -const int quant8_mf[6][8][8] = -{ - { - { 13107, 12222, 16777, 12222, 13107, 12222, 16777, 12222 }, - { 12222, 11428, 15481, 11428, 12222, 11428, 15481, 11428 }, - { 16777, 15481, 20972, 15481, 16777, 15481, 20972, 15481 }, - { 12222, 11428, 15481, 11428, 12222, 11428, 15481, 11428 }, - { 13107, 12222, 16777, 12222, 13107, 12222, 16777, 12222 }, - { 12222, 11428, 15481, 11428, 12222, 11428, 15481, 11428 }, - { 16777, 15481, 20972, 15481, 16777, 15481, 20972, 15481 }, - { 12222, 11428, 15481, 11428, 12222, 11428, 15481, 11428 } - }, { - { 11916, 11058, 14980, 11058, 11916, 11058, 14980, 11058 }, - { 11058, 10826, 14290, 10826, 11058, 10826, 14290, 10826 }, - { 14980, 14290, 19174, 14290, 14980, 14290, 19174, 14290 }, - { 11058, 10826, 14290, 10826, 11058, 10826, 14290, 10826 }, - { 11916, 11058, 14980, 11058, 11916, 11058, 14980, 11058 }, - { 11058, 10826, 14290, 10826, 11058, 10826, 14290, 10826 }, - { 14980, 14290, 19174, 14290, 14980, 14290, 19174, 14290 }, - { 11058, 10826, 14290, 10826, 11058, 10826, 14290, 10826 } - }, { - { 10082, 9675, 12710, 9675, 10082, 9675, 12710, 9675 }, - { 9675, 8943, 11985, 8943, 9675, 8943, 11985, 8943 }, - { 12710, 11985, 15978, 11985, 12710, 11985, 15978, 11985 }, - { 9675, 8943, 11985, 8943, 9675, 8943, 11985, 8943 }, - { 10082, 9675, 12710, 9675, 10082, 9675, 12710, 9675 }, - { 9675, 8943, 11985, 8943, 9675, 8943, 11985, 8943 }, - { 12710, 11985, 15978, 11985, 12710, 11985, 15978, 11985 }, - { 9675, 8943, 11985, 8943, 9675, 8943, 11985, 8943 } - }, { - { 9362, 8931, 11984, 8931, 9362, 8931, 11984, 8931 }, - { 8931, 8228, 11259, 8228, 8931, 8228, 11259, 8228 }, - { 11984, 11259, 14913, 11259, 11984, 11259, 14913, 11259 }, - { 8931, 8228, 11259, 8228, 8931, 8228, 11259, 8228 }, - { 9362, 8931, 11984, 8931, 9362, 8931, 11984, 8931 }, - { 8931, 8228, 11259, 8228, 8931, 8228, 11259, 8228 }, - { 11984, 11259, 14913, 11259, 11984, 11259, 14913, 11259 }, - { 8931, 8228, 11259, 8228, 8931, 8228, 11259, 8228 } - }, { - { 8192, 7740, 10486, 7740, 8192, 7740, 10486, 7740 }, - { 7740, 7346, 9777, 7346, 7740, 7346, 9777, 7346 }, - { 10486, 9777, 13159, 9777, 10486, 9777, 13159, 9777 }, - { 7740, 7346, 9777, 7346, 7740, 7346, 9777, 7346 }, - { 8192, 7740, 10486, 7740, 8192, 7740, 10486, 7740 }, - { 7740, 7346, 9777, 7346, 7740, 7346, 9777, 7346 }, - { 10486, 9777, 13159, 9777, 10486, 9777, 13159, 9777 }, - { 7740, 7346, 9777, 7346, 7740, 7346, 9777, 7346 } - }, { - { 7282, 6830, 9118, 6830, 7282, 6830, 9118, 6830 }, - { 6830, 6428, 8640, 6428, 6830, 6428, 8640, 6428 }, - { 9118, 8640, 11570, 8640, 9118, 8640, 11570, 8640 }, - { 6830, 6428, 8640, 6428, 6830, 6428, 8640, 6428 }, - { 7282, 6830, 9118, 6830, 7282, 6830, 9118, 6830 }, - { 6830, 6428, 8640, 6428, 6830, 6428, 8640, 6428 }, - { 9118, 8640, 11570, 8640, 9118, 8640, 11570, 8640 }, - { 6830, 6428, 8640, 6428, 6830, 6428, 8640, 6428 } - } -}; - -static const int i_chroma_qp_table[52] = -{ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 29, 30, 31, 32, 32, 33, 34, 34, 35, 35, - 36, 36, 37, 37, 37, 38, 38, 38, 39, 39, - 39, 39 -}; - -/**************************************************************************** - * Scan and Quant functions - ****************************************************************************/ -//static const int scan_zigzag_x[16]={0, 1, 0, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 3, 2, 3}; -//static const int scan_zigzag_y[16]={0, 0, 1, 2, 1, 0, 0, 1, 2, 3, 3, 2, 1, 2, 3, 3}; - -#define ZIG(i,y,x) level[i] = dct[y][x]; -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] ) +#define ZIG(i,y,x) level[i] = dct[x][y]; +static inline void zigzag_scan_2x2_dc( int level[4], int16_t dct[2][2] ) { ZIG(0,0,0) ZIG(1,0,1) @@ -179,180 +35,6 @@ static inline void scan_zigzag_2x2_dc( int level[4], int16_t dct[2][2] ) } #undef ZIG -static void quant_8x8( int16_t dct[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 ); - - int x,y; - for( y = 0; y < 8; y++ ) - { - for( x = 0; x < 8; x++ ) - { - if( dct[y][x] > 0 ) - dct[y][x] = ( f + dct[y][x] * quant8_mf[i_mf][y][x] ) >> i_qbits; - else - dct[y][x] = - ( ( f - dct[y][x] * quant8_mf[i_mf][y][x] ) >> i_qbits ); - } - } -} -static void quant_4x4( int16_t dct[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 ); - - int x,y; - for( y = 0; y < 4; y++ ) - { - for( x = 0; x < 4; x++ ) - { - if( dct[y][x] > 0 ) - dct[y][x] = ( f + dct[y][x] * quant_mf[i_mf][y][x] ) >> i_qbits; - else - dct[y][x] = - ( ( f - dct[y][x] * quant_mf[i_mf][y][x] ) >> i_qbits ); - } - } -} -static void quant_4x4_dc( int16_t dct[4][4], int i_qscale ) -{ - const int i_qbits = 15 + i_qscale / 6; - const int f2 = ( 2 << i_qbits ) / 3; - const int i_qmf = quant_mf[i_qscale%6][0][0]; - int x,y; - - for( y = 0; y < 4; y++ ) - { - for( x = 0; x < 4; x++ ) - { - if( dct[y][x] > 0 ) - dct[y][x] =( f2 + dct[y][x] * i_qmf) >> ( 1 + i_qbits ); - else - dct[y][x] = - ( ( f2 - dct[y][x] * i_qmf ) >> (1 + i_qbits ) ); - } - } -} -static void quant_2x2_dc( int16_t dct[2][2], int i_qscale, int b_intra ) -{ - int const i_qbits = 15 + i_qscale / 6; - const int f2 = ( 2 << i_qbits ) / ( b_intra ? 3 : 6 ); - const int i_qmf = quant_mf[i_qscale%6][0][0]; - - int x,y; - for( y = 0; y < 2; y++ ) - { - for( x = 0; x < 2; x++ ) - { - if( dct[y][x] > 0 ) - dct[y][x] =( f2 + dct[y][x] * i_qmf) >> ( 1 + i_qbits ); - else - dct[y][x] = - ( ( f2 - dct[y][x] * i_qmf ) >> (1 + i_qbits ) ); - } - } -} -#if 0 -/* From a JVT doc */ -static const int f_deadzone_intra[4][4][2] = /* [num][den] */ -{ - { {1,2}, {3,7}, {2,5}, {1,3} }, - { {3,7}, {2,5}, {1,3}, {1,4} }, - { {2,5}, {1,3}, {1,4}, {1,5} }, - { {1,3}, {1,4}, {1,5}, {1,5} } -}; -static const int f_deadzone_inter[4][4][2] = /* [num][den] */ -{ - { {1,3}, {2,7}, {4,15},{2,9} }, - { {2,7}, {4,15},{2,9}, {1,6} }, - { {4,15},{2,9}, {1,6}, {1,7} }, - { {2,9}, {1,6}, {1,7}, {2,15} } -}; - - -static void quant_4x4( int16_t dct[4][4], int i_qscale, int b_intra ) -{ - const int(*f_deadzone)[4][4][2] = b_intra ? &f_deadzone_intra : &f_deadzone_inter; - const int i_qbits = 15 + i_qscale / 6; - const int i_mf = i_qscale % 6; - - int x,y; - for( y = 0; y < 4; y++ ) - { - for( x = 0; x < 4; x++ ) - { -#if 0 - const int f = b_intra ? - (f_deadzone_intra[y][x][0] * ( 1 << i_qbits ) / f_deadzone_intra[y][x][1]) - : - (f_deadzone_inter[y][x][0] * ( 1 << i_qbits ) / f_deadzone_inter[y][x][1]); -#else - const int f = (*f_deadzone)[y][x][0] * ( 1 << i_qbits ) / (*f_deadzone)[y][x][1]; -#endif - - if( dct[y][x] > 0 ) - { - dct[y][x] =( f + dct[y][x] * quant_mf[i_mf][y][x] ) >> i_qbits; - } - else - { - dct[y][x] = - ( ( f - dct[y][x] * quant_mf[i_mf][y][x] ) >> i_qbits ); - } - } - } -} - -static void quant_4x4_dc( int16_t dct[4][4], int i_qscale ) -{ - const int i_qbits = 15 + i_qscale / 6; - const int i_qmf = quant_mf[i_qscale%6][0][0]; - const int f2 = f_deadzone_intra[0][0][0] * ( 2 << i_qbits ) / f_deadzone_intra[0][0][1]; - int x,y; - - for( y = 0; y < 4; y++ ) - { - for( x = 0; x < 4; x++ ) - { - - if( dct[y][x] > 0 ) - { - dct[y][x] =( f2 + dct[y][x] * i_qmf) >> ( 1 + i_qbits ); - } - else - { - dct[y][x] = - ( ( f2 - dct[y][x] * i_qmf ) >> (1 + i_qbits ) ); - } - } - } -} - -static void quant_2x2_dc( int16_t dct[2][2], int i_qscale, int b_intra ) -{ - int const i_qbits = 15 + i_qscale / 6; - const int i_qmf = quant_mf[i_qscale%6][0][0]; - const int f2 = b_intra ? - (f_deadzone_intra[0][0][0] * ( 2 << i_qbits ) / f_deadzone_intra[0][0][1]) - : - (f_deadzone_inter[0][0][0] * ( 2 << i_qbits ) / f_deadzone_inter[0][0][1]); - int x,y; - for( y = 0; y < 2; y++ ) - { - for( x = 0; x < 2; x++ ) - { - if( dct[y][x] > 0 ) - { - dct[y][x] =( f2 + dct[y][x] * i_qmf) >> ( 1 + i_qbits ); - } - else - { - dct[y][x] = - ( ( f2 - dct[y][x] * i_qmf ) >> (1 + i_qbits ) ); - } - } - } -} - - -#endif - /* (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) @@ -399,65 +81,98 @@ static int x264_mb_decimate_score( int *dct, int i_max ) void x264_mb_encode_i4x4( x264_t *h, int idx, int i_qscale ) { - const int i_stride = h->mb.pic.i_stride[0]; - const int i_offset = 4 * block_idx_x[idx] + 4 * block_idx_y[idx] * i_stride; - uint8_t *p_src = &h->mb.pic.p_fenc[0][i_offset]; - uint8_t *p_dst = &h->mb.pic.p_fdec[0][i_offset]; - int16_t dct4x4[4][4]; + int x = 4 * block_idx_x[idx]; + 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]; + DECLARE_ALIGNED( int16_t, dct4x4[4][4], 16 ); - h->dctf.sub4x4_dct( dct4x4, p_src, i_stride, p_dst, i_stride ); - quant_4x4( dct4x4, i_qscale, 1 ); - scan_zigzag_4x4full( h->dct.block[idx].luma4x4, dct4x4 ); - x264_mb_dequant_4x4( dct4x4, i_qscale ); + if( h->mb.b_lossless ) + { + h->zigzagf.sub_4x4( h->dct.block[idx].luma4x4, p_src, p_dst ); + return; + } + + h->dctf.sub4x4_dct( dct4x4, p_src, p_dst ); + + if( h->mb.b_trellis ) + x264_quant_4x4_trellis( h, dct4x4, CQM_4IY, i_qscale, DCT_LUMA_4x4, 1 ); + else + h->quantf.quant_4x4( dct4x4, h->quant4_mf[CQM_4IY][i_qscale], h->quant4_bias[CQM_4IY][i_qscale] ); + + 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 */ - h->dctf.add4x4_idct( p_dst, i_stride, dct4x4 ); + h->dctf.add4x4_idct( p_dst, dct4x4 ); } void x264_mb_encode_i8x8( x264_t *h, int idx, int i_qscale ) { - const int i_stride = h->mb.pic.i_stride[0]; - const int i_offset = 8 * (idx&1) + 8 * (idx>>1) * i_stride; - uint8_t *p_src = &h->mb.pic.p_fenc[0][i_offset]; - uint8_t *p_dst = &h->mb.pic.p_fdec[0][i_offset]; - int16_t dct8x8[8][8]; - - h->dctf.sub8x8_dct8( dct8x8, p_src, i_stride, p_dst, i_stride ); - quant_8x8( dct8x8, i_qscale, 1 ); - scan_zigzag_8x8full( h->dct.luma8x8[idx], dct8x8 ); - x264_mb_dequant_8x8( dct8x8, i_qscale ); - h->dctf.add8x8_idct8( p_dst, i_stride, dct8x8 ); + int x = 8 * (idx&1); + 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]; + 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 + h->quantf.quant_8x8( dct8x8, h->quant8_mf[CQM_8IY][i_qscale], h->quant8_bias[CQM_8IY][i_qscale] ); + + 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 ); } static void x264_mb_encode_i16x16( x264_t *h, int i_qscale ) { - const int i_stride = h->mb.pic.i_stride[0]; 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; - h->dctf.sub16x16_dct( &dct4x4[1], p_src, i_stride, p_dst, i_stride ); + if( h->mb.b_lossless ) + { + for( i = 0; i < 16; i++ ) + { + 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; + 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]; + } + h->zigzagf.scan_4x4( h->dct.luma16x16_dc, dct4x4[0] ); + return; + } + + h->dctf.sub16x16_dct( &dct4x4[1], p_src, p_dst ); for( i = 0; i < 16; i++ ) { /* copy dc coeff */ dct4x4[0][block_idx_y[i]][block_idx_x[i]] = dct4x4[1+i][0][0]; /* quant/scan/dequant */ - quant_4x4( dct4x4[1+i], i_qscale, 1 ); - scan_zigzag_4x4( h->dct.block[i].residual_ac, dct4x4[1+i] ); - x264_mb_dequant_4x4( dct4x4[1+i], i_qscale ); + if( h->mb.b_trellis ) + x264_quant_4x4_trellis( h, dct4x4[1+i], CQM_4IY, i_qscale, DCT_LUMA_AC, 1 ); + else + h->quantf.quant_4x4( dct4x4[1+i], h->quant4_mf[CQM_4IY][i_qscale], h->quant4_bias[CQM_4IY][i_qscale] ); + + 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( dct4x4[0], 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] ); - x264_mb_dequant_4x4_dc( dct4x4[0], i_qscale ); /* XXX not inversed */ + x264_mb_dequant_4x4_dc( dct4x4[0], h->dequant4_mf[CQM_4IY], i_qscale ); /* XXX not inversed */ /* calculate dct coeffs */ for( i = 0; i < 16; i++ ) @@ -466,76 +181,92 @@ static void x264_mb_encode_i16x16( x264_t *h, int i_qscale ) dct4x4[1+i][0][0] = dct4x4[0][block_idx_y[i]][block_idx_x[i]]; } /* put pixels to fdec */ - h->dctf.add16x16_idct( p_dst, i_stride, &dct4x4[1] ); + 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); for( ch = 0; ch < 2; ch++ ) { - const int i_stride = h->mb.pic.i_stride[1+ch]; uint8_t *p_src = h->mb.pic.p_fenc[1+ch]; 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 ); - h->dctf.sub8x8_dct( dct4x4, p_src, i_stride, p_dst, i_stride ); + if( h->mb.b_lossless ) + { + for( i = 0; i < 4; i++ ) + { + 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; + 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]; + } + continue; + } + + h->dctf.sub8x8_dct( dct4x4, p_src, p_dst ); /* calculate dct coeffs */ for( i = 0; i < 4; i++ ) { /* copy dc coeff */ dct2x2[block_idx_y[i]][block_idx_x[i]] = dct4x4[i][0][0]; - quant_4x4( dct4x4[i], i_qscale, b_inter ? 0 : 1 ); - scan_zigzag_4x4( h->dct.block[16+i+ch*4].residual_ac, dct4x4[i] ); - x264_mb_dequant_4x4( dct4x4[i], i_qscale ); + /* no trellis; it doesn't seem to help chroma noticeably */ + 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_inter ) + if( b_decimate ) { i_decimate_score += x264_mb_decimate_score( h->dct.block[16+i+ch*4].residual_ac, 15 ); } } h->dctf.dct2x2dc( dct2x2 ); - quant_2x2_dc( dct2x2, i_qscale, b_inter ? 0 : 1 ); - 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 ); - x264_mb_dequant_2x2_dc( dct2x2, i_qscale ); /* XXX not inversed */ + x264_mb_dequant_2x2_dc( dct2x2, h->dequant4_mf[CQM_4IC + b_inter], i_qscale ); /* XXX not inversed */ - if( b_inter && i_decimate_score < 7 ) + if( b_decimate && i_decimate_score < 7 ) { /* 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( dct2x2 ) ) + continue; + memset( dct4x4, 0, sizeof( dct4x4 ) ); + } + else + { for( i = 0; i < 4; i++ ) - { - int x, y; - for( x = 0; x < 15; x++ ) - { - h->dct.block[16+i+ch*4].residual_ac[x] = 0; - } - for( x = 0; x < 4; x++ ) - { - for( y = 0; y < 4; y++ ) - { - dct4x4[i][x][y] = 0; - } - } - } + h->quantf.dequant_4x4( dct4x4[i], h->dequant4_mf[CQM_4IC + b_inter], i_qscale ); } - /* calculate dct coeffs */ for( i = 0; i < 4; i++ ) - { - /* copy dc coeff */ - dct4x4[i][0][0] = dct2x2[block_idx_y[i]][block_idx_x[i]]; - } - h->dctf.add8x8_idct( p_dst, i_stride, dct4x4 ); + 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 ) @@ -565,18 +296,18 @@ 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], h->mb.pic.i_stride[0], - mvx, mvy, 16, 16 ); + 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], h->mb.pic.i_stride[1], - mvx, mvy, 8, 8 ); + 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], h->mb.pic.i_stride[2], - mvx, mvy, 8, 8 ); + 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 ); } @@ -587,9 +318,28 @@ void x264_macroblock_encode_pskip( x264_t *h ) void x264_macroblock_encode( x264_t *h ) { int i_cbp_dc = 0; - int i_qscale; + 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 */ @@ -604,45 +354,60 @@ void x264_macroblock_encode( x264_t *h ) return; } - /* quantification scale */ - i_qscale = h->mb.qp[h->mb.i_mb_xy]; - if( h->mb.i_type == I_16x16 ) { const int i_mode = h->mb.i_intra16x16_pred_mode; + h->mb.b_transform_8x8 = 0; /* do the right prediction */ - h->predict_16x16[i_mode]( h->mb.pic.p_fdec[0], h->mb.pic.i_stride[0] ); + h->predict_16x16[i_mode]( h->mb.pic.p_fdec[0] ); /* encode the 16x16 macroblock */ - x264_mb_encode_i16x16( h, i_qscale ); - - /* fix the pred mode value */ - h->mb.i_intra16x16_pred_mode = x264_mb_pred_mode16x16_fix[i_mode]; + x264_mb_encode_i16x16( h, i_qp ); } else if( h->mb.i_type == I_8x8 ) { - for( i = 0; i < 4; i++ ) + DECLARE_ALIGNED( uint8_t, edge[33], 16 ); + h->mb.b_transform_8x8 = 1; + /* 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++ ) { - const int i_dst = h->mb.pic.i_stride[0]; - uint8_t *p_dst = &h->mb.pic.p_fdec[0][8 * (i&1) + 8 * (i>>1) * i_dst]; + 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, i_dst, h->mb.i_neighbour8[i] ); - x264_mb_encode_i8x8( h, i, i_qscale ); - h->mb.cache.intra4x4_pred_mode[x264_scan8[4*i]] = x264_mb_pred_mode4x4_fix(i_mode); + 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 ) { - for( i = 0; i < 16; i++ ) + h->mb.b_transform_8x8 = 0; + /* 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++ ) { - const int i_dst = h->mb.pic.i_stride[0]; - uint8_t *p_dst = &h->mb.pic.p_fdec[0][4 * block_idx_x[i] + 4 * block_idx_y[i] * i_dst]; + 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]]; - h->predict_4x4[i_mode]( p_dst, i_dst ); - x264_mb_encode_i4x4( h, i, i_qscale ); - h->mb.cache.intra4x4_pred_mode[x264_scan8[i]] = x264_mb_pred_mode4x4_fix(i_mode); + if( (h->mb.i_neighbour4[i] & (MB_TOPRIGHT|MB_TOP)) == MB_TOP ) + /* emulate missing topright samples */ + *(uint32_t*) &p_dst[4-FDEC_STRIDE] = p_dst[3-FDEC_STRIDE] * 0x01010101U; + + h->predict_4x4[i_mode]( p_dst ); + x264_mb_encode_i4x4( h, i, i_qp ); } } else /* Inter MB */ @@ -653,41 +418,67 @@ void x264_macroblock_encode( x264_t *h ) /* Motion compensation */ x264_mb_mc( h ); - if( h->mb.b_transform_8x8 ) + if( h->mb.b_lossless ) + { + for( i4x4 = 0; i4x4 < 16; i4x4++ ) + { + int x = 4*block_idx_x[i4x4]; + int y = 4*block_idx_y[i4x4]; + 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]; - h->dctf.sub16x16_dct8( dct8x8, - h->mb.pic.p_fenc[0], h->mb.pic.i_stride[0], - h->mb.pic.p_fdec[0], h->mb.pic.i_stride[0] ); + 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] ); for( idx = 0; idx < 4; idx++ ) { - int i_decimate_8x8; + if( h->mb.b_noise_reduction ) + x264_denoise_dct( h, (int16_t*)dct8x8[idx] ); + if( h->mb.b_trellis ) + x264_quant_8x8_trellis( h, dct8x8[idx], CQM_8PY, i_qp, 0 ); + else + h->quantf.quant_8x8( dct8x8[idx], h->quant8_mf[CQM_8PY][i_qp], h->quant8_bias[CQM_8PY][i_qp] ); - quant_8x8( dct8x8[idx], i_qscale, 0 ); - scan_zigzag_8x8full( h->dct.luma8x8[idx], dct8x8[idx] ); - x264_mb_dequant_8x8( dct8x8[idx], i_qscale ); + h->zigzagf.scan_8x8( h->dct.luma8x8[idx], dct8x8[idx] ); - i_decimate_8x8 = x264_mb_decimate_score( h->dct.luma8x8[idx], 64 ); - i_decimate_mb += i_decimate_8x8; - if( i_decimate_8x8 < 4 ) + if( b_decimate ) { - memset( h->dct.luma8x8[idx], 0, sizeof( h->dct.luma8x8[idx] ) ); - memset( dct8x8[idx], 0, sizeof( dct8x8[idx] ) ); + int i_decimate_8x8 = x264_mb_decimate_score( h->dct.luma8x8[idx], 64 ); + i_decimate_mb += i_decimate_8x8; + if( i_decimate_8x8 < 4 ) + { + memset( h->dct.luma8x8[idx], 0, sizeof( h->dct.luma8x8[idx] ) ); + memset( dct8x8[idx], 0, sizeof( dct8x8[idx] ) ); + nnz8x8[idx] = 0; + } } + else + nnz8x8[idx] = array_non_zero( dct8x8[idx] ); } - if( i_decimate_mb < 6 ) + if( i_decimate_mb < 6 && b_decimate ) memset( h->dct.luma8x8, 0, sizeof( h->dct.luma8x8 ) ); else - h->dctf.add16x16_idct8( h->mb.pic.p_fdec[0], h->mb.pic.i_stride[0], dct8x8 ); + { + for( idx = 0; idx < 4; idx++ ) + if( nnz8x8[idx] ) + { + h->quantf.dequant_8x8( dct8x8[idx], h->dequant8_mf[CQM_8PY], i_qp ); + h->dctf.add8x8_idct8( &h->mb.pic.p_fdec[0][(idx&1)*8 + (idx>>1)*8*FDEC_STRIDE], dct8x8[idx] ); + } + } } else { - int16_t dct4x4[16][4][4]; - h->dctf.sub16x16_dct( dct4x4, - h->mb.pic.p_fenc[0], h->mb.pic.i_stride[0], - h->mb.pic.p_fdec[0], h->mb.pic.i_stride[0] ); + 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] ); for( i8x8 = 0; i8x8 < 4; i8x8++ ) { @@ -699,56 +490,56 @@ void x264_macroblock_encode( x264_t *h ) { idx = i8x8 * 4 + i4x4; - quant_4x4( dct4x4[idx], i_qscale, 0 ); - scan_zigzag_4x4full( h->dct.block[idx].luma4x4, dct4x4[idx] ); - x264_mb_dequant_4x4( dct4x4[idx], i_qscale ); - - i_decimate_8x8 += x264_mb_decimate_score( h->dct.block[idx].luma4x4, 16 ); + if( h->mb.b_noise_reduction ) + x264_denoise_dct( h, (int16_t*)dct4x4[idx] ); + if( h->mb.b_trellis ) + x264_quant_4x4_trellis( h, dct4x4[idx], CQM_4PY, i_qp, DCT_LUMA_4x4, 0 ); + else + h->quantf.quant_4x4( dct4x4[idx], h->quant4_mf[CQM_4PY][i_qp], h->quant4_bias[CQM_4PY][i_qp] ); + + 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 ); } /* decimate this 8x8 block */ i_decimate_mb += i_decimate_8x8; - if( i_decimate_8x8 < 4 ) + if( i_decimate_8x8 < 4 && b_decimate ) { - for( i4x4 = 0; i4x4 < 4; i4x4++ ) - { - int x, y; - idx = i8x8 * 4 + i4x4; - for( i = 0; i < 16; i++ ) - h->dct.block[idx].luma4x4[i] = 0; - for( x = 0; x < 4; x++ ) - for( y = 0; y < 4; y++ ) - dct4x4[idx][x][y] = 0; - } + memset( &dct4x4[i8x8*4], 0, 4 * sizeof( *dct4x4 ) ); + memset( &h->dct.block[i8x8*4], 0, 4 * sizeof( *h->dct.block ) ); + nnz8x8[i8x8] = 0; } } - if( i_decimate_mb < 6 ) - for( idx = 0; idx < 16; idx++ ) - for( i = 0; i < 16; i++ ) - h->dct.block[idx].luma4x4[i] = 0; + if( i_decimate_mb < 6 && b_decimate ) + memset( h->dct.block, 0, 16 * sizeof( *h->dct.block ) ); else - h->dctf.add16x16_idct( h->mb.pic.p_fdec[0], h->mb.pic.i_stride[0], dct4x4 ); + { + for( i8x8 = 0; i8x8 < 4; i8x8++ ) + if( nnz8x8[i8x8] ) + { + for( i = 0; i < 4; i++ ) + h->quantf.dequant_4x4( dct4x4[i8x8*4+i], h->dequant4_mf[CQM_4PY], i_qp ); + h->dctf.add8x8_idct( &h->mb.pic.p_fdec[0][(i8x8&1)*8 + (i8x8>>1)*8*FDEC_STRIDE], &dct4x4[i8x8*4] ); + } + } } } /* encode chroma */ - i_qscale = i_chroma_qp_table[x264_clip3( i_qscale + 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; - /* do the right prediction */ - h->predict_8x8c[i_mode]( h->mb.pic.p_fdec[1], h->mb.pic.i_stride[1] ); - h->predict_8x8c[i_mode]( h->mb.pic.p_fdec[2], h->mb.pic.i_stride[2] ); - - /* fix the pred mode value */ - h->mb.i_chroma_pred_mode = x264_mb_pred_mode8x8c_fix[i_mode]; + h->predict_8x8c[i_mode]( h->mb.pic.p_fdec[1] ); + h->predict_8x8c[i_mode]( h->mb.pic.p_fdec[2] ); } /* encode the 8x8 blocks */ - x264_mb_encode_8x8_chroma( h, !IS_INTRA( h->mb.i_type ), i_qscale ); + 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 ) { @@ -762,11 +553,11 @@ void x264_macroblock_encode( x264_t *h ) } else if( h->mb.b_transform_8x8 ) { - /* coded_block_flag is enough for CABAC, - * but CAVLC needs the full non_zero_count. */ + /* coded_block_flag is enough for CABAC. + * 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; @@ -785,77 +576,37 @@ 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_count( h->dct.chroma_dc[0], 4 ) > 0 || array_non_zero_count( h->dct.chroma_dc[1], 4 ) ) > 0 ) - { - h->mb.i_cbp_chroma = 0x01; /* dc only */ - } - if( h->param.b_cabac ) { - if( h->mb.i_type == I_16x16 && array_non_zero_count( h->dct.luma16x16_dc, 16 ) > 0 ) - i_cbp_dc = 0x01; - else - i_cbp_dc = 0x00; - - if( array_non_zero_count( h->dct.chroma_dc[0], 4 ) > 0 ) - i_cbp_dc |= 0x02; - if( array_non_zero_count( h->dct.chroma_dc[1], 4 ) > 0 ) - i_cbp_dc |= 0x04; + 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 */ h->mb.cbp[h->mb.i_mb_xy] = (i_cbp_dc << 8) | (h->mb.i_cbp_chroma << 4) | h->mb.i_cbp_luma; - if( h->mb.i_type != I_16x16 && h->mb.i_cbp_luma == 0 && h->mb.i_cbp_chroma == 0 ) - { - /* It won'y change anything at the decoder side but it is needed else the - * decoder will fail to read the next QP */ - h->mb.qp[h->mb.i_mb_xy] = h->mb.i_last_qp; - } - - /* 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 ) + if( !b_force_no_skip ) { - if( h->mb.cache.ref[0][x264_scan8[0]] == 0 ) + 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 ) { - 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] ) - { - h->mb.type[h->mb.i_mb_xy] = h->mb.i_type = P_SKIP; - h->mb.qp[h->mb.i_mb_xy] = h->mb.i_last_qp; /* Needed */ - } + 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.type[h->mb.i_mb_xy] = h->mb.i_type = B_SKIP; - h->mb.qp[h->mb.i_mb_xy] = h->mb.i_last_qp; /* Needed */ + /* 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; + } } - - if( h->mb.i_cbp_luma == 0 && h->mb.i_type != I_8x8 ) - h->mb.b_transform_8x8 = 0; } /***************************************************************************** @@ -863,38 +614,34 @@ 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 ); DECLARE_ALIGNED( int, dctscan[16], 16 ); - int i_qp; + int i_qp = h->mb.i_qp; int mvp[2]; int ch; int i8x8, i4x4; int i_decimate_mb; - /* quantization scale */ - i_qp = h->mb.qp[h->mb.i_mb_xy]; - 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], h->mb.pic.i_stride[0], - mvp[0], mvp[1], 16, 16 ); + 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 ); } /* get luma diff */ - h->dctf.sub16x16_dct( dct4x4, h->mb.pic.p_fenc[0], h->mb.pic.i_stride[0], - h->mb.pic.p_fdec[0], h->mb.pic.i_stride[0] ); + h->dctf.sub16x16_dct( dct4x4, h->mb.pic.p_fenc[0], + h->mb.pic.p_fdec[0] ); for( i8x8 = 0, i_decimate_mb = 0; i8x8 < 4; i8x8++ ) { @@ -903,8 +650,8 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) { const int idx = i8x8 * 4 + i4x4; - quant_4x4( dct4x4[idx], 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 ); @@ -917,22 +664,21 @@ 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++ ) { - const int i_stride = h->mb.pic.i_stride[1+ch]; uint8_t *p_src = h->mb.pic.p_fenc[1+ch]; uint8_t *p_dst = h->mb.pic.p_fdec[1+ch]; if( !b_bidir ) { - h->mc.mc_chroma( h->mb.pic.p_fref[0][0][4+ch], i_stride, - h->mb.pic.p_fdec[1+ch], i_stride, - mvp[0], mvp[1], 8, 8 ); + 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 ); } - h->dctf.sub8x8_dct( dct4x4, p_src, i_stride, p_dst, i_stride ); + h->dctf.sub8x8_dct( dct4x4, p_src, p_dst ); /* calculate dct DC */ dct2x2[0][0] = dct4x4[0][0][0]; @@ -940,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( dct2x2, 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 */ @@ -950,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( dct4x4[i4x4], 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 ) @@ -963,3 +709,150 @@ int x264_macroblock_probe_skip( x264_t *h, int b_bidir ) return 1; } + +/**************************************************************************** + * DCT-domain noise reduction / adaptive deadzone + * from libavcodec + ****************************************************************************/ + +void x264_noise_reduction_update( x264_t *h ) +{ + int cat, i; + for( cat = 0; cat < 2; cat++ ) + { + int size = cat ? 64 : 16; + const uint16_t *weight = cat ? x264_dct8_weight2_tab : x264_dct4_weight2_tab; + + if( h->nr_count[cat] > (cat ? (1<<16) : (1<<18)) ) + { + for( i = 0; i < size; i++ ) + h->nr_residual_sum[cat][i] >>= 1; + h->nr_count[cat] >>= 1; + } + + for( i = 0; i < size; i++ ) + h->nr_offset[cat][i] = + ((uint64_t)h->param.analyse.i_noise_reduction * h->nr_count[cat] + + h->nr_residual_sum[cat][i]/2) + / ((uint64_t)h->nr_residual_sum[cat][i] * weight[i]/256 + 1); + } +} + +void x264_denoise_dct( x264_t *h, int16_t *dct ) +{ + const int cat = h->mb.b_transform_8x8; + int i; + + h->nr_count[cat]++; + + for( i = (cat ? 63 : 15); i >= 1; i-- ) + { + int level = dct[i]; + if( level ) + { + if( level > 0 ) + { + h->nr_residual_sum[cat][i] += level; + level -= h->nr_offset[cat][i]; + if( level < 0 ) + level = 0; + } + else + { + h->nr_residual_sum[cat][i] -= level; + level += h->nr_offset[cat][i]; + if( level > 0 ) + level = 0; + } + dct[i] = level; + } + } +} + +/***************************************************************************** + * RD only; 4 calls to this do not make up for one macroblock_encode. + * doesn't transform chroma dc. + *****************************************************************************/ +void x264_macroblock_encode_p8x8( x264_t *h, int i8 ) +{ + int i_qp = h->mb.i_qp; + uint8_t *p_fenc = h->mb.pic.p_fenc[0] + (i8&1)*8 + (i8>>1)*8*FENC_STRIDE; + uint8_t *p_fdec = h->mb.pic.p_fdec[0] + (i8&1)*8 + (i8>>1)*8*FDEC_STRIDE; + int b_decimate = h->sh.i_type == SLICE_TYPE_B || h->param.analyse.b_dct_decimate; + int nnz8x8; + int ch; + + x264_mb_mc_8x8( h, i8 ); + + if( h->mb.b_transform_8x8 ) + { + DECLARE_ALIGNED( int16_t, dct8x8[8][8], 16 ); + h->dctf.sub8x8_dct8( dct8x8, p_fenc, p_fdec ); + 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( dct8x8 ); + + if( nnz8x8 ) + { + h->quantf.dequant_8x8( dct8x8, h->dequant8_mf[CQM_8PY], i_qp ); + h->dctf.add8x8_idct8( p_fdec, dct8x8 ); + } + } + else + { + int i4; + DECLARE_ALIGNED( int16_t, dct4x4[4][4][4], 16 ); + h->dctf.sub8x8_dct( dct4x4, p_fenc, p_fdec ); + 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++ ) + h->zigzagf.scan_4x4( h->dct.block[i8*4+i4].luma4x4, dct4x4[i4] ); + + if( b_decimate ) + { + int i_decimate_8x8 = 0; + for( i4 = 0; i4 < 4 && i_decimate_8x8 < 4; i4++ ) + i_decimate_8x8 += x264_mb_decimate_score( h->dct.block[i8*4+i4].luma4x4, 16 ); + nnz8x8 = 4 <= i_decimate_8x8; + } + else + nnz8x8 = array_non_zero( dct4x4 ); + + if( nnz8x8 ) + { + for( i4 = 0; i4 < 4; i4++ ) + h->quantf.dequant_4x4( dct4x4[i4], h->dequant4_mf[CQM_4PY], i_qp ); + h->dctf.add8x8_idct( p_fdec, dct4x4 ); + } + } + + i_qp = h->mb.i_chroma_qp; + + for( ch = 0; ch < 2; ch++ ) + { + 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 ); + 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 ); + } + } + + if( nnz8x8 ) + h->mb.i_cbp_luma |= (1 << i8); + else + h->mb.i_cbp_luma &= ~(1 << i8); + h->mb.i_cbp_chroma = 0x02; +}