/*****************************************************************************
* cabac.c: h264 encoder library
*****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: cabac.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $
+ * Copyright (C) 2003-2008 x264 project
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Loren Merritt <lorenm@u.washington.edu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
#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] =
+static inline void x264_cabac_mb_type_intra( x264_t *h, x264_cabac_t *cb, int i_mb_type,
+ int ctx0, int ctx1, int ctx2, int ctx3, int ctx4, int ctx5 )
{
- 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}
-};
+ if( i_mb_type == I_4x4 || i_mb_type == I_8x8 )
+ {
+ x264_cabac_encode_decision( cb, ctx0, 0 );
+ }
+ else if( i_mb_type == I_PCM )
+ {
+ x264_cabac_encode_decision( cb, ctx0, 1 );
+ x264_cabac_encode_flush( h, cb );
+ }
+ else
+ {
+ int i_pred = x264_mb_pred_mode16x16_fix[h->mb.i_intra16x16_pred_mode];
+
+ x264_cabac_encode_decision( cb, ctx0, 1 );
+ x264_cabac_encode_terminal( cb );
-static void x264_cabac_mb_type( x264_t *h )
+ x264_cabac_encode_decision( cb, ctx1, !!h->mb.i_cbp_luma );
+ if( h->mb.i_cbp_chroma == 0 )
+ {
+ x264_cabac_encode_decision( cb, ctx2, 0 );
+ }
+ else
+ {
+ x264_cabac_encode_decision( cb, ctx2, 1 );
+ x264_cabac_encode_decision( cb, ctx3, h->mb.i_cbp_chroma != 1 );
+ }
+ x264_cabac_encode_decision( cb, ctx4, i_pred>>1 );
+ x264_cabac_encode_decision( cb, ctx5, i_pred&1 );
+ }
+}
+
+static void x264_cabac_mb_type( x264_t *h, x264_cabac_t *cb )
{
const int i_mb_type = h->mb.i_type;
+ if( h->sh.b_mbaff &&
+ (!(h->mb.i_mb_y & 1) || IS_SKIP(h->mb.type[h->mb.i_mb_xy - h->mb.i_mb_stride])) )
+ {
+ x264_cabac_encode_decision( cb, 70 + h->mb.cache.i_neighbour_interlaced, h->mb.b_interlaced );
+ }
+
if( h->sh.i_type == SLICE_TYPE_I )
{
int ctx = 0;
- if( h->mb.i_mb_x > 0 && h->mb.type[h->mb.i_mb_xy - 1] != I_4x4 )
+ if( h->mb.i_mb_type_left >= 0 && h->mb.i_mb_type_left != I_4x4 )
{
ctx++;
}
- if( h->mb.i_mb_y > 0 && h->mb.type[h->mb.i_mb_xy - h->mb.i_mb_stride] != I_4x4 )
+ if( h->mb.i_mb_type_top >= 0 && h->mb.i_mb_type_top != I_4x4 )
{
ctx++;
}
- if( i_mb_type == I_4x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 3 + ctx, 0 );
- }
- else if( i_mb_type == I_PCM )
- {
- x264_cabac_encode_decision( &h->cabac, 3 + ctx, 1 );
- x264_cabac_encode_terminal( &h->cabac, 1 );
- }
- else /* I_16x16 */
- {
- x264_cabac_encode_decision( &h->cabac, 3 + ctx, 1 );
- x264_cabac_encode_terminal( &h->cabac, 0 );
-
- x264_cabac_encode_decision( &h->cabac, 3 + 3, ( h->mb.i_cbp_luma == 0 ? 0 : 1 ));
- if( h->mb.i_cbp_chroma == 0 )
- {
- x264_cabac_encode_decision( &h->cabac, 3 + 4, 0 );
- }
- else
- {
- x264_cabac_encode_decision( &h->cabac, 3 + 4, 1 );
- x264_cabac_encode_decision( &h->cabac, 3 + 5, ( h->mb.i_cbp_chroma == 1 ? 0 : 1 ) );
- }
- x264_cabac_encode_decision( &h->cabac, 3 + 6, ( (h->mb.i_intra16x16_pred_mode / 2) ? 1 : 0 ));
- x264_cabac_encode_decision( &h->cabac, 3 + 7, ( (h->mb.i_intra16x16_pred_mode % 2) ? 1 : 0 ));
- }
+ x264_cabac_mb_type_intra( h, cb, i_mb_type, 3+ctx, 3+3, 3+4, 3+5, 3+6, 3+7 );
}
else if( h->sh.i_type == SLICE_TYPE_P )
{
{
if( h->mb.i_partition == D_16x16 )
{
- x264_cabac_encode_decision( &h->cabac, 14, 0 );
- x264_cabac_encode_decision( &h->cabac, 15, 0 );
- x264_cabac_encode_decision( &h->cabac, 16, 0 );
+ x264_cabac_encode_decision( cb, 14, 0 );
+ x264_cabac_encode_decision( cb, 15, 0 );
+ x264_cabac_encode_decision( cb, 16, 0 );
}
else if( h->mb.i_partition == D_16x8 )
{
- x264_cabac_encode_decision( &h->cabac, 14, 0 );
- x264_cabac_encode_decision( &h->cabac, 15, 1 );
- x264_cabac_encode_decision( &h->cabac, 17, 1 );
+ x264_cabac_encode_decision( cb, 14, 0 );
+ x264_cabac_encode_decision( cb, 15, 1 );
+ x264_cabac_encode_decision( cb, 17, 1 );
}
else if( h->mb.i_partition == D_8x16 )
{
- x264_cabac_encode_decision( &h->cabac, 14, 0 );
- x264_cabac_encode_decision( &h->cabac, 15, 1 );
- x264_cabac_encode_decision( &h->cabac, 17, 0 );
+ x264_cabac_encode_decision( cb, 14, 0 );
+ x264_cabac_encode_decision( cb, 15, 1 );
+ x264_cabac_encode_decision( cb, 17, 0 );
}
}
else if( i_mb_type == P_8x8 )
{
- x264_cabac_encode_decision( &h->cabac, 14, 0 );
- x264_cabac_encode_decision( &h->cabac, 15, 0 );
- x264_cabac_encode_decision( &h->cabac, 16, 1 );
- }
- else if( i_mb_type == I_4x4 )
- {
- /* prefix */
- x264_cabac_encode_decision( &h->cabac, 14, 1 );
-
- x264_cabac_encode_decision( &h->cabac, 17, 0 );
+ x264_cabac_encode_decision( cb, 14, 0 );
+ x264_cabac_encode_decision( cb, 15, 0 );
+ x264_cabac_encode_decision( cb, 16, 1 );
}
- else if( i_mb_type == I_PCM )
+ else /* intra */
{
/* prefix */
- x264_cabac_encode_decision( &h->cabac, 14, 1 );
-
- x264_cabac_encode_decision( &h->cabac, 17, 1 );
- x264_cabac_encode_terminal( &h->cabac, 1 ); /*ctxIdx == 276 */
- }
- else /* intra 16x16 */
- {
- /* prefix */
- x264_cabac_encode_decision( &h->cabac, 14, 1 );
+ x264_cabac_encode_decision( cb, 14, 1 );
/* suffix */
- x264_cabac_encode_decision( &h->cabac, 17, 1 );
- x264_cabac_encode_terminal( &h->cabac, 0 ); /*ctxIdx == 276 */
-
- x264_cabac_encode_decision( &h->cabac, 17+1, ( h->mb.i_cbp_luma == 0 ? 0 : 1 ));
- if( h->mb.i_cbp_chroma == 0 )
- {
- x264_cabac_encode_decision( &h->cabac, 17+2, 0 );
- }
- else
- {
- x264_cabac_encode_decision( &h->cabac, 17+2, 1 );
- x264_cabac_encode_decision( &h->cabac, 17+2, ( h->mb.i_cbp_chroma == 1 ? 0 : 1 ) );
- }
- x264_cabac_encode_decision( &h->cabac, 17+3, ( (h->mb.i_intra16x16_pred_mode / 2) ? 1 : 0 ));
- x264_cabac_encode_decision( &h->cabac, 17+3, ( (h->mb.i_intra16x16_pred_mode % 2) ? 1 : 0 ));
+ x264_cabac_mb_type_intra( h, cb, i_mb_type, 17+0, 17+1, 17+2, 17+2, 17+3, 17+3 );
}
}
else if( h->sh.i_type == SLICE_TYPE_B )
{
int ctx = 0;
- if( h->mb.i_mb_x > 0 && h->mb.type[h->mb.i_mb_xy - 1] != B_SKIP && h->mb.type[h->mb.i_mb_xy - 1] != B_DIRECT )
+ if( h->mb.i_mb_type_left >= 0 && h->mb.i_mb_type_left != B_SKIP && h->mb.i_mb_type_left != B_DIRECT )
{
ctx++;
}
- if( h->mb.i_mb_y > 0 && h->mb.type[h->mb.i_mb_xy - h->mb.i_mb_stride] != B_SKIP && h->mb.type[h->mb.i_mb_xy - h->mb.i_mb_stride] != B_DIRECT )
+ if( h->mb.i_mb_type_top >= 0 && h->mb.i_mb_type_top != B_SKIP && h->mb.i_mb_type_top != B_DIRECT )
{
ctx++;
}
if( i_mb_type == B_DIRECT )
{
- x264_cabac_encode_decision( &h->cabac, 27+ctx, 0 );
+ x264_cabac_encode_decision( cb, 27+ctx, 0 );
}
else if( i_mb_type == B_8x8 )
{
- x264_cabac_encode_decision( &h->cabac, 27+ctx, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+3, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+4, 1 );
+ x264_cabac_encode_decision( cb, 27+ctx, 1 );
+ x264_cabac_encode_decision( cb, 27+3, 1 );
+ x264_cabac_encode_decision( cb, 27+4, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+5, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+5, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+5, 1 );
+ x264_cabac_encode_decision( cb, 27+5, 1 );
+ x264_cabac_encode_decision( cb, 27+5, 1 );
+ x264_cabac_encode_decision( cb, 27+5, 1 );
}
else if( IS_INTRA( i_mb_type ) )
{
/* prefix */
- x264_cabac_encode_decision( &h->cabac, 27+ctx, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+3, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+4, 1 );
+ x264_cabac_encode_decision( cb, 27+ctx, 1 );
+ x264_cabac_encode_decision( cb, 27+3, 1 );
+ x264_cabac_encode_decision( cb, 27+4, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+5, 1 );
- x264_cabac_encode_decision( &h->cabac, 27+5, 0 );
- x264_cabac_encode_decision( &h->cabac, 27+5, 1 );
+ x264_cabac_encode_decision( cb, 27+5, 1 );
+ x264_cabac_encode_decision( cb, 27+5, 0 );
+ x264_cabac_encode_decision( cb, 27+5, 1 );
- /* Suffix */
- if( i_mb_type == I_4x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 32, 0 );
- }
- else if( i_mb_type == I_PCM )
- {
- x264_cabac_encode_decision( &h->cabac, 32, 1 );
- x264_cabac_encode_terminal( &h->cabac, 1 );
- }
- else
- {
- x264_cabac_encode_decision( &h->cabac, 32, 1 );
- x264_cabac_encode_terminal( &h->cabac, 0 );
-
- /* TODO */
- x264_cabac_encode_decision( &h->cabac, 32+1, ( h->mb.i_cbp_luma == 0 ? 0 : 1 ));
- if( h->mb.i_cbp_chroma == 0 )
- {
- x264_cabac_encode_decision( &h->cabac, 32+2, 0 );
- }
- else
- {
- x264_cabac_encode_decision( &h->cabac, 32+2, 1 );
- x264_cabac_encode_decision( &h->cabac, 32+2, ( h->mb.i_cbp_chroma == 1 ? 0 : 1 ) );
- }
- x264_cabac_encode_decision( &h->cabac, 32+3, ( (h->mb.i_intra16x16_pred_mode / 2) ? 1 : 0 ));
- x264_cabac_encode_decision( &h->cabac, 32+3, ( (h->mb.i_intra16x16_pred_mode % 2) ? 1 : 0 ));
- }
+ /* suffix */
+ x264_cabac_mb_type_intra( h, cb, i_mb_type, 32+0, 32+1, 32+2, 32+2, 32+3, 32+3 );
}
else
{
- static const int i_mb_len[21] =
+ static const int i_mb_len[9*3] =
{
- 3, 6, 6, /* L0 L0 */
- 3, 6, 6, /* L1 L1 */
- 6, 7, 7, /* BI BI */
-
- 6, 6, /* L0 L1 */
- 6, 6, /* L1 L0 */
- 7, 7, /* L0 BI */
- 7, 7, /* L1 BI */
- 7, 7, /* BI L0 */
- 7, 7, /* BI L1 */
+ 6, 6, 3, /* L0 L0 */
+ 6, 6, 0, /* L0 L1 */
+ 7, 7, 0, /* L0 BI */
+ 6, 6, 0, /* L1 L0 */
+ 6, 6, 3, /* L1 L1 */
+ 7, 7, 0, /* L1 BI */
+ 7, 7, 0, /* BI L0 */
+ 7, 7, 0, /* BI L1 */
+ 7, 7, 6, /* BI BI */
};
- static const int i_mb_bits[21][7] =
+ static const int i_mb_bits[9*3][7] =
{
- { 1, 0, 0, }, { 1, 1, 0, 0, 0, 1, }, { 1, 1, 0, 0, 1, 0, }, /* L0 L0 */
- { 1, 0, 1, }, { 1, 1, 0, 0, 1, 1, }, { 1, 1, 0, 1, 0, 0, }, /* L1 L1 */
- { 1, 1, 0, 0, 0, 0 ,}, { 1, 1, 1, 1, 0, 0 , 0 }, { 1, 1, 1, 1, 0, 0 , 1 },/* BI BI */
-
- { 1, 1, 0, 1, 0, 1, }, { 1, 1, 0, 1, 1, 0, }, /* L0 L1 */
- { 1, 1, 0, 1, 1, 1, }, { 1, 1, 1, 1, 1, 0, }, /* L1 L0 */
- { 1, 1, 1, 0, 0, 0, 0 }, { 1, 1, 1, 0, 0, 0, 1 }, /* L0 BI */
- { 1, 1, 1, 0, 0, 1, 0 }, { 1, 1, 1, 0, 0, 1, 1 }, /* L1 BI */
- { 1, 1, 1, 0, 1, 0, 0 }, { 1, 1, 1, 0, 1, 0, 1 }, /* BI L0 */
- { 1, 1, 1, 0, 1, 1, 0 }, { 1, 1, 1, 0, 1, 1, 1 } /* BI L1 */
+ { 1,1,0,0,0,1 }, { 1,1,0,0,1,0, }, { 1,0,0 }, /* L0 L0 */
+ { 1,1,0,1,0,1 }, { 1,1,0,1,1,0 }, {0}, /* L0 L1 */
+ { 1,1,1,0,0,0,0 }, { 1,1,1,0,0,0,1 }, {0}, /* L0 BI */
+ { 1,1,0,1,1,1 }, { 1,1,1,1,1,0 }, {0}, /* L1 L0 */
+ { 1,1,0,0,1,1 }, { 1,1,0,1,0,0 }, { 1,0,1 }, /* L1 L1 */
+ { 1,1,1,0,0,1,0 }, { 1,1,1,0,0,1,1 }, {0}, /* L1 BI */
+ { 1,1,1,0,1,0,0 }, { 1,1,1,0,1,0,1 }, {0}, /* BI L0 */
+ { 1,1,1,0,1,1,0 }, { 1,1,1,0,1,1,1 }, {0}, /* BI L1 */
+ { 1,1,1,1,0,0,0 }, { 1,1,1,1,0,0,1 }, { 1,1,0,0,0,0 }, /* BI BI */
};
- const int i_partition = h->mb.i_partition;
- int idx = 0;
+ const int idx = (i_mb_type - B_L0_L0) * 3 + (h->mb.i_partition - D_16x8);
int i;
- switch( i_mb_type )
- {
- /* D_16x16, D_16x8, D_8x16 */
- case B_BI_BI: idx += 3;
- case B_L1_L1: idx += 3;
- case B_L0_L0:
- if( i_partition == D_16x8 )
- idx += 1;
- else if( i_partition == D_8x16 )
- idx += 2;
- break;
-
- /* D_16x8, D_8x16 */
- case B_BI_L1: idx += 2;
- case B_BI_L0: idx += 2;
- case B_L1_BI: idx += 2;
- case B_L0_BI: idx += 2;
- case B_L1_L0: idx += 2;
- case B_L0_L1:
- idx += 3*3;
- if( i_partition == D_8x16 )
- idx++;
- break;
- default:
- fprintf( stderr, "error in B mb type\n" );
- return;
- }
- x264_cabac_encode_decision( &h->cabac, 27+ctx, i_mb_bits[idx][0] );
- x264_cabac_encode_decision( &h->cabac, 27+3, i_mb_bits[idx][1] );
- x264_cabac_encode_decision( &h->cabac, 27+(i_mb_bits[idx][1] != 0 ? 4 : 5), i_mb_bits[idx][2] );
+ x264_cabac_encode_decision( cb, 27+ctx, i_mb_bits[idx][0] );
+ x264_cabac_encode_decision( cb, 27+3, i_mb_bits[idx][1] );
+ x264_cabac_encode_decision( cb, 27+5-i_mb_bits[idx][1], i_mb_bits[idx][2] );
for( i = 3; i < i_mb_len[idx]; i++ )
- {
- x264_cabac_encode_decision( &h->cabac, 27+5, i_mb_bits[idx][i] );
- }
+ x264_cabac_encode_decision( cb, 27+5, i_mb_bits[idx][i] );
}
}
else
{
- fprintf( stderr, "unknown SLICE_TYPE unsupported in x264_macroblock_write_cabac\n" );
+ x264_log(h, X264_LOG_ERROR, "unknown SLICE_TYPE unsupported in x264_macroblock_write_cabac\n" );
}
}
-static void x264_cabac_mb_intra4x4_pred_mode( x264_t *h, int i_pred, int i_mode )
+static void x264_cabac_mb_intra4x4_pred_mode( x264_cabac_t *cb, int i_pred, int i_mode )
{
if( i_pred == i_mode )
{
/* b_prev_intra4x4_pred_mode */
- x264_cabac_encode_decision( &h->cabac, 68, 1 );
+ x264_cabac_encode_decision( cb, 68, 1 );
}
else
{
/* b_prev_intra4x4_pred_mode */
- x264_cabac_encode_decision( &h->cabac, 68, 0 );
+ x264_cabac_encode_decision( cb, 68, 0 );
if( i_mode > i_pred )
{
i_mode--;
}
- x264_cabac_encode_decision( &h->cabac, 69, (i_mode )&0x01 );
- x264_cabac_encode_decision( &h->cabac, 69, (i_mode >> 1)&0x01 );
- x264_cabac_encode_decision( &h->cabac, 69, (i_mode >> 2)&0x01 );
+ x264_cabac_encode_decision( cb, 69, (i_mode )&0x01 );
+ x264_cabac_encode_decision( cb, 69, (i_mode >> 1)&0x01 );
+ x264_cabac_encode_decision( cb, 69, (i_mode >> 2)&0x01 );
}
}
-static void x264_cabac_mb_intra8x8_pred_mode( x264_t *h )
+
+static void x264_cabac_mb_intra_chroma_pred_mode( x264_t *h, x264_cabac_t *cb )
{
- const int i_mode = h->mb.i_chroma_pred_mode;
+ const int i_mode = x264_mb_pred_mode8x8c_fix[ h->mb.i_chroma_pred_mode ];
int ctx = 0;
/* No need to test for I4x4 or I_16x16 as cache_save handle that */
- if( h->mb.i_mb_x > 0 && h->mb.chroma_pred_mode[h->mb.i_mb_xy - 1] != 0 )
+ if( (h->mb.i_neighbour & MB_LEFT) && h->mb.chroma_pred_mode[h->mb.i_mb_xy - 1] != 0 )
{
ctx++;
}
- if( h->mb.i_mb_y > 0 && h->mb.chroma_pred_mode[h->mb.i_mb_xy - h->mb.i_mb_stride] != 0 )
+ if( (h->mb.i_neighbour & MB_TOP) && h->mb.chroma_pred_mode[h->mb.i_mb_top_xy] != 0 )
{
ctx++;
}
- if( i_mode == 0 )
+ x264_cabac_encode_decision( cb, 64 + ctx, i_mode > 0 );
+ if( i_mode > 0 )
{
- x264_cabac_encode_decision( &h->cabac, 64 + ctx, 0 );
- }
- else
- {
- x264_cabac_encode_decision( &h->cabac, 64 + ctx, 1 );
- x264_cabac_encode_decision( &h->cabac, 64 + 3, ( i_mode == 1 ? 0 : 1 ) );
+ x264_cabac_encode_decision( cb, 64 + 3, i_mode > 1 );
if( i_mode > 1 )
{
- x264_cabac_encode_decision( &h->cabac, 64 + 3, ( i_mode == 2 ? 0 : 1 ) );
+ x264_cabac_encode_decision( cb, 64 + 3, i_mode > 2 );
}
}
}
-static void x264_cabac_mb_cbp_luma( x264_t *h )
+static void x264_cabac_mb_cbp_luma( x264_t *h, x264_cabac_t *cb )
{
- /* TODO: clean up and optimize */
- int i8x8;
- for( i8x8 = 0; i8x8 < 4; i8x8++ )
- {
- int i_mba_xy = -1;
- int i_mbb_xy = -1;
- int x = block_idx_x[4*i8x8];
- int y = block_idx_y[4*i8x8];
- int ctx = 0;
-
- if( x > 0 )
- i_mba_xy = h->mb.i_mb_xy;
- else if( h->mb.i_mb_x > 0 )
- i_mba_xy = h->mb.i_mb_xy - 1;
-
- if( y > 0 )
- i_mbb_xy = h->mb.i_mb_xy;
- else if( h->mb.i_mb_y > 0 )
- i_mbb_xy = h->mb.i_mb_xy - h->mb.i_mb_stride;
-
-
- /* No need to test for PCM and SKIP */
- if( i_mba_xy >= 0 )
- {
- const int i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
- if( ((h->mb.cbp[i_mba_xy] >> i8x8a)&0x01) == 0 )
- {
- ctx++;
- }
- }
-
- if( i_mbb_xy >= 0 )
- {
- const int i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
- if( ((h->mb.cbp[i_mbb_xy] >> i8x8b)&0x01) == 0 )
- {
- ctx += 2;
- }
- }
-
- x264_cabac_encode_decision( &h->cabac, 73 + ctx, (h->mb.i_cbp_luma >> i8x8)&0x01 );
- }
+ int cbp = h->mb.i_cbp_luma;
+ int cbp_l = h->mb.i_neighbour & MB_LEFT ? h->mb.cbp[h->mb.i_mb_xy - 1] : -1;
+ int cbp_t = h->mb.i_neighbour & MB_TOP ? h->mb.cbp[h->mb.i_mb_top_xy] : -1;
+ x264_cabac_encode_decision( cb, 76 - ((cbp_l >> 1) & 1) - ((cbp_t >> 1) & 2), (h->mb.i_cbp_luma >> 0) & 1 );
+ x264_cabac_encode_decision( cb, 76 - ((cbp >> 0) & 1) - ((cbp_t >> 2) & 2), (h->mb.i_cbp_luma >> 1) & 1 );
+ x264_cabac_encode_decision( cb, 76 - ((cbp_l >> 3) & 1) - ((cbp << 1) & 2), (h->mb.i_cbp_luma >> 2) & 1 );
+ x264_cabac_encode_decision( cb, 76 - ((cbp >> 2) & 1) - ((cbp >> 0) & 2), (h->mb.i_cbp_luma >> 3) & 1 );
}
-static void x264_cabac_mb_cbp_chroma( x264_t *h )
+static void x264_cabac_mb_cbp_chroma( x264_t *h, x264_cabac_t *cb )
{
int cbp_a = -1;
int cbp_b = -1;
int ctx;
/* No need to test for SKIP/PCM */
- if( h->mb.i_mb_x > 0 )
+ if( h->mb.i_neighbour & MB_LEFT )
{
cbp_a = (h->mb.cbp[h->mb.i_mb_xy - 1] >> 4)&0x3;
}
- if( h->mb.i_mb_y > 0 )
+ if( h->mb.i_neighbour & MB_TOP )
{
- cbp_b = (h->mb.cbp[h->mb.i_mb_xy - h->mb.i_mb_stride] >> 4)&0x3;
+ cbp_b = (h->mb.cbp[h->mb.i_mb_top_xy] >> 4)&0x3;
}
ctx = 0;
if( cbp_b > 0 ) ctx += 2;
if( h->mb.i_cbp_chroma == 0 )
{
- x264_cabac_encode_decision( &h->cabac, 77 + ctx, 0 );
+ x264_cabac_encode_decision( cb, 77 + ctx, 0 );
}
else
{
- x264_cabac_encode_decision( &h->cabac, 77 + ctx, 1 );
+ x264_cabac_encode_decision( cb, 77 + ctx, 1 );
ctx = 4;
if( cbp_a == 2 ) ctx++;
if( cbp_b == 2 ) ctx += 2;
- x264_cabac_encode_decision( &h->cabac, 77 + ctx, h->mb.i_cbp_chroma > 1 ? 1 : 0 );
+ x264_cabac_encode_decision( cb, 77 + ctx, h->mb.i_cbp_chroma > 1 );
}
}
/* TODO check it with != qp per mb */
-static void x264_cabac_mb_qp_delta( x264_t *h )
+static void x264_cabac_mb_qp_delta( x264_t *h, x264_cabac_t *cb )
{
- int i_mbn_xy = h->mb.i_mb_xy - 1;
- int i_dqp = h->mb.qp[h->mb.i_mb_xy] - h->mb.i_last_qp;
- int val = i_dqp <= 0 ? (-2*i_dqp) : (2*i_dqp - 1);
+ int i_mbn_xy = h->mb.i_mb_prev_xy;
+ int i_dqp = h->mb.i_qp - h->mb.i_last_qp;
int ctx;
+ /* Avoid writing a delta quant if we have an empty i16x16 block, e.g. in a completely flat background area */
+ if( h->mb.i_type == I_16x16 && !h->mb.cbp[h->mb.i_mb_xy] )
+ {
+#ifndef RDO_SKIP_BS
+ h->mb.i_qp = h->mb.i_last_qp;
+#endif
+ i_dqp = 0;
+ }
+
/* No need to test for PCM / SKIP */
- if( i_mbn_xy >= 0 && h->mb.i_last_dqp != 0 &&
+ if( h->mb.i_last_dqp &&
( h->mb.type[i_mbn_xy] == I_16x16 || (h->mb.cbp[i_mbn_xy]&0x3f) ) )
ctx = 1;
else
ctx = 0;
- while( val > 0 )
+ if( i_dqp != 0 )
{
- x264_cabac_encode_decision( &h->cabac, 60 + ctx, 1 );
- if( ctx < 2 )
- ctx = 2;
- else
- ctx = 3;
- val--;
+ int val = i_dqp <= 0 ? (-2*i_dqp) : (2*i_dqp - 1);
+ /* dqp is interpreted modulo 52 */
+ if( val >= 51 && val != 52 )
+ val = 103 - val;
+ while( val-- )
+ {
+ x264_cabac_encode_decision( cb, 60 + ctx, 1 );
+ if( ctx < 2 )
+ ctx = 2;
+ else
+ ctx = 3;
+ }
}
- x264_cabac_encode_decision( &h->cabac, 60 + ctx, 0 );
+ x264_cabac_encode_decision( cb, 60 + ctx, 0 );
}
+#ifndef RDO_SKIP_BS
void x264_cabac_mb_skip( x264_t *h, int b_skip )
{
- int ctx = 0;
-
- if( h->mb.i_mb_x > 0 && !IS_SKIP( h->mb.type[h->mb.i_mb_xy -1]) )
- {
- ctx++;
- }
- if( h->mb.i_mb_y > 0 && !IS_SKIP( h->mb.type[h->mb.i_mb_xy -h->mb.i_mb_stride]) )
- {
- ctx++;
- }
-
- if( h->sh.i_type == SLICE_TYPE_P )
- x264_cabac_encode_decision( &h->cabac, 11 + ctx, b_skip ? 1 : 0 );
- else /* SLICE_TYPE_B */
- x264_cabac_encode_decision( &h->cabac, 24 + ctx, b_skip ? 1 : 0 );
+ int ctx = (h->mb.i_mb_type_left >= 0 && !IS_SKIP( h->mb.i_mb_type_left ))
+ + (h->mb.i_mb_type_top >= 0 && !IS_SKIP( h->mb.i_mb_type_top ))
+ + (h->sh.i_type == SLICE_TYPE_P ? 11 : 24);
+ x264_cabac_encode_decision( &h->cabac, ctx, b_skip );
}
+#endif
-static inline void x264_cabac_mb_sub_p_partition( x264_t *h, int i_sub )
+static inline void x264_cabac_mb_sub_p_partition( x264_cabac_t *cb, int i_sub )
{
if( i_sub == D_L0_8x8 )
{
- x264_cabac_encode_decision( &h->cabac, 21, 1 );
+ x264_cabac_encode_decision( cb, 21, 1 );
}
else if( i_sub == D_L0_8x4 )
{
- x264_cabac_encode_decision( &h->cabac, 21, 0 );
- x264_cabac_encode_decision( &h->cabac, 22, 0 );
+ x264_cabac_encode_decision( cb, 21, 0 );
+ x264_cabac_encode_decision( cb, 22, 0 );
}
else if( i_sub == D_L0_4x8 )
{
- x264_cabac_encode_decision( &h->cabac, 21, 0 );
- x264_cabac_encode_decision( &h->cabac, 22, 1 );
- x264_cabac_encode_decision( &h->cabac, 23, 1 );
+ x264_cabac_encode_decision( cb, 21, 0 );
+ x264_cabac_encode_decision( cb, 22, 1 );
+ x264_cabac_encode_decision( cb, 23, 1 );
}
else if( i_sub == D_L0_4x4 )
{
- x264_cabac_encode_decision( &h->cabac, 21, 0 );
- x264_cabac_encode_decision( &h->cabac, 22, 1 );
- x264_cabac_encode_decision( &h->cabac, 23, 0 );
+ x264_cabac_encode_decision( cb, 21, 0 );
+ x264_cabac_encode_decision( cb, 22, 1 );
+ x264_cabac_encode_decision( cb, 23, 0 );
}
}
-static inline void x264_cabac_mb_sub_b_partition( x264_t *h, int i_sub )
+static NOINLINE void x264_cabac_mb_sub_b_partition( x264_cabac_t *cb, int i_sub )
{
+ static const uint8_t part_bits[12][7] = {
+ {6,1,1,1,0,1,1}, // D_L0_4x4
+ {5,1,1,0,0,1}, // D_L0_8x4
+ {5,1,1,0,1,0}, // D_L0_4x8
+ {3,1,0,0}, // D_L0_8x8
+ {5,1,1,1,1,0}, // D_L1_4x4
+ {5,1,1,0,1,1}, // D_L1_8x4
+ {6,1,1,1,0,0,0}, // D_L1_4x8
+ {3,1,0,1}, // D_L1_8x8
+ {5,1,1,1,1,1}, // D_BI_4x4
+ {6,1,1,1,0,0,1}, // D_BI_8x4
+ {6,1,1,1,0,1,0}, // D_BI_4x8
+ {5,1,1,0,0,0}, // D_BI_8x8
+ };
+ int len;
if( i_sub == D_DIRECT_8x8 )
{
- x264_cabac_encode_decision( &h->cabac, 36, 0 );
- }
- else if( i_sub == D_L0_8x8 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- }
- else if( i_sub == D_L1_8x8 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- }
- else if( i_sub == D_BI_8x8 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- }
- else if( i_sub == D_L0_8x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- }
- else if( i_sub == D_L0_4x8 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- }
- else if( i_sub == D_L1_8x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- }
- else if( i_sub == D_L1_4x8 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- }
- else if( i_sub == D_BI_8x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- }
- else if( i_sub == D_BI_4x8 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- }
- else if( i_sub == D_L0_4x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- }
- else if( i_sub == D_L1_4x4 )
- {
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 0 );
+ x264_cabac_encode_decision( cb, 36, 0 );
+ return;
}
- else if( i_sub == D_BI_4x4 )
+ len = part_bits[i_sub][0];
+ x264_cabac_encode_decision( cb, 36, part_bits[i_sub][1] );
+ x264_cabac_encode_decision( cb, 37, part_bits[i_sub][2] );
+ if( len == 3 )
+ x264_cabac_encode_decision( cb, 39, part_bits[i_sub][3] );
+ else
{
- x264_cabac_encode_decision( &h->cabac, 36, 1 );
- x264_cabac_encode_decision( &h->cabac, 37, 1 );
- x264_cabac_encode_decision( &h->cabac, 38, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
- x264_cabac_encode_decision( &h->cabac, 39, 1 );
+ x264_cabac_encode_decision( cb, 38, part_bits[i_sub][3] );
+ x264_cabac_encode_decision( cb, 39, part_bits[i_sub][4] );
+ x264_cabac_encode_decision( cb, 39, part_bits[i_sub][5] );
+ if( len == 6 )
+ x264_cabac_encode_decision( cb, 39, part_bits[i_sub][6] );
}
}
-static inline void x264_cabac_mb_ref( x264_t *h, int i_list, int idx )
+static inline void x264_cabac_mb_transform_size( x264_t *h, x264_cabac_t *cb )
+{
+ int ctx = 399 + h->mb.cache.i_neighbour_transform_size;
+ x264_cabac_encode_decision( cb, ctx, h->mb.b_transform_8x8 );
+}
+
+static inline void x264_cabac_mb_ref( x264_t *h, x264_cabac_t *cb, int i_list, int idx )
{
const int i8 = x264_scan8[idx];
const int i_refa = h->mb.cache.ref[i_list][i8 - 1];
while( i_ref > 0 )
{
- x264_cabac_encode_decision( &h->cabac, 54 + ctx, 1 );
+ x264_cabac_encode_decision( cb, 54 + ctx, 1 );
if( ctx < 4 )
ctx = 4;
else
i_ref--;
}
- x264_cabac_encode_decision( &h->cabac, 54 + ctx, 0 );
+ x264_cabac_encode_decision( cb, 54 + ctx, 0 );
}
-static inline void x264_cabac_mb_mvd_cpn( x264_t *h, int i_list, int idx, int l, int mvd )
+static inline void x264_cabac_mb_mvd_cpn( x264_t *h, x264_cabac_t *cb, int i_list, int idx, int l, int mvd )
{
+ static const uint8_t transition[7] = { 3,3,3,4,5,6,6 };
const int amvd = abs( h->mb.cache.mvd[i_list][x264_scan8[idx] - 1][l] ) +
abs( h->mb.cache.mvd[i_list][x264_scan8[idx] - 8][l] );
const int i_abs = abs( mvd );
const int i_prefix = X264_MIN( i_abs, 9 );
- const int ctxbase = (l == 0 ? 40 : 47);
- int ctx;
+ const int ctxbase = l ? 47 : 40;
+ int ctx = (amvd>2) + (amvd>32);
int i;
-
- if( amvd < 3 )
- ctx = 0;
- else if( amvd > 32 )
- ctx = 2;
- else
- ctx = 1;
-
for( i = 0; i < i_prefix; i++ )
{
- x264_cabac_encode_decision( &h->cabac, ctxbase + ctx, 1 );
- if( ctx < 3 )
- ctx = 3;
- else if( ctx < 6 )
- ctx++;
+ x264_cabac_encode_decision( cb, ctxbase + ctx, 1 );
+ ctx = transition[ctx];
}
if( i_prefix < 9 )
- {
- x264_cabac_encode_decision( &h->cabac, ctxbase + ctx, 0 );
- }
-
- if( i_prefix >= 9 )
- {
- int i_suffix = i_abs - 9;
- int k = 3;
-
- while( i_suffix >= (1<<k) )
- {
- x264_cabac_encode_bypass( &h->cabac, 1 );
- i_suffix -= 1 << k;
- k++;
- }
- x264_cabac_encode_bypass( &h->cabac, 0 );
- while( k-- )
- {
- x264_cabac_encode_bypass( &h->cabac, (i_suffix >> k)&0x01 );
- }
- }
+ x264_cabac_encode_decision( cb, ctxbase + ctx, 0 );
+ else
+ x264_cabac_encode_ue_bypass( cb, 3, i_abs - 9 );
/* sign */
- if( mvd > 0 )
- x264_cabac_encode_bypass( &h->cabac, 0 );
- else if( mvd < 0 )
- x264_cabac_encode_bypass( &h->cabac, 1 );
+ if( mvd )
+ x264_cabac_encode_bypass( cb, mvd < 0 );
}
-static inline void x264_cabac_mb_mvd( x264_t *h, int i_list, int idx, int width, int height )
+static inline void x264_cabac_mb_mvd( x264_t *h, x264_cabac_t *cb, int i_list, int idx, int width, int height )
{
- int mvp[2];
+ DECLARE_ALIGNED_4( int16_t mvp[2] );
int mdx, mdy;
/* Calculate mvd */
mdy = h->mb.cache.mv[i_list][x264_scan8[idx]][1] - mvp[1];
/* encode */
- x264_cabac_mb_mvd_cpn( h, i_list, idx, 0, mdx );
- x264_cabac_mb_mvd_cpn( h, i_list, idx, 1, mdy );
+ x264_cabac_mb_mvd_cpn( h, cb, i_list, idx, 0, mdx );
+ x264_cabac_mb_mvd_cpn( h, cb, i_list, idx, 1, mdy );
/* save value */
- x264_macroblock_cache_mvd( h, block_idx_x[idx], block_idx_y[idx], width, height, i_list, mdx, mdy );
+ x264_macroblock_cache_mvd( h, block_idx_x[idx], block_idx_y[idx], width, height, i_list, pack16to32_mask(mdx,mdy) );
}
-static inline void x264_cabac_mb8x8_mvd( x264_t *h, int i_list )
+static inline void x264_cabac_mb8x8_mvd( x264_t *h, x264_cabac_t *cb, int i_list, int i )
{
- int i;
- for( i = 0; i < 4; i++ )
- {
- if( !x264_mb_partition_listX_table[i_list][ h->mb.i_sub_partition[i] ] )
- {
- continue;
- }
+ if( !x264_mb_partition_listX_table[i_list][ h->mb.i_sub_partition[i] ] )
+ return;
- switch( h->mb.i_sub_partition[i] )
- {
- case D_L0_8x8:
- case D_L1_8x8:
- case D_BI_8x8:
- x264_cabac_mb_mvd( h, i_list, 4*i, 2, 2 );
- break;
- case D_L0_8x4:
- case D_L1_8x4:
- case D_BI_8x4:
- x264_cabac_mb_mvd( h, i_list, 4*i+0, 2, 1 );
- x264_cabac_mb_mvd( h, i_list, 4*i+2, 2, 1 );
- break;
- case D_L0_4x8:
- case D_L1_4x8:
- case D_BI_4x8:
- x264_cabac_mb_mvd( h, i_list, 4*i+0, 1, 2 );
- x264_cabac_mb_mvd( h, i_list, 4*i+1, 1, 2 );
- break;
- case D_L0_4x4:
- case D_L1_4x4:
- case D_BI_4x4:
- x264_cabac_mb_mvd( h, i_list, 4*i+0, 1, 1 );
- x264_cabac_mb_mvd( h, i_list, 4*i+1, 1, 1 );
- x264_cabac_mb_mvd( h, i_list, 4*i+2, 1, 1 );
- x264_cabac_mb_mvd( h, i_list, 4*i+3, 1, 1 );
- break;
- }
+ switch( h->mb.i_sub_partition[i] )
+ {
+ case D_L0_8x8:
+ case D_L1_8x8:
+ case D_BI_8x8:
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i, 2, 2 );
+ break;
+ case D_L0_8x4:
+ case D_L1_8x4:
+ case D_BI_8x4:
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+0, 2, 1 );
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+2, 2, 1 );
+ break;
+ case D_L0_4x8:
+ case D_L1_4x8:
+ case D_BI_4x8:
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+0, 1, 2 );
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+1, 1, 2 );
+ break;
+ case D_L0_4x4:
+ case D_L1_4x4:
+ case D_BI_4x4:
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+0, 1, 1 );
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+1, 1, 1 );
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+2, 1, 1 );
+ x264_cabac_mb_mvd( h, cb, i_list, 4*i+3, 1, 1 );
+ break;
}
}
static int x264_cabac_mb_cbf_ctxidxinc( x264_t *h, int i_cat, int i_idx )
{
- /* TODO: clean up/optimize */
+ /* i_ctxBlockCat: 0-> DC 16x16 i_idx = 0
+ * 1-> AC 16x16 i_idx = luma4x4idx
+ * 2-> Luma4x4 i_idx = luma4x4idx
+ * 3-> DC Chroma i_idx = iCbCr
+ * 4-> AC Chroma i_idx = 4 * iCbCr + chroma4x4idx
+ * 5-> Luma8x8 i_idx = luma8x8idx
+ */
+
int i_mba_xy = -1;
int i_mbb_xy = -1;
- int i_nza = -1;
- int i_nzb = -1;
- int ctx = 0;
+ int i_nza = 0;
+ int i_nzb = 0;
- if( i_cat == 0 )
+ if( i_cat == DCT_LUMA_DC )
{
- if( h->mb.i_mb_x > 0 )
+ if( h->mb.i_neighbour & MB_LEFT )
{
- i_mba_xy = h->mb.i_mb_xy -1;
- if( h->mb.type[i_mba_xy] == I_16x16 )
- {
- i_nza = h->mb.cbp[i_mba_xy]&0x100;
- }
+ i_mba_xy = h->mb.i_mb_xy - 1;
+ i_nza = h->mb.cbp[i_mba_xy] & 0x100;
}
- if( h->mb.i_mb_y > 0 )
+ if( h->mb.i_neighbour & MB_TOP )
{
- i_mbb_xy = h->mb.i_mb_xy - h->mb.i_mb_stride;
- if( h->mb.type[i_mbb_xy] == I_16x16 )
- {
- i_nzb = h->mb.cbp[i_mbb_xy]&0x100;
- }
+ i_mbb_xy = h->mb.i_mb_top_xy;
+ i_nzb = h->mb.cbp[i_mbb_xy] & 0x100;
}
}
- else if( i_cat == 1 || i_cat == 2 )
+ else if( i_cat == DCT_LUMA_AC || i_cat == DCT_LUMA_4x4 )
{
- int x = block_idx_x[i_idx];
- int y = block_idx_y[i_idx];
-
- if( x > 0 )
+ if( i_idx & ~10 ) // block_idx_x > 0
i_mba_xy = h->mb.i_mb_xy;
- else if( h->mb.i_mb_x > 0 )
- i_mba_xy = h->mb.i_mb_xy -1;
+ else if( h->mb.i_neighbour & MB_LEFT )
+ i_mba_xy = h->mb.i_mb_xy - 1;
- if( y > 0 )
+ if( i_idx & ~5 ) // block_idx_y > 0
i_mbb_xy = h->mb.i_mb_xy;
- else if( h->mb.i_mb_y > 0 )
- i_mbb_xy = h->mb.i_mb_xy - h->mb.i_mb_stride;
+ else if( h->mb.i_neighbour & MB_TOP )
+ i_mbb_xy = h->mb.i_mb_top_xy;
/* no need to test for skip/pcm */
if( i_mba_xy >= 0 )
- {
- const int i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
- if( (h->mb.cbp[i_mba_xy]&0x0f)>> i8x8a )
- {
- i_nza = h->mb.cache.non_zero_count[x264_scan8[i_idx] - 1];
- }
- }
+ i_nza = h->mb.cache.non_zero_count[x264_scan8[i_idx] - 1];
if( i_mbb_xy >= 0 )
- {
- const int i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
- if( (h->mb.cbp[i_mbb_xy]&0x0f)>> i8x8b )
- {
- i_nzb = h->mb.cache.non_zero_count[x264_scan8[i_idx] - 8];
- }
- }
+ i_nzb = h->mb.cache.non_zero_count[x264_scan8[i_idx] - 8];
}
- else if( i_cat == 3 )
+ else if( i_cat == DCT_CHROMA_DC )
{
/* no need to test skip/pcm */
- if( h->mb.i_mb_x > 0 )
+ if( h->mb.i_neighbour & MB_LEFT )
{
- i_mba_xy = h->mb.i_mb_xy -1;
- if( h->mb.cbp[i_mba_xy]&0x30 )
- {
- i_nza = h->mb.cbp[i_mba_xy]&( 0x02 << ( 8 + i_idx) );
- }
+ i_mba_xy = h->mb.i_mb_xy - 1;
+ i_nza = h->mb.cbp[i_mba_xy] & (0x200 << i_idx);
}
- if( h->mb.i_mb_y > 0 )
+ if( h->mb.i_neighbour & MB_TOP )
{
- i_mbb_xy = h->mb.i_mb_xy - h->mb.i_mb_stride;
- if( h->mb.cbp[i_mbb_xy]&0x30 )
- {
- i_nzb = h->mb.cbp[i_mbb_xy]&( 0x02 << ( 8 + i_idx) );
- }
+ i_mbb_xy = h->mb.i_mb_top_xy;
+ i_nzb = h->mb.cbp[i_mbb_xy] & (0x200 << i_idx);
}
}
- else if( i_cat == 4 )
+ else if( i_cat == DCT_CHROMA_AC )
{
- int idxc = i_idx% 4;
-
- if( idxc == 1 || idxc == 3 )
+ if( i_idx & 1 )
i_mba_xy = h->mb.i_mb_xy;
- else if( h->mb.i_mb_x > 0 )
+ else if( h->mb.i_neighbour & MB_LEFT )
i_mba_xy = h->mb.i_mb_xy - 1;
- if( idxc == 2 || idxc == 3 )
+ if( i_idx & 2 )
i_mbb_xy = h->mb.i_mb_xy;
- else if( h->mb.i_mb_y > 0 )
- i_mbb_xy = h->mb.i_mb_xy - h->mb.i_mb_stride;
+ else if( h->mb.i_neighbour & MB_TOP )
+ i_mbb_xy = h->mb.i_mb_top_xy;
/* no need to test skip/pcm */
- if( i_mba_xy >= 0 && (h->mb.cbp[i_mba_xy]&0x30) == 0x20 )
- {
- i_nza = h->mb.cache.non_zero_count[x264_scan8[16+i_idx] - 1];
- }
- if( i_mbb_xy >= 0 && (h->mb.cbp[i_mbb_xy]&0x30) == 0x20 )
- {
- i_nzb = h->mb.cache.non_zero_count[x264_scan8[16+i_idx] - 8];
- }
+ if( i_mba_xy >= 0 )
+ i_nza = h->mb.cache.non_zero_count[x264_scan8[i_idx] - 1];
+ if( i_mbb_xy >= 0 )
+ i_nzb = h->mb.cache.non_zero_count[x264_scan8[i_idx] - 8];
}
- if( ( i_mba_xy < 0 && IS_INTRA( h->mb.i_type ) ) || i_nza > 0 )
+ if( IS_INTRA( h->mb.i_type ) )
{
- ctx++;
- }
- if( ( i_mbb_xy < 0 && IS_INTRA( h->mb.i_type ) ) || i_nzb > 0 )
- {
- ctx += 2;
+ i_nza |= i_mba_xy < 0;
+ i_nzb |= i_mbb_xy < 0;
}
- return 4 * i_cat + ctx;
+ return 4*i_cat + 2*!!i_nzb + !!i_nza;
}
-static void block_residual_write_cabac( x264_t *h, int i_ctxBlockCat, int i_idx, int *l, int i_count )
+static const uint16_t significant_coeff_flag_offset[2][6] = {
+ { 105, 120, 134, 149, 152, 402 },
+ { 277, 292, 306, 321, 324, 436 }
+};
+static const uint16_t last_coeff_flag_offset[2][6] = {
+ { 166, 181, 195, 210, 213, 417 },
+ { 338, 353, 367, 382, 385, 451 }
+};
+static const uint16_t coeff_abs_level_m1_offset[6] =
+ { 227, 237, 247, 257, 266, 426 };
+static const uint8_t significant_coeff_flag_offset_8x8[2][63] =
+{{
+ 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5,
+ 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7,
+ 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11,
+ 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12
+},{
+ 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5,
+ 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11,
+ 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9,
+ 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14
+}};
+static const uint8_t last_coeff_flag_offset_8x8[63] = {
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
+ 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8
+};
+static const uint8_t identity[16] =
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+// node ctx: 0..3: abslevel1 (with abslevelgt1 == 0).
+// 4..7: abslevelgt1 + 3 (and abslevel1 doesn't matter).
+/* map node ctx => cabac ctx for level=1 */
+static const int coeff_abs_level1_ctx[8] = { 1, 2, 3, 4, 0, 0, 0, 0 };
+/* map node ctx => cabac ctx for level>1 */
+static const int coeff_abs_levelgt1_ctx[8] = { 5, 5, 5, 5, 6, 7, 8, 9 };
+static const uint8_t coeff_abs_level_transition[2][8] = {
+/* update node ctx after coding a level=1 */
+ { 1, 2, 3, 3, 4, 5, 6, 7 },
+/* update node ctx after coding a level>1 */
+ { 4, 4, 4, 4, 5, 6, 7, 7 }
+};
+
+static void block_residual_write_cabac( x264_t *h, x264_cabac_t *cb, int i_ctxBlockCat, int i_idx, int16_t *l, int i_count )
{
- static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 };
- static const int last_significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 };
- static const int coeff_abs_level_m1_offset[5] = { 0, 10, 20, 30, 39 };
+ const int i_ctx_sig = significant_coeff_flag_offset[h->mb.b_interlaced][i_ctxBlockCat];
+ const int i_ctx_last = last_coeff_flag_offset[h->mb.b_interlaced][i_ctxBlockCat];
+ const int i_ctx_level = coeff_abs_level_m1_offset[i_ctxBlockCat];
- int i_coeff_abs_m1[16];
- int i_coeff_sign[16];
+ int i_coeff_abs_m1[64];
+ int UNUSED i_coeff_sign[64];
int i_coeff = 0;
int i_last = 0;
+ int i_sigmap_size;
+ int node_ctx = 0;
+ int i, j;
- int i_abslevel1 = 0;
- int i_abslevelgt1 = 0;
+ const uint8_t *significant_coeff_flag_offset;
+ const uint8_t *last_coeff_flag_offset;
- int i;
-
- /* i_ctxBlockCat: 0-> DC 16x16 i_idx = 0
- * 1-> AC 16x16 i_idx = luma4x4idx
- * 2-> Luma4x4 i_idx = luma4x4idx
- * 3-> DC Chroma i_idx = iCbCr
- * 4-> AC Chroma i_idx = 4 * iCbCr + chroma4x4idx
- */
+ /* yes this is always aligned, and l[-1] exists in the cases where it's used (ac) */
+ for( j = i_count - 4; j >= -1; j -= 4 )
+ if( *(uint64_t*)(l+j) )
+ break;
- //fprintf( stderr, "l[] = " );
- for( i = 0; i < i_count; i++ )
+ if( i_count != 64 )
{
- //fprintf( stderr, "%d ", l[i] );
- if( l[i] != 0 )
+ /* coded block flag */
+ int ctx = 85 + x264_cabac_mb_cbf_ctxidxinc( h, i_ctxBlockCat, i_idx );
+ if( j >= -1 )
+ x264_cabac_encode_decision( cb, ctx, 1 );
+ else
{
- i_coeff_abs_m1[i_coeff] = abs( l[i] ) - 1;
- i_coeff_sign[i_coeff] = ( l[i] < 0 ? 1 : 0);
- i_coeff++;
-
- i_last = i;
+ x264_cabac_encode_decision( cb, ctx, 0 );
+ return;
}
}
- //fprintf( stderr, "\n" );
- if( i_coeff == 0 )
- {
- /* codec block flag */
- x264_cabac_encode_decision( &h->cabac, 85 + x264_cabac_mb_cbf_ctxidxinc( h, i_ctxBlockCat, i_idx ), 0 );
- return;
- }
+ significant_coeff_flag_offset = (i_ctxBlockCat == DCT_LUMA_8x8)
+ ? significant_coeff_flag_offset_8x8[h->mb.b_interlaced]
+ : identity;
+ last_coeff_flag_offset = (i_ctxBlockCat == DCT_LUMA_8x8)
+ ? last_coeff_flag_offset_8x8 : identity;
- /* block coded */
- x264_cabac_encode_decision( &h->cabac, 85 + x264_cabac_mb_cbf_ctxidxinc( h, i_ctxBlockCat, i_idx ), 1 );
- for( i = 0; i < i_count - 1; i++ )
- {
- int i_ctxIdxInc;
+ for( i = j; i < j+4; i++)
+ if( l[i] )
+ i_last = i;
- i_ctxIdxInc = X264_MIN( i, i_count - 2 );
+ i_sigmap_size = X264_MIN( i_last+1, i_count-1 );
- if( l[i] != 0 )
+ for( i = 0; i < i_sigmap_size; i++ )
+ {
+ if( l[i] )
{
- x264_cabac_encode_decision( &h->cabac, 105 + significant_coeff_flag_offset[i_ctxBlockCat] + i_ctxIdxInc, 1 );
- x264_cabac_encode_decision( &h->cabac, 166 + last_significant_coeff_flag_offset[i_ctxBlockCat] + i_ctxIdxInc, i == i_last ? 1 : 0 );
+ i_coeff_abs_m1[i_coeff] = abs(l[i]) - 1;
+#ifndef RDO_SKIP_BS
+ i_coeff_sign[i_coeff] = l[i] < 0;
+#endif
+ i_coeff++;
+ x264_cabac_encode_decision( cb, i_ctx_sig + significant_coeff_flag_offset[i], 1 );
+ x264_cabac_encode_decision( cb, i_ctx_last + last_coeff_flag_offset[i], i == i_last );
}
else
- {
- x264_cabac_encode_decision( &h->cabac, 105 + significant_coeff_flag_offset[i_ctxBlockCat] + i_ctxIdxInc, 0 );
- }
- if( i == i_last )
- {
- break;
- }
+ x264_cabac_encode_decision( cb, i_ctx_sig + significant_coeff_flag_offset[i], 0 );
}
- for( i = i_coeff - 1; i >= 0; i-- )
+ if( i == i_last )
{
- int i_prefix;
- int i_ctxIdxInc;
+ i_coeff_abs_m1[i_coeff] = abs(l[i]) - 1;
+#ifndef RDO_SKIP_BS
+ i_coeff_sign[i_coeff] = l[i] < 0;
+#endif
+ i_coeff++;
+ }
+ for( i = i_coeff - 1; i >= 0; i-- )
+ {
/* write coeff_abs - 1 */
+ int i_prefix = X264_MIN( i_coeff_abs_m1[i], 14 );
+ int ctx = coeff_abs_level1_ctx[node_ctx] + i_ctx_level;
- /* prefix */
- i_prefix = X264_MIN( i_coeff_abs_m1[i], 14 );
-
- i_ctxIdxInc = (i_abslevelgt1 != 0 ? 0 : X264_MIN( 4, i_abslevel1 + 1 )) + coeff_abs_level_m1_offset[i_ctxBlockCat];
- if( i_prefix == 0 )
- {
- x264_cabac_encode_decision( &h->cabac, 227 + i_ctxIdxInc, 0 );
- }
- else
+ if( i_prefix )
{
- int j;
- x264_cabac_encode_decision( &h->cabac, 227 + i_ctxIdxInc, 1 );
- i_ctxIdxInc = 5 + X264_MIN( 4, i_abslevelgt1 ) + coeff_abs_level_m1_offset[i_ctxBlockCat];
+ x264_cabac_encode_decision( cb, ctx, 1 );
+ ctx = coeff_abs_levelgt1_ctx[node_ctx] + i_ctx_level;
+#ifdef RDO_SKIP_BS
+ cb->f8_bits_encoded += cabac_prefix_size[i_prefix][cb->state[ctx]];
+ cb->state[ctx] = cabac_prefix_transition[i_prefix][cb->state[ctx]];
+#else
for( j = 0; j < i_prefix - 1; j++ )
- {
- x264_cabac_encode_decision( &h->cabac, 227 + i_ctxIdxInc, 1 );
- }
+ x264_cabac_encode_decision( cb, ctx, 1 );
if( i_prefix < 14 )
- {
- x264_cabac_encode_decision( &h->cabac, 227 + i_ctxIdxInc, 0 );
- }
- }
- /* suffix */
- if( i_coeff_abs_m1[i] >= 14 )
- {
- int k = 0;
- int i_suffix = i_coeff_abs_m1[i] - 14;
+ x264_cabac_encode_decision( cb, ctx, 0 );
+#endif
+ if( i_prefix >= 14 )
+ x264_cabac_encode_ue_bypass( cb, 0, i_coeff_abs_m1[i] - 14 );
- while( i_suffix >= (1<<k) )
- {
- x264_cabac_encode_bypass( &h->cabac, 1 );
- i_suffix -= 1 << k;
- k++;
- }
- x264_cabac_encode_bypass( &h->cabac, 0 );
- while( k-- )
- {
- x264_cabac_encode_bypass( &h->cabac, (i_suffix >> k)&0x01 );
- }
- }
-
- /* write sign */
- x264_cabac_encode_bypass( &h->cabac, i_coeff_sign[i] );
-
-
- if( i_coeff_abs_m1[i] == 0 )
- {
- i_abslevel1++;
+ node_ctx = coeff_abs_level_transition[1][node_ctx];
}
else
{
- i_abslevelgt1++;
+ x264_cabac_encode_decision( cb, ctx, 0 );
+ node_ctx = coeff_abs_level_transition[0][node_ctx];
+#ifdef RDO_SKIP_BS
+ x264_cabac_encode_bypass( cb, 0 ); // sign
+#endif
}
+
+#ifndef RDO_SKIP_BS
+ x264_cabac_encode_bypass( cb, i_coeff_sign[i] );
+#endif
}
}
-void x264_macroblock_write_cabac( x264_t *h, bs_t *s )
+void x264_macroblock_write_cabac( x264_t *h, x264_cabac_t *cb )
{
const int i_mb_type = h->mb.i_type;
- const int i_mb_pos_start = bs_pos( s );
- int i_mb_pos_tex;
-
int i_list;
int i;
+#ifndef RDO_SKIP_BS
+ const int i_mb_pos_start = x264_cabac_pos( cb );
+ int i_mb_pos_tex;
+#endif
+
/* Write the MB type */
- x264_cabac_mb_type( h );
+ x264_cabac_mb_type( h, cb );
- /* PCM special block type UNTESTED */
+#ifndef RDO_SKIP_BS
if( i_mb_type == I_PCM )
{
- bs_align_0( s ); /* not sure */
- /* Luma */
- for( i = 0; i < 16*16; i++ )
- {
- const int x = 16 * h->mb.i_mb_x + (i % 16);
- const int y = 16 * h->mb.i_mb_y + (i / 16);
- bs_write( s, 8, h->fenc->plane[0][y*h->mb.pic.i_stride[0]+x] );
- }
- /* Cb */
- for( i = 0; i < 8*8; i++ )
- {
- const int x = 8 * h->mb.i_mb_x + (i % 8);
- const int y = 8 * h->mb.i_mb_y + (i / 8);
- bs_write( s, 8, h->fenc->plane[1][y*h->mb.pic.i_stride[1]+x] );
- }
- /* Cr */
- for( i = 0; i < 8*8; i++ )
- {
- const int x = 8 * h->mb.i_mb_x + (i % 8);
- const int y = 8 * h->mb.i_mb_y + (i / 8);
- bs_write( s, 8, h->fenc->plane[2][y*h->mb.pic.i_stride[2]+x] );
- }
- x264_cabac_encode_init( &h->cabac, s );
+ i_mb_pos_tex = x264_cabac_pos( cb );
+ h->stat.frame.i_hdr_bits += i_mb_pos_tex - i_mb_pos_start;
+
+ memcpy( cb->p, h->mb.pic.p_fenc[0], 256 );
+ cb->p += 256;
+ for( i = 0; i < 8; i++ )
+ memcpy( cb->p + i*8, h->mb.pic.p_fenc[1] + i*FENC_STRIDE, 8 );
+ cb->p += 64;
+ for( i = 0; i < 8; i++ )
+ memcpy( cb->p + i*8, h->mb.pic.p_fenc[2] + i*FENC_STRIDE, 8 );
+ cb->p += 64;
+
+ cb->i_low = 0;
+ cb->i_range = 0x01FE;
+ cb->i_queue = -1;
+ cb->i_bytes_outstanding = 0;
+
+ /* if PCM is chosen, we need to store reconstructed frame data */
+ h->mc.copy[PIXEL_16x16]( h->mb.pic.p_fdec[0], FDEC_STRIDE, h->mb.pic.p_fenc[0], FENC_STRIDE, 16 );
+ h->mc.copy[PIXEL_8x8] ( h->mb.pic.p_fdec[1], FDEC_STRIDE, h->mb.pic.p_fenc[1], FENC_STRIDE, 8 );
+ h->mc.copy[PIXEL_8x8] ( h->mb.pic.p_fdec[2], FDEC_STRIDE, h->mb.pic.p_fenc[2], FENC_STRIDE, 8 );
+
+ h->stat.frame.i_itex_bits += x264_cabac_pos( cb ) - i_mb_pos_tex;
return;
}
+#endif
if( IS_INTRA( i_mb_type ) )
{
- /* Prediction */
- if( i_mb_type == I_4x4 )
+ if( h->pps->b_transform_8x8_mode && i_mb_type != I_16x16 )
+ x264_cabac_mb_transform_size( h, cb );
+
+ if( i_mb_type != I_16x16 )
{
- for( i = 0; i < 16; i++ )
+ int di = (i_mb_type == I_8x8) ? 4 : 1;
+ for( i = 0; i < 16; i += di )
{
const int i_pred = x264_mb_predict_intra4x4_mode( h, i );
- const int i_mode = h->mb.cache.intra4x4_pred_mode[x264_scan8[i]];
- x264_cabac_mb_intra4x4_pred_mode( h, i_pred, i_mode );
+ const int i_mode = x264_mb_pred_mode4x4_fix( h->mb.cache.intra4x4_pred_mode[x264_scan8[i]] );
+ x264_cabac_mb_intra4x4_pred_mode( cb, i_pred, i_mode );
}
}
- x264_cabac_mb_intra8x8_pred_mode( h );
+
+ x264_cabac_mb_intra_chroma_pred_mode( h, cb );
}
else if( i_mb_type == P_L0 )
{
if( h->mb.i_partition == D_16x16 )
{
- if( h->sh.i_num_ref_idx_l0_active > 1 )
+ if( h->mb.pic.i_fref[0] > 1 )
{
- x264_cabac_mb_ref( h, 0, 0 );
+ x264_cabac_mb_ref( h, cb, 0, 0 );
}
- x264_cabac_mb_mvd( h, 0, 0, 4, 4 );
+ x264_cabac_mb_mvd( h, cb, 0, 0, 4, 4 );
}
else if( h->mb.i_partition == D_16x8 )
{
- if( h->sh.i_num_ref_idx_l0_active > 1 )
+ if( h->mb.pic.i_fref[0] > 1 )
{
- x264_cabac_mb_ref( h, 0, 0 );
- x264_cabac_mb_ref( h, 0, 8 );
+ x264_cabac_mb_ref( h, cb, 0, 0 );
+ x264_cabac_mb_ref( h, cb, 0, 8 );
}
- x264_cabac_mb_mvd( h, 0, 0, 4, 2 );
- x264_cabac_mb_mvd( h, 0, 8, 4, 2 );
+ x264_cabac_mb_mvd( h, cb, 0, 0, 4, 2 );
+ x264_cabac_mb_mvd( h, cb, 0, 8, 4, 2 );
}
else if( h->mb.i_partition == D_8x16 )
{
- if( h->sh.i_num_ref_idx_l0_active > 1 )
+ if( h->mb.pic.i_fref[0] > 1 )
{
- x264_cabac_mb_ref( h, 0, 0 );
- x264_cabac_mb_ref( h, 0, 4 );
+ x264_cabac_mb_ref( h, cb, 0, 0 );
+ x264_cabac_mb_ref( h, cb, 0, 4 );
}
- x264_cabac_mb_mvd( h, 0, 0, 2, 4 );
- x264_cabac_mb_mvd( h, 0, 4, 2, 4 );
+ x264_cabac_mb_mvd( h, cb, 0, 0, 2, 4 );
+ x264_cabac_mb_mvd( h, cb, 0, 4, 2, 4 );
}
}
else if( i_mb_type == P_8x8 )
{
/* sub mb type */
- x264_cabac_mb_sub_p_partition( h, h->mb.i_sub_partition[0] );
- x264_cabac_mb_sub_p_partition( h, h->mb.i_sub_partition[1] );
- x264_cabac_mb_sub_p_partition( h, h->mb.i_sub_partition[2] );
- x264_cabac_mb_sub_p_partition( h, h->mb.i_sub_partition[3] );
+ x264_cabac_mb_sub_p_partition( cb, h->mb.i_sub_partition[0] );
+ x264_cabac_mb_sub_p_partition( cb, h->mb.i_sub_partition[1] );
+ x264_cabac_mb_sub_p_partition( cb, h->mb.i_sub_partition[2] );
+ x264_cabac_mb_sub_p_partition( cb, h->mb.i_sub_partition[3] );
/* ref 0 */
- if( h->sh.i_num_ref_idx_l0_active > 1 )
+ if( h->mb.pic.i_fref[0] > 1 )
{
- x264_cabac_mb_ref( h, 0, 0 );
- x264_cabac_mb_ref( h, 0, 4 );
- x264_cabac_mb_ref( h, 0, 8 );
- x264_cabac_mb_ref( h, 0, 12 );
+ x264_cabac_mb_ref( h, cb, 0, 0 );
+ x264_cabac_mb_ref( h, cb, 0, 4 );
+ x264_cabac_mb_ref( h, cb, 0, 8 );
+ x264_cabac_mb_ref( h, cb, 0, 12 );
}
- x264_cabac_mb8x8_mvd( h, 0 );
+ for( i = 0; i < 4; i++ )
+ x264_cabac_mb8x8_mvd( h, cb, 0, i );
}
else if( i_mb_type == B_8x8 )
{
/* sub mb type */
- x264_cabac_mb_sub_b_partition( h, h->mb.i_sub_partition[0] );
- x264_cabac_mb_sub_b_partition( h, h->mb.i_sub_partition[1] );
- x264_cabac_mb_sub_b_partition( h, h->mb.i_sub_partition[2] );
- x264_cabac_mb_sub_b_partition( h, h->mb.i_sub_partition[3] );
+ x264_cabac_mb_sub_b_partition( cb, h->mb.i_sub_partition[0] );
+ x264_cabac_mb_sub_b_partition( cb, h->mb.i_sub_partition[1] );
+ x264_cabac_mb_sub_b_partition( cb, h->mb.i_sub_partition[2] );
+ x264_cabac_mb_sub_b_partition( cb, h->mb.i_sub_partition[3] );
/* ref */
for( i_list = 0; i_list < 2; i_list++ )
{
- if( ( i_list ? h->sh.i_num_ref_idx_l1_active : h->sh.i_num_ref_idx_l0_active ) == 1 )
+ if( ( i_list ? h->mb.pic.i_fref[1] : h->mb.pic.i_fref[0] ) == 1 )
continue;
for( i = 0; i < 4; i++ )
- {
- if( x264_mb_partition_listX_table[0][ h->mb.i_sub_partition[i] ] )
- {
- x264_cabac_mb_ref( h, i_list, 4*i );
- }
- }
+ if( x264_mb_partition_listX_table[i_list][ h->mb.i_sub_partition[i] ] )
+ x264_cabac_mb_ref( h, cb, i_list, 4*i );
}
- x264_cabac_mb8x8_mvd( h, 0 );
- x264_cabac_mb8x8_mvd( h, 1 );
+ for( i = 0; i < 4; i++ )
+ x264_cabac_mb8x8_mvd( h, cb, 0, i );
+ for( i = 0; i < 4; i++ )
+ x264_cabac_mb8x8_mvd( h, cb, 1, i );
}
else if( i_mb_type != B_DIRECT )
{
for( i_list = 0; i_list < 2; i_list++ )
{
- const int i_ref_max = i_list == 0 ? h->sh.i_num_ref_idx_l0_active : h->sh.i_num_ref_idx_l1_active;
+ const int i_ref_max = i_list == 0 ? h->mb.pic.i_fref[0] : h->mb.pic.i_fref[1];
if( i_ref_max > 1 )
{
if( h->mb.i_partition == D_16x16 )
{
- if( b_list[i_list][0] ) x264_cabac_mb_ref( h, i_list, 0 );
+ if( b_list[i_list][0] ) x264_cabac_mb_ref( h, cb, i_list, 0 );
}
else if( h->mb.i_partition == D_16x8 )
{
- if( b_list[i_list][0] ) x264_cabac_mb_ref( h, i_list, 0 );
- if( b_list[i_list][1] ) x264_cabac_mb_ref( h, i_list, 8 );
+ if( b_list[i_list][0] ) x264_cabac_mb_ref( h, cb, i_list, 0 );
+ if( b_list[i_list][1] ) x264_cabac_mb_ref( h, cb, i_list, 8 );
}
else if( h->mb.i_partition == D_8x16 )
{
- if( b_list[i_list][0] ) x264_cabac_mb_ref( h, i_list, 0 );
- if( b_list[i_list][1] ) x264_cabac_mb_ref( h, i_list, 4 );
+ if( b_list[i_list][0] ) x264_cabac_mb_ref( h, cb, i_list, 0 );
+ if( b_list[i_list][1] ) x264_cabac_mb_ref( h, cb, i_list, 4 );
}
}
}
{
if( h->mb.i_partition == D_16x16 )
{
- if( b_list[i_list][0] ) x264_cabac_mb_mvd( h, i_list, 0, 4, 4 );
+ if( b_list[i_list][0] ) x264_cabac_mb_mvd( h, cb, i_list, 0, 4, 4 );
}
else if( h->mb.i_partition == D_16x8 )
{
- if( b_list[i_list][0] ) x264_cabac_mb_mvd( h, i_list, 0, 4, 2 );
- if( b_list[i_list][1] ) x264_cabac_mb_mvd( h, i_list, 8, 4, 2 );
+ if( b_list[i_list][0] ) x264_cabac_mb_mvd( h, cb, i_list, 0, 4, 2 );
+ if( b_list[i_list][1] ) x264_cabac_mb_mvd( h, cb, i_list, 8, 4, 2 );
}
else if( h->mb.i_partition == D_8x16 )
{
- if( b_list[i_list][0] ) x264_cabac_mb_mvd( h, i_list, 0, 2, 4 );
- if( b_list[i_list][1] ) x264_cabac_mb_mvd( h, i_list, 4, 2, 4 );
+ if( b_list[i_list][0] ) x264_cabac_mb_mvd( h, cb, i_list, 0, 2, 4 );
+ if( b_list[i_list][1] ) x264_cabac_mb_mvd( h, cb, i_list, 4, 2, 4 );
}
}
}
- i_mb_pos_tex = bs_pos( s );
+#ifndef RDO_SKIP_BS
+ i_mb_pos_tex = x264_cabac_pos( cb );
h->stat.frame.i_hdr_bits += i_mb_pos_tex - i_mb_pos_start;
+#endif
if( i_mb_type != I_16x16 )
{
- x264_cabac_mb_cbp_luma( h );
- x264_cabac_mb_cbp_chroma( h );
+ x264_cabac_mb_cbp_luma( h, cb );
+ x264_cabac_mb_cbp_chroma( h, cb );
+ }
+
+ if( x264_mb_transform_8x8_allowed( h ) && h->mb.i_cbp_luma )
+ {
+ x264_cabac_mb_transform_size( h, cb );
}
if( h->mb.i_cbp_luma > 0 || h->mb.i_cbp_chroma > 0 || i_mb_type == I_16x16 )
{
- x264_cabac_mb_qp_delta( h );
+ x264_cabac_mb_qp_delta( h, cb );
/* write residual */
if( i_mb_type == I_16x16 )
{
/* DC Luma */
- block_residual_write_cabac( h, 0, 0, h->dct.luma16x16_dc, 16 );
+ block_residual_write_cabac( h, cb, DCT_LUMA_DC, 0, h->dct.luma16x16_dc, 16 );
+ /* AC Luma */
if( h->mb.i_cbp_luma != 0 )
- {
- /* AC Luma */
for( i = 0; i < 16; i++ )
- {
- block_residual_write_cabac( h, 1, i, h->dct.block[i].residual_ac, 15 );
- }
- }
+ block_residual_write_cabac( h, cb, DCT_LUMA_AC, i, h->dct.luma4x4[i]+1, 15 );
+ }
+ else if( h->mb.b_transform_8x8 )
+ {
+ for( i = 0; i < 4; i++ )
+ if( h->mb.i_cbp_luma & ( 1 << i ) )
+ block_residual_write_cabac( h, cb, DCT_LUMA_8x8, i, h->dct.luma8x8[i], 64 );
}
else
{
for( i = 0; i < 16; i++ )
- {
if( h->mb.i_cbp_luma & ( 1 << ( i / 4 ) ) )
- {
- block_residual_write_cabac( h, 2, i, h->dct.block[i].luma4x4, 16 );
- }
- }
+ block_residual_write_cabac( h, cb, DCT_LUMA_4x4, i, h->dct.luma4x4[i], 16 );
}
if( h->mb.i_cbp_chroma &0x03 ) /* Chroma DC residual present */
{
- block_residual_write_cabac( h, 3, 0, h->dct.chroma_dc[0], 4 );
- block_residual_write_cabac( h, 3, 1, h->dct.chroma_dc[1], 4 );
+ block_residual_write_cabac( h, cb, DCT_CHROMA_DC, 0, h->dct.chroma_dc[0], 4 );
+ block_residual_write_cabac( h, cb, DCT_CHROMA_DC, 1, h->dct.chroma_dc[1], 4 );
}
if( h->mb.i_cbp_chroma&0x02 ) /* Chroma AC residual present */
{
- for( i = 0; i < 8; i++ )
- {
- block_residual_write_cabac( h, 4, i, h->dct.block[16+i].residual_ac, 15 );
- }
+ for( i = 16; i < 24; i++ )
+ block_residual_write_cabac( h, cb, DCT_CHROMA_AC, i, h->dct.luma4x4[i]+1, 15 );
}
}
+#ifndef RDO_SKIP_BS
if( IS_INTRA( i_mb_type ) )
- h->stat.frame.i_itex_bits += bs_pos(s) - i_mb_pos_tex;
+ h->stat.frame.i_itex_bits += x264_cabac_pos( cb ) - i_mb_pos_tex;
+ else
+ h->stat.frame.i_ptex_bits += x264_cabac_pos( cb ) - i_mb_pos_tex;
+#endif
+}
+
+#ifdef RDO_SKIP_BS
+/*****************************************************************************
+ * RD only; doesn't generate a valid bitstream
+ * doesn't write cbp or chroma dc (I don't know how much this matters)
+ * works on all partition sizes except 16x16
+ * for sub8x8, call once per 8x8 block
+ *****************************************************************************/
+void x264_partition_size_cabac( x264_t *h, x264_cabac_t *cb, int i8, int i_pixel )
+{
+ const int i_mb_type = h->mb.i_type;
+ int j;
+
+ if( i_mb_type == P_8x8 )
+ {
+ x264_cabac_mb_sub_p_partition( cb, h->mb.i_sub_partition[i8] );
+ if( h->mb.pic.i_fref[0] > 1 )
+ x264_cabac_mb_ref( h, cb, 0, 4*i8 );
+ x264_cabac_mb8x8_mvd( h, cb, 0, i8 );
+ }
+ else if( i_mb_type == P_L0 )
+ {
+ if( h->mb.pic.i_fref[0] > 1 )
+ x264_cabac_mb_ref( h, cb, 0, 4*i8 );
+ if( h->mb.i_partition == D_16x8 )
+ x264_cabac_mb_mvd( h, cb, 0, 4*i8, 4, 2 );
+ else //8x16
+ x264_cabac_mb_mvd( h, cb, 0, 4*i8, 2, 4 );
+ }
+ else if( i_mb_type == B_8x8 )
+ {
+ x264_cabac_mb_sub_b_partition( cb, h->mb.i_sub_partition[i8] );
+
+ if( h->mb.pic.i_fref[0] > 1
+ && x264_mb_partition_listX_table[0][ h->mb.i_sub_partition[i8] ] )
+ x264_cabac_mb_ref( h, cb, 0, 4*i8 );
+ if( h->mb.pic.i_fref[1] > 1
+ && x264_mb_partition_listX_table[1][ h->mb.i_sub_partition[i8] ] )
+ x264_cabac_mb_ref( h, cb, 1, 4*i8 );
+
+ x264_cabac_mb8x8_mvd( h, cb, 0, i8 );
+ x264_cabac_mb8x8_mvd( h, cb, 1, i8 );
+ }
else
- h->stat.frame.i_ptex_bits += bs_pos(s) - i_mb_pos_tex;
+ {
+ x264_log(h, X264_LOG_ERROR, "invalid/unhandled mb_type\n" );
+ return;
+ }
+
+ for( j = (i_pixel < PIXEL_8x8); j >= 0; j-- )
+ {
+ if( h->mb.i_cbp_luma & (1 << i8) )
+ {
+ if( h->mb.b_transform_8x8 )
+ block_residual_write_cabac( h, cb, DCT_LUMA_8x8, i8, h->dct.luma8x8[i8], 64 );
+ else
+ {
+ int i4;
+ for( i4 = 0; i4 < 4; i4++ )
+ block_residual_write_cabac( h, cb, DCT_LUMA_4x4, i4+i8*4, h->dct.luma4x4[i4+i8*4], 16 );
+ }
+ }
+
+ block_residual_write_cabac( h, cb, DCT_CHROMA_AC, 16+i8, h->dct.luma4x4[16+i8]+1, 15 );
+ block_residual_write_cabac( h, cb, DCT_CHROMA_AC, 20+i8, h->dct.luma4x4[20+i8]+1, 15 );
+
+ i8 += x264_pixel_size[i_pixel].h >> 3;
+ }
}
+static void x264_partition_i8x8_size_cabac( x264_t *h, x264_cabac_t *cb, int i8, int i_mode )
+{
+ const int i_pred = x264_mb_predict_intra4x4_mode( h, 4*i8 );
+ i_mode = x264_mb_pred_mode4x4_fix( i_mode );
+ x264_cabac_mb_intra4x4_pred_mode( cb, i_pred, i_mode );
+ block_residual_write_cabac( h, cb, DCT_LUMA_8x8, 4*i8, h->dct.luma8x8[i8], 64 );
+}
+
+static void x264_partition_i4x4_size_cabac( x264_t *h, x264_cabac_t *cb, int i4, int i_mode )
+{
+ const int i_pred = x264_mb_predict_intra4x4_mode( h, i4 );
+ i_mode = x264_mb_pred_mode4x4_fix( i_mode );
+ x264_cabac_mb_intra4x4_pred_mode( cb, i_pred, i_mode );
+ block_residual_write_cabac( h, cb, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4], 16 );
+}
+
+static void x264_i8x8_chroma_size_cabac( x264_t *h, x264_cabac_t *cb )
+{
+ x264_cabac_mb_intra_chroma_pred_mode( h, cb );
+ if( h->mb.i_cbp_chroma > 0 )
+ {
+ block_residual_write_cabac( h, cb, DCT_CHROMA_DC, 0, h->dct.chroma_dc[0], 4 );
+ block_residual_write_cabac( h, cb, DCT_CHROMA_DC, 1, h->dct.chroma_dc[1], 4 );
+
+ if( h->mb.i_cbp_chroma == 2 )
+ {
+ int i;
+ for( i = 16; i < 24; i++ )
+ block_residual_write_cabac( h, cb, DCT_CHROMA_AC, i, h->dct.luma4x4[i]+1, 15 );
+ }
+ }
+}
+#endif
projects / x264 / blobdiff