/*****************************************************************************
- * cavlc.c: h264 encoder library
+ * cavlc.c: cavlc bitstream writing
*****************************************************************************
- * Copyright (C) 2003-2008 x264 project
+ * Copyright (C) 2003-2010 x264 project
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Loren Merritt <lorenm@u.washington.edu>
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@x264.com.
*****************************************************************************/
#include "common/common.h"
/****************************************************************************
* block_residual_write_cavlc:
****************************************************************************/
-static inline int block_residual_write_cavlc_escape( x264_t *h, bs_t *s, int i_suffix_length, int level )
+static inline int block_residual_write_cavlc_escape( x264_t *h, int i_suffix_length, int level )
{
+ bs_t *s = &h->out.bs;
static const uint16_t next_suffix[7] = { 0, 3, 6, 12, 24, 48, 0xffff };
int i_level_prefix = 15;
- int mask = level >> 15;
+ int mask = level >> 31;
int abs_level = (level^mask)-mask;
int i_level_code = abs_level*2-mask-2;
if( ( i_level_code >> i_suffix_length ) < 15 )
{
#if RDO_SKIP_BS
/* Weight highly against overflows. */
- s->i_bits_encoded += 1000000;
+ s->i_bits_encoded += 2000;
#else
x264_log(h, X264_LOG_WARNING, "OVERFLOW levelcode=%d is only allowed in High Profile\n", i_level_code );
/* clip level, preserving sign */
return i_suffix_length;
}
-static int block_residual_write_cavlc( x264_t *h, bs_t *s, int i_ctxBlockCat, int16_t *l, int nC )
+static int block_residual_write_cavlc_internal( x264_t *h, int ctx_block_cat, dctcoef *l, int nC )
{
+ bs_t *s = &h->out.bs;
static const uint8_t ctz_index[8] = {3,0,1,0,2,0,1,0};
- static const int count_cat[5] = {16, 15, 16, 4, 15};
+ static const uint8_t count_cat[5] = {16, 15, 16, 4, 15};
x264_run_level_t runlevel;
- int i_trailing, i_total_zero, i_suffix_length, i;
+ int i_trailing, i_total_zero, i_suffix_length;
int i_total = 0;
unsigned int i_sign;
/* set these to 2 to allow branchless i_trailing calculation */
runlevel.level[1] = 2;
runlevel.level[2] = 2;
- i_total = h->quantf.coeff_level_run[i_ctxBlockCat]( l, &runlevel );
+ i_total = h->quantf.coeff_level_run[ctx_block_cat]( l, &runlevel );
i_total_zero = runlevel.last + 1 - i_total;
i_trailing = ((((runlevel.level[0]+1) | (1-runlevel.level[0])) >> 31) & 1) // abs(runlevel.level[0])>1
i_sign >>= 3-i_trailing;
/* total/trailing */
- bs_write_vlc( s, x264_coeff_token[nC][i_total*4+i_trailing-4] );
+ bs_write_vlc( s, x264_coeff_token[nC][i_total-1][i_trailing] );
i_suffix_length = i_total > 10 && i_trailing < 3;
bs_write( s, i_trailing, i_sign );
if( i_trailing < i_total )
{
- int16_t val = runlevel.level[i_trailing];
- int16_t val_original = runlevel.level[i_trailing]+LEVEL_TABLE_SIZE/2;
- if( i_trailing < 3 )
- val -= (val>>15)|1; /* as runlevel.level[i] can't be 1 for the first one if i_trailing < 3 */
+ int val = runlevel.level[i_trailing];
+ int val_original = runlevel.level[i_trailing]+LEVEL_TABLE_SIZE/2;
+ val -= ((val>>31)|1) & -(i_trailing < 3); /* as runlevel.level[i] can't be 1 for the first one if i_trailing < 3 */
val += LEVEL_TABLE_SIZE/2;
if( (unsigned)val_original < LEVEL_TABLE_SIZE )
i_suffix_length = x264_level_token[i_suffix_length][val_original].i_next;
}
else
- i_suffix_length = block_residual_write_cavlc_escape( h, s, i_suffix_length, val-LEVEL_TABLE_SIZE/2 );
- for( i = i_trailing+1; i < i_total; i++ )
+ i_suffix_length = block_residual_write_cavlc_escape( h, i_suffix_length, val-LEVEL_TABLE_SIZE/2 );
+ for( int i = i_trailing+1; i < i_total; i++ )
{
val = runlevel.level[i] + LEVEL_TABLE_SIZE/2;
if( (unsigned)val < LEVEL_TABLE_SIZE )
i_suffix_length = x264_level_token[i_suffix_length][val].i_next;
}
else
- i_suffix_length = block_residual_write_cavlc_escape( h, s, i_suffix_length, val-LEVEL_TABLE_SIZE/2 );
+ i_suffix_length = block_residual_write_cavlc_escape( h, i_suffix_length, val-LEVEL_TABLE_SIZE/2 );
}
}
- if( i_total < count_cat[i_ctxBlockCat] )
+ if( (uint8_t)i_total < count_cat[ctx_block_cat] )
{
- if( i_ctxBlockCat == DCT_CHROMA_DC )
+ if( ctx_block_cat == DCT_CHROMA_DC )
bs_write_vlc( s, x264_total_zeros_dc[i_total-1][i_total_zero] );
else
bs_write_vlc( s, x264_total_zeros[i_total-1][i_total_zero] );
}
- for( i = 0; i < i_total-1 && i_total_zero > 0; i++ )
+ for( int i = 0; i < i_total-1 && i_total_zero > 0; i++ )
{
int i_zl = X264_MIN( i_total_zero, 7 );
bs_write_vlc( s, x264_run_before[i_zl-1][runlevel.run[i]] );
static const uint8_t ct_index[17] = {0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,3};
-#define block_residual_write_cavlc(h,s,cat,idx,l)\
+#define block_residual_write_cavlc(h,cat,idx,l)\
{\
int nC = cat == DCT_CHROMA_DC ? 4 : ct_index[x264_mb_predict_non_zero_code( h, cat == DCT_LUMA_DC ? 0 : idx )];\
uint8_t *nnz = &h->mb.cache.non_zero_count[x264_scan8[idx]];\
if( !*nnz )\
- bs_write_vlc( s, x264_coeff0_token[nC] );\
+ bs_write_vlc( &h->out.bs, x264_coeff0_token[nC] );\
else\
- *nnz = block_residual_write_cavlc(h,s,cat,l,nC);\
+ *nnz = block_residual_write_cavlc_internal(h,cat,l,nC);\
}
-static void cavlc_qp_delta( x264_t *h, bs_t *s )
+static void cavlc_qp_delta( x264_t *h )
{
+ bs_t *s = &h->out.bs;
int i_dqp = h->mb.i_qp - h->mb.i_last_qp;
/* Avoid writing a delta quant if we have an empty i16x16 block, e.g. in a completely flat background area */
if( i_dqp )
{
- if( i_dqp < -26 )
- i_dqp += 52;
- else if( i_dqp > 25 )
- i_dqp -= 52;
+ if( i_dqp < -(QP_MAX+1)/2 )
+ i_dqp += QP_MAX+1;
+ else if( i_dqp > QP_MAX/2 )
+ i_dqp -= QP_MAX+1;
}
bs_write_se( s, i_dqp );
}
-static void cavlc_mb_mvd( x264_t *h, bs_t *s, int i_list, int idx, int width )
+static void cavlc_mb_mvd( x264_t *h, int i_list, int idx, int width )
{
+ bs_t *s = &h->out.bs;
ALIGNED_4( int16_t mvp[2] );
x264_mb_predict_mv( h, i_list, idx, width, mvp );
bs_write_se( s, h->mb.cache.mv[i_list][x264_scan8[idx]][0] - mvp[0] );
bs_write_se( s, h->mb.cache.mv[i_list][x264_scan8[idx]][1] - mvp[1] );
}
-static inline void cavlc_mb8x8_mvd( x264_t *h, bs_t *s, int i )
+static inline void cavlc_mb8x8_mvd( x264_t *h, int i )
{
switch( h->mb.i_sub_partition[i] )
{
case D_L0_8x8:
- cavlc_mb_mvd( h, s, 0, 4*i, 2 );
+ cavlc_mb_mvd( h, 0, 4*i, 2 );
break;
case D_L0_8x4:
- cavlc_mb_mvd( h, s, 0, 4*i+0, 2 );
- cavlc_mb_mvd( h, s, 0, 4*i+2, 2 );
+ cavlc_mb_mvd( h, 0, 4*i+0, 2 );
+ cavlc_mb_mvd( h, 0, 4*i+2, 2 );
break;
case D_L0_4x8:
- cavlc_mb_mvd( h, s, 0, 4*i+0, 1 );
- cavlc_mb_mvd( h, s, 0, 4*i+1, 1 );
+ cavlc_mb_mvd( h, 0, 4*i+0, 1 );
+ cavlc_mb_mvd( h, 0, 4*i+1, 1 );
break;
case D_L0_4x4:
- cavlc_mb_mvd( h, s, 0, 4*i+0, 1 );
- cavlc_mb_mvd( h, s, 0, 4*i+1, 1 );
- cavlc_mb_mvd( h, s, 0, 4*i+2, 1 );
- cavlc_mb_mvd( h, s, 0, 4*i+3, 1 );
+ cavlc_mb_mvd( h, 0, 4*i+0, 1 );
+ cavlc_mb_mvd( h, 0, 4*i+1, 1 );
+ cavlc_mb_mvd( h, 0, 4*i+2, 1 );
+ cavlc_mb_mvd( h, 0, 4*i+3, 1 );
break;
}
}
-static inline void x264_macroblock_luma_write_cavlc( x264_t *h, bs_t *s, int i8start, int i8end )
+static inline void x264_macroblock_luma_write_cavlc( x264_t *h, int i8start, int i8end )
{
- int i8, i4;
if( h->mb.b_transform_8x8 )
{
/* shuffle 8x8 dct coeffs into 4x4 lists */
- for( i8 = i8start; i8 <= i8end; i8++ )
+ for( int i8 = i8start; i8 <= i8end; i8++ )
if( h->mb.i_cbp_luma & (1 << i8) )
h->zigzagf.interleave_8x8_cavlc( h->dct.luma4x4[i8*4], h->dct.luma8x8[i8], &h->mb.cache.non_zero_count[x264_scan8[i8*4]] );
}
- for( i8 = i8start; i8 <= i8end; i8++ )
+ for( int i8 = i8start; i8 <= i8end; i8++ )
if( h->mb.i_cbp_luma & (1 << i8) )
- for( i4 = 0; i4 < 4; i4++ )
- block_residual_write_cavlc( h, s, DCT_LUMA_4x4, i4+i8*4, h->dct.luma4x4[i4+i8*4] );
+ for( int i4 = 0; i4 < 4; i4++ )
+ block_residual_write_cavlc( h, DCT_LUMA_4x4, i4+i8*4, h->dct.luma4x4[i4+i8*4] );
}
/*****************************************************************************
* x264_macroblock_write:
*****************************************************************************/
-void x264_macroblock_write_cavlc( x264_t *h, bs_t *s )
+void x264_macroblock_write_cavlc( x264_t *h )
{
+ bs_t *s = &h->out.bs;
const int i_mb_type = h->mb.i_type;
static const uint8_t i_offsets[3] = {5,23,0};
int i_mb_i_offset = i_offsets[h->sh.i_type];
- int i;
-#if !RDO_SKIP_BS
+#if RDO_SKIP_BS
+ s->i_bits_encoded = 0;
+#else
const int i_mb_pos_start = bs_pos( s );
int i_mb_pos_tex;
#endif
bs_align_0( s );
- memcpy( s->p, h->mb.pic.p_fenc[0], 256 );
- s->p += 256;
- for( i = 0; i < 8; i++ )
- memcpy( s->p + i*8, h->mb.pic.p_fenc[1] + i*FENC_STRIDE, 8 );
- s->p += 64;
- for( i = 0; i < 8; i++ )
- memcpy( s->p + i*8, h->mb.pic.p_fenc[2] + i*FENC_STRIDE, 8 );
- s->p += 64;
+ for( int i = 0; i < 256; i++ )
+ bs_write( s, BIT_DEPTH, h->mb.pic.p_fenc[0][i] );
+ for( int ch = 1; ch < 3; ch++ )
+ for( int i = 0; i < 8; i++ )
+ for( int j = 0; j < 8; j++ )
+ bs_write( s, BIT_DEPTH, h->mb.pic.p_fenc[ch][i*FENC_STRIDE+j] );
bs_init( s, s->p, s->p_end - s->p );
s->p_start = p_start;
- /* 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_tex_bits += bs_pos(s) - i_mb_pos_tex;
return;
}
bs_write1( s, h->mb.b_transform_8x8 );
/* Prediction: Luma */
- for( i = 0; i < 16; i += di )
+ for( int i = 0; i < 16; i += di )
{
int i_pred = x264_mb_predict_intra4x4_mode( h, i );
int i_mode = x264_mb_pred_mode4x4_fix( h->mb.cache.intra4x4_pred_mode[x264_scan8[i]] );
if( h->mb.pic.i_fref[0] > 1 )
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[0]] );
- cavlc_mb_mvd( h, s, 0, 0, 4 );
+ cavlc_mb_mvd( h, 0, 0, 4 );
}
else if( h->mb.i_partition == D_16x8 )
{
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[0]] );
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[8]] );
}
- cavlc_mb_mvd( h, s, 0, 0, 4 );
- cavlc_mb_mvd( h, s, 0, 8, 4 );
+ cavlc_mb_mvd( h, 0, 0, 4 );
+ cavlc_mb_mvd( h, 0, 8, 4 );
}
else if( h->mb.i_partition == D_8x16 )
{
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[0]] );
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[4]] );
}
- cavlc_mb_mvd( h, s, 0, 0, 2 );
- cavlc_mb_mvd( h, s, 0, 4, 2 );
+ cavlc_mb_mvd( h, 0, 0, 2 );
+ cavlc_mb_mvd( h, 0, 4, 2 );
}
}
else if( i_mb_type == P_8x8 )
/* sub mb type */
if( h->param.analyse.inter & X264_ANALYSE_PSUB8x8 )
- for( i = 0; i < 4; i++ )
+ for( int i = 0; i < 4; i++ )
bs_write_ue( s, sub_mb_type_p_to_golomb[ h->mb.i_sub_partition[i] ] );
else
bs_write( s, 4, 0xf );
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[12]] );
}
- for( i = 0; i < 4; i++ )
- cavlc_mb8x8_mvd( h, s, i );
+ for( int i = 0; i < 4; i++ )
+ cavlc_mb8x8_mvd( h, i );
}
else if( i_mb_type == B_8x8 )
{
bs_write_ue( s, 22 );
/* sub mb type */
- for( i = 0; i < 4; i++ )
+ for( int i = 0; i < 4; i++ )
bs_write_ue( s, sub_mb_type_b_to_golomb[ h->mb.i_sub_partition[i] ] );
/* ref */
if( h->mb.pic.i_fref[0] > 1 )
- for( i = 0; i < 4; i++ )
+ for( int i = 0; i < 4; i++ )
if( x264_mb_partition_listX_table[0][ h->mb.i_sub_partition[i] ] )
bs_write_te( s, h->mb.pic.i_fref[0] - 1, h->mb.cache.ref[0][x264_scan8[i*4]] );
if( h->mb.pic.i_fref[1] > 1 )
- for( i = 0; i < 4; i++ )
+ for( int i = 0; i < 4; i++ )
if( x264_mb_partition_listX_table[1][ h->mb.i_sub_partition[i] ] )
bs_write_te( s, h->mb.pic.i_fref[1] - 1, h->mb.cache.ref[1][x264_scan8[i*4]] );
/* mvd */
- for( i = 0; i < 4; i++ )
+ for( int i = 0; i < 4; i++ )
if( x264_mb_partition_listX_table[0][ h->mb.i_sub_partition[i] ] )
- cavlc_mb_mvd( h, s, 0, 4*i, 2 );
- for( i = 0; i < 4; i++ )
+ cavlc_mb_mvd( h, 0, 4*i, 2 );
+ for( int i = 0; i < 4; i++ )
if( x264_mb_partition_listX_table[1][ h->mb.i_sub_partition[i] ] )
- cavlc_mb_mvd( h, s, 1, 4*i, 2 );
+ cavlc_mb_mvd( h, 1, 4*i, 2 );
}
else if( i_mb_type != B_DIRECT )
{
{
if( i_ref0_max && b_list[0][0] ) bs_write_te( s, i_ref0_max, h->mb.cache.ref[0][x264_scan8[0]] );
if( i_ref1_max && b_list[1][0] ) bs_write_te( s, i_ref1_max, h->mb.cache.ref[1][x264_scan8[0]] );
- if( b_list[0][0] ) cavlc_mb_mvd( h, s, 0, 0, 4 );
- if( b_list[1][0] ) cavlc_mb_mvd( h, s, 1, 0, 4 );
+ if( b_list[0][0] ) cavlc_mb_mvd( h, 0, 0, 4 );
+ if( b_list[1][0] ) cavlc_mb_mvd( h, 1, 0, 4 );
}
else
{
if( i_ref1_max && b_list[1][1] ) bs_write_te( s, i_ref1_max, h->mb.cache.ref[1][x264_scan8[12]] );
if( h->mb.i_partition == D_16x8 )
{
- if( b_list[0][0] ) cavlc_mb_mvd( h, s, 0, 0, 4 );
- if( b_list[0][1] ) cavlc_mb_mvd( h, s, 0, 8, 4 );
- if( b_list[1][0] ) cavlc_mb_mvd( h, s, 1, 0, 4 );
- if( b_list[1][1] ) cavlc_mb_mvd( h, s, 1, 8, 4 );
+ if( b_list[0][0] ) cavlc_mb_mvd( h, 0, 0, 4 );
+ if( b_list[0][1] ) cavlc_mb_mvd( h, 0, 8, 4 );
+ if( b_list[1][0] ) cavlc_mb_mvd( h, 1, 0, 4 );
+ if( b_list[1][1] ) cavlc_mb_mvd( h, 1, 8, 4 );
}
else //if( h->mb.i_partition == D_8x16 )
{
- if( b_list[0][0] ) cavlc_mb_mvd( h, s, 0, 0, 2 );
- if( b_list[0][1] ) cavlc_mb_mvd( h, s, 0, 4, 2 );
- if( b_list[1][0] ) cavlc_mb_mvd( h, s, 1, 0, 2 );
- if( b_list[1][1] ) cavlc_mb_mvd( h, s, 1, 4, 2 );
+ if( b_list[0][0] ) cavlc_mb_mvd( h, 0, 0, 2 );
+ if( b_list[0][1] ) cavlc_mb_mvd( h, 0, 4, 2 );
+ if( b_list[1][0] ) cavlc_mb_mvd( h, 1, 0, 2 );
+ if( b_list[1][1] ) cavlc_mb_mvd( h, 1, 4, 2 );
}
}
}
/* write residual */
if( i_mb_type == I_16x16 )
{
- cavlc_qp_delta( h, s );
+ cavlc_qp_delta( h );
/* DC Luma */
- block_residual_write_cavlc( h, s, DCT_LUMA_DC, 24 , h->dct.luma16x16_dc );
+ block_residual_write_cavlc( h, DCT_LUMA_DC, 24 , h->dct.luma16x16_dc );
/* AC Luma */
if( h->mb.i_cbp_luma )
- for( i = 0; i < 16; i++ )
- block_residual_write_cavlc( h, s, DCT_LUMA_AC, i, h->dct.luma4x4[i]+1 );
+ for( int i = 0; i < 16; i++ )
+ block_residual_write_cavlc( h, DCT_LUMA_AC, i, h->dct.luma4x4[i]+1 );
}
else if( h->mb.i_cbp_luma | h->mb.i_cbp_chroma )
{
- cavlc_qp_delta( h, s );
- x264_macroblock_luma_write_cavlc( h, s, 0, 3 );
+ cavlc_qp_delta( h );
+ x264_macroblock_luma_write_cavlc( h, 0, 3 );
}
if( h->mb.i_cbp_chroma )
{
/* Chroma DC residual present */
- block_residual_write_cavlc( h, s, DCT_CHROMA_DC, 25, h->dct.chroma_dc[0] );
- block_residual_write_cavlc( h, s, DCT_CHROMA_DC, 26, h->dct.chroma_dc[1] );
+ block_residual_write_cavlc( h, DCT_CHROMA_DC, 25, h->dct.chroma_dc[0] );
+ block_residual_write_cavlc( h, DCT_CHROMA_DC, 26, h->dct.chroma_dc[1] );
if( h->mb.i_cbp_chroma&0x02 ) /* Chroma AC residual present */
- for( i = 16; i < 24; i++ )
- block_residual_write_cavlc( h, s, DCT_CHROMA_AC, i, h->dct.luma4x4[i]+1 );
+ for( int i = 16; i < 24; i++ )
+ block_residual_write_cavlc( h, DCT_CHROMA_AC, i, h->dct.luma4x4[i]+1 );
}
#if !RDO_SKIP_BS
*****************************************************************************/
static int x264_partition_size_cavlc( x264_t *h, int i8, int i_pixel )
{
+ bs_t *s = &h->out.bs;
const int i_mb_type = h->mb.i_type;
int b_8x16 = h->mb.i_partition == D_8x16;
int j;
- h->out.bs.i_bits_encoded = 0;
if( i_mb_type == P_8x8 )
{
- cavlc_mb8x8_mvd( h, &h->out.bs, i8 );
- bs_write_ue( &h->out.bs, sub_mb_type_p_to_golomb[ h->mb.i_sub_partition[i8] ] );
+ cavlc_mb8x8_mvd( h, i8 );
+ bs_write_ue( s, sub_mb_type_p_to_golomb[ h->mb.i_sub_partition[i8] ] );
}
else if( i_mb_type == P_L0 )
- cavlc_mb_mvd( h, &h->out.bs, 0, 4*i8, 4>>b_8x16 );
+ cavlc_mb_mvd( h, 0, 4*i8, 4>>b_8x16 );
else if( i_mb_type > B_DIRECT && i_mb_type < B_8x8 )
{
- if( x264_mb_type_list_table[ i_mb_type ][0][!!i8] ) cavlc_mb_mvd( h, &h->out.bs, 0, 4*i8, 4>>b_8x16 );
- if( x264_mb_type_list_table[ i_mb_type ][1][!!i8] ) cavlc_mb_mvd( h, &h->out.bs, 1, 4*i8, 4>>b_8x16 );
+ if( x264_mb_type_list_table[ i_mb_type ][0][!!i8] ) cavlc_mb_mvd( h, 0, 4*i8, 4>>b_8x16 );
+ if( x264_mb_type_list_table[ i_mb_type ][1][!!i8] ) cavlc_mb_mvd( h, 1, 4*i8, 4>>b_8x16 );
}
else //if( i_mb_type == B_8x8 )
{
if( x264_mb_partition_listX_table[0][ h->mb.i_sub_partition[i8] ] )
- cavlc_mb_mvd( h, &h->out.bs, 0, 4*i8, 2 );
+ cavlc_mb_mvd( h, 0, 4*i8, 2 );
if( x264_mb_partition_listX_table[1][ h->mb.i_sub_partition[i8] ] )
- cavlc_mb_mvd( h, &h->out.bs, 1, 4*i8, 2 );
+ cavlc_mb_mvd( h, 1, 4*i8, 2 );
}
for( j = (i_pixel < PIXEL_8x8); j >= 0; j-- )
{
- x264_macroblock_luma_write_cavlc( h, &h->out.bs, i8, i8 );
- block_residual_write_cavlc( h, &h->out.bs, DCT_CHROMA_AC, 16+i8, h->dct.luma4x4[16+i8]+1 );
- block_residual_write_cavlc( h, &h->out.bs, DCT_CHROMA_AC, 20+i8, h->dct.luma4x4[20+i8]+1 );
+ x264_macroblock_luma_write_cavlc( h, i8, i8 );
+ block_residual_write_cavlc( h, DCT_CHROMA_AC, 16+i8, h->dct.luma4x4[16+i8]+1 );
+ block_residual_write_cavlc( h, DCT_CHROMA_AC, 20+i8, h->dct.luma4x4[20+i8]+1 );
i8 += x264_pixel_size[i_pixel].h >> 3;
}
{
int b_8x4 = i_pixel == PIXEL_8x4;
h->out.bs.i_bits_encoded = 0;
- cavlc_mb_mvd( h, &h->out.bs, 0, i4, 1+b_8x4 );
- block_residual_write_cavlc( h, &h->out.bs, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4] );
+ cavlc_mb_mvd( h, 0, i4, 1+b_8x4 );
+ block_residual_write_cavlc( h, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4] );
if( i_pixel != PIXEL_4x4 )
{
i4 += 2-b_8x4;
- block_residual_write_cavlc( h, &h->out.bs, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4] );
+ block_residual_write_cavlc( h, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4] );
}
return h->out.bs.i_bits_encoded;
{
h->out.bs.i_bits_encoded = cavlc_intra4x4_pred_size( h, 4*i8, i_mode );
bs_write_ue( &h->out.bs, intra4x4_cbp_to_golomb[( h->mb.i_cbp_chroma << 4 )|h->mb.i_cbp_luma] );
- x264_macroblock_luma_write_cavlc( h, &h->out.bs, i8, i8 );
+ x264_macroblock_luma_write_cavlc( h, i8, i8 );
return h->out.bs.i_bits_encoded;
}
static int x264_partition_i4x4_size_cavlc( x264_t *h, int i4, int i_mode )
{
h->out.bs.i_bits_encoded = cavlc_intra4x4_pred_size( h, i4, i_mode );
- block_residual_write_cavlc( h, &h->out.bs, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4] );
+ block_residual_write_cavlc( h, DCT_LUMA_4x4, i4, h->dct.luma4x4[i4] );
return h->out.bs.i_bits_encoded;
}
h->out.bs.i_bits_encoded = bs_size_ue( x264_mb_pred_mode8x8c_fix[ h->mb.i_chroma_pred_mode ] );
if( h->mb.i_cbp_chroma )
{
- block_residual_write_cavlc( h, &h->out.bs, DCT_CHROMA_DC, 25, h->dct.chroma_dc[0] );
- block_residual_write_cavlc( h, &h->out.bs, DCT_CHROMA_DC, 26, h->dct.chroma_dc[1] );
+ block_residual_write_cavlc( h, DCT_CHROMA_DC, 25, h->dct.chroma_dc[0] );
+ block_residual_write_cavlc( h, DCT_CHROMA_DC, 26, h->dct.chroma_dc[1] );
if( h->mb.i_cbp_chroma == 2 )
{
- int i;
- for( i = 16; i < 24; i++ )
- block_residual_write_cavlc( h, &h->out.bs, DCT_CHROMA_AC, i, h->dct.luma4x4[i]+1 );
+ for( int i = 16; i < 24; i++ )
+ block_residual_write_cavlc( h, DCT_CHROMA_AC, i, h->dct.luma4x4[i]+1 );
}
}
return h->out.bs.i_bits_encoded;
projects / x264 / blobdiff