*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Loren Merritt <lorenm@u.washington.edu>
+ * Fiona Glaser <fiona@x264.com>
*
* 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
#include "analyse.h"
#include "ratecontrol.h"
#include "macroblock.h"
+#include "me.h"
-#if VISUALIZE
+#ifdef HAVE_VISUALIZE
#include "common/visualize.h"
#endif
#define bs_write_ue bs_write_ue_big
-static void x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
- x264_nal_t **pp_nal, int *pi_nal,
- x264_picture_t *pic_out );
+static int x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
+ x264_nal_t **pp_nal, int *pi_nal,
+ x264_picture_t *pic_out );
/****************************************************************************
*
if( !f )
return;
/* Write the frame in display order */
- fseek( f, h->fdec->i_frame * h->param.i_height * h->param.i_width * 3/2, SEEK_SET );
+ fseek( f, (uint64_t)h->fdec->i_frame * h->param.i_height * h->param.i_width * 3/2, SEEK_SET );
for( i = 0; i < h->fdec->i_plane; i++ )
for( y = 0; y < h->param.i_height >> !!i; y++ )
fwrite( &h->fdec->plane[i][y*h->fdec->i_stride[i]], 1, h->param.i_width >> !!i, f );
x264_param_t *param = &h->param;
int i;
- /* First we fill all field */
+ /* First we fill all fields */
sh->sps = sps;
sh->pps = pps;
sh->i_first_mb = 0;
- sh->i_last_mb = h->sps->i_mb_width * h->sps->i_mb_height;
+ sh->i_last_mb = h->mb.i_mb_count - 1;
sh->i_pps_id = pps->i_id;
sh->i_frame_num = i_frame;
sh->i_redundant_pic_cnt = 0;
- if( !h->mb.b_direct_auto_read )
+ h->mb.b_direct_auto_write = h->param.analyse.i_direct_mv_pred == X264_DIRECT_PRED_AUTO
+ && h->param.i_bframe
+ && ( h->param.rc.b_stat_write || !h->param.rc.b_stat_read );
+
+ if( !h->mb.b_direct_auto_read && sh->i_type == SLICE_TYPE_B )
{
- if( h->mb.b_direct_auto_write )
- sh->b_direct_spatial_mv_pred = ( h->stat.i_direct_score[1] > h->stat.i_direct_score[0] );
+ if( h->fref1[0]->i_poc_l0ref0 == h->fref0[0]->i_poc )
+ {
+ if( h->mb.b_direct_auto_write )
+ sh->b_direct_spatial_mv_pred = ( h->stat.i_direct_score[1] > h->stat.i_direct_score[0] );
+ else
+ sh->b_direct_spatial_mv_pred = ( param->analyse.i_direct_mv_pred == X264_DIRECT_PRED_SPATIAL );
+ }
else
- sh->b_direct_spatial_mv_pred = ( param->analyse.i_direct_mv_pred == X264_DIRECT_PRED_SPATIAL );
+ {
+ h->mb.b_direct_auto_write = 0;
+ sh->b_direct_spatial_mv_pred = 1;
+ }
}
/* else b_direct_spatial_mv_pred was read from the 2pass statsfile */
bs_write_ue( s, sh->i_type + 5 ); /* same type things */
bs_write_ue( s, sh->i_pps_id );
- bs_write( s, sh->sps->i_log2_max_frame_num, sh->i_frame_num );
+ bs_write( s, sh->sps->i_log2_max_frame_num, sh->i_frame_num & ((1<<sh->sps->i_log2_max_frame_num)-1) );
if( !sh->sps->b_frame_mbs_only )
{
bs_write1( s, sh->b_field_pic );
- if ( sh->b_field_pic )
+ if( sh->b_field_pic )
bs_write1( s, sh->b_bottom_field );
}
if( sh->sps->i_poc_type == 0 )
{
- bs_write( s, sh->sps->i_log2_max_poc_lsb, sh->i_poc_lsb );
+ bs_write( s, sh->sps->i_log2_max_poc_lsb, sh->i_poc_lsb & ((1<<sh->sps->i_log2_max_poc_lsb)-1) );
if( sh->pps->b_pic_order && !sh->b_field_pic )
{
bs_write_se( s, sh->i_delta_poc_bottom );
}
}
- if( ( sh->pps->b_weighted_pred && ( sh->i_type == SLICE_TYPE_P || sh->i_type == SLICE_TYPE_SP ) ) ||
- ( sh->pps->b_weighted_bipred == 1 && sh->i_type == SLICE_TYPE_B ) )
+ if( sh->pps->b_weighted_pred && ( sh->i_type == SLICE_TYPE_P || sh->i_type == SLICE_TYPE_SP ) )
+ {
+ /* pred_weight_table() */
+ bs_write_ue( s, sh->weight[0][0].i_denom );
+ bs_write_ue( s, sh->weight[0][1].i_denom );
+ for( i = 0; i < sh->i_num_ref_idx_l0_active; i++ )
+ {
+ int luma_weight_l0_flag = !!sh->weight[i][0].weightfn;
+ int chroma_weight_l0_flag = !!sh->weight[i][1].weightfn || !!sh->weight[i][2].weightfn;
+ bs_write1( s, luma_weight_l0_flag );
+ if( luma_weight_l0_flag )
+ {
+ bs_write_se( s, sh->weight[i][0].i_scale );
+ bs_write_se( s, sh->weight[i][0].i_offset );
+ }
+ bs_write1( s, chroma_weight_l0_flag );
+ if( chroma_weight_l0_flag )
+ {
+ int j;
+ for( j = 1; j < 3; j++ )
+ {
+ bs_write_se( s, sh->weight[i][j].i_scale );
+ bs_write_se( s, sh->weight[i][j].i_offset );
+ }
+ }
+ }
+ }
+ else if( sh->pps->b_weighted_bipred == 1 && sh->i_type == SLICE_TYPE_B )
{
- /* FIXME */
+ /* TODO */
}
if( i_nal_ref_idc != 0 )
}
else
{
- bs_write1( s, 0 ); /* adaptive_ref_pic_marking_mode_flag */
+ bs_write1( s, sh->i_mmco_command_count > 0 ); /* adaptive_ref_pic_marking_mode_flag */
+ if( sh->i_mmco_command_count > 0 )
+ {
+ int i;
+ for( i = 0; i < sh->i_mmco_command_count; i++ )
+ {
+ bs_write_ue( s, 1 ); /* mark short term ref as unused */
+ bs_write_ue( s, sh->mmco[i].i_difference_of_pic_nums - 1 );
+ }
+ bs_write_ue( s, 0 ); /* end command list */
+ }
}
}
/* If we are within a reasonable distance of the end of the memory allocated for the bitstream, */
/* reallocate, adding an arbitrary amount of space (100 kilobytes). */
-static void x264_bitstream_check_buffer( x264_t *h )
+static int x264_bitstream_check_buffer( x264_t *h )
{
+ uint8_t *bs_bak = h->out.p_bitstream;
if( ( h->param.b_cabac && (h->cabac.p_end - h->cabac.p < 2500) )
|| ( h->out.bs.p_end - h->out.bs.p < 2500 ) )
{
- uint8_t *bs_bak = h->out.p_bitstream;
intptr_t delta;
int i;
h->out.i_bitstream += 100000;
- h->out.p_bitstream = x264_realloc( h->out.p_bitstream, h->out.i_bitstream );
+ CHECKED_MALLOC( h->out.p_bitstream, h->out.i_bitstream );
+ h->mc.memcpy_aligned( h->out.p_bitstream, bs_bak, (h->out.i_bitstream - 100000) & ~15 );
delta = h->out.p_bitstream - bs_bak;
h->out.bs.p_start += delta;
for( i = 0; i <= h->out.i_nal; i++ )
h->out.nal[i].p_payload += delta;
+ x264_free( bs_bak );
}
+ return 0;
+fail:
+ x264_free( bs_bak );
+ return -1;
}
/****************************************************************************
static int x264_validate_parameters( x264_t *h )
{
#ifdef HAVE_MMX
- if( !(x264_cpu_detect() & X264_CPU_MMXEXT) )
+ if( !(x264_cpu_detect() & X264_CPU_SSE) )
{
- x264_log( h, X264_LOG_ERROR, "your cpu does not support MMXEXT, but x264 was compiled with asm support\n");
+ x264_log( h, X264_LOG_ERROR, "your cpu does not support SSE1, but x264 was compiled with asm support\n");
x264_log( h, X264_LOG_ERROR, "to run x264, recompile without asm support (configure --disable-asm)\n");
return -1;
}
h->param.i_width, h->param.i_height );
return -1;
}
- if( h->param.i_csp != X264_CSP_I420 )
+ int i_csp = h->param.i_csp & X264_CSP_MASK;
+ if( i_csp != X264_CSP_I420 && i_csp != X264_CSP_YV12 )
{
- x264_log( h, X264_LOG_ERROR, "invalid CSP (only I420 supported)\n" );
+ x264_log( h, X264_LOG_ERROR, "invalid CSP (only I420/YV12 supported)\n" );
return -1;
}
- if( h->param.i_threads == 0 )
- h->param.i_threads = x264_cpu_num_processors() * 3/2;
+ if( h->param.i_threads == X264_THREADS_AUTO )
+ h->param.i_threads = x264_cpu_num_processors() * (h->param.b_sliced_threads?2:3)/2;
h->param.i_threads = x264_clip3( h->param.i_threads, 1, X264_THREAD_MAX );
if( h->param.i_threads > 1 )
{
#ifndef HAVE_PTHREAD
x264_log( h, X264_LOG_WARNING, "not compiled with pthread support!\n");
h->param.i_threads = 1;
-#else
- if( h->param.i_scenecut_threshold >= 0 )
- h->param.b_pre_scenecut = 1;
#endif
+ /* Avoid absurdly small thread slices as they can reduce performance
+ * and VBV compliance. Capped at an arbitrary 4 rows per thread. */
+ if( h->param.b_sliced_threads )
+ {
+ int max_threads = (h->param.i_height+15)/16 / 4;
+ h->param.i_threads = X264_MIN( h->param.i_threads, max_threads );
+ }
}
+ else
+ h->param.b_sliced_threads = 0;
+ h->i_thread_frames = h->param.b_sliced_threads ? 1 : h->param.i_threads;
if( h->param.b_interlaced )
{
x264_log( h, X264_LOG_WARNING, "interlace + me=esa is not implemented\n" );
h->param.analyse.i_me_method = X264_ME_UMH;
}
- if( h->param.analyse.i_direct_mv_pred > X264_DIRECT_PRED_SPATIAL )
+ if( h->param.analyse.i_weighted_pred > 0 )
{
- x264_log( h, X264_LOG_WARNING, "interlace + direct=temporal is not implemented\n" );
- h->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_SPATIAL;
+ x264_log( h, X264_LOG_WARNING, "interlace + weightp is not implemented\n" );
+ h->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
+ }
+ }
+
+ /* Detect default ffmpeg settings and terminate with an error. */
+ {
+ int score = 0;
+ score += h->param.analyse.i_me_range == 0;
+ score += h->param.rc.i_qp_step == 3;
+ score += h->param.i_keyint_max == 12;
+ score += h->param.rc.i_qp_min == 2;
+ score += h->param.rc.i_qp_max == 31;
+ score += h->param.rc.f_qcompress == 0.5;
+ score += fabs(h->param.rc.f_ip_factor - 1.25) < 0.01;
+ score += fabs(h->param.rc.f_pb_factor - 1.25) < 0.01;
+ score += h->param.analyse.inter == 0 && h->param.analyse.i_subpel_refine == 8;
+ if( score >= 5 )
+ {
+ x264_log( h, X264_LOG_ERROR, "broken ffmpeg default settings detected\n" );
+ x264_log( h, X264_LOG_ERROR, "use an encoding preset (vpre)\n" );
+ return -1;
}
}
h->param.rc.f_rf_constant = x264_clip3f( h->param.rc.f_rf_constant, 0, 51 );
h->param.rc.i_qp_constant = x264_clip3( h->param.rc.i_qp_constant, 0, 51 );
if( h->param.rc.i_rc_method == X264_RC_CRF )
+ {
h->param.rc.i_qp_constant = h->param.rc.f_rf_constant;
+ h->param.rc.i_bitrate = 0;
+ }
if( (h->param.rc.i_rc_method == X264_RC_CQP || h->param.rc.i_rc_method == X264_RC_CRF)
&& h->param.rc.i_qp_constant == 0 )
{
h->param.analyse.b_fast_pskip = 0;
h->param.analyse.i_noise_reduction = 0;
h->param.analyse.f_psy_rd = 0;
+ h->param.i_bframe = 0;
/* 8x8dct is not useful at all in CAVLC lossless */
if( !h->param.b_cabac )
h->param.analyse.b_transform_8x8 = 0;
h->param.rc.i_qp_min = x264_clip3( (int)(X264_MIN3( qp_p, qp_i, qp_b )), 0, 51 );
h->param.rc.i_qp_max = x264_clip3( (int)(X264_MAX3( qp_p, qp_i, qp_b ) + .999), 0, 51 );
h->param.rc.i_aq_mode = 0;
+ h->param.rc.b_mb_tree = 0;
}
h->param.rc.i_qp_max = x264_clip3( h->param.rc.i_qp_max, 0, 51 );
h->param.rc.i_qp_min = x264_clip3( h->param.rc.i_qp_min, 0, h->param.rc.i_qp_max );
+ if( h->param.rc.i_vbv_buffer_size )
+ {
+ if( h->param.rc.i_rc_method == X264_RC_CQP )
+ {
+ x264_log( h, X264_LOG_WARNING, "VBV is incompatible with constant QP, ignored.\n" );
+ h->param.rc.i_vbv_max_bitrate = 0;
+ h->param.rc.i_vbv_buffer_size = 0;
+ }
+ else if( h->param.rc.i_vbv_max_bitrate == 0 )
+ {
+ if( h->param.rc.i_rc_method == X264_RC_ABR )
+ {
+ x264_log( h, X264_LOG_WARNING, "VBV maxrate unspecified, assuming CBR\n" );
+ h->param.rc.i_vbv_max_bitrate = h->param.rc.i_bitrate;
+ }
+ else
+ {
+ x264_log( h, X264_LOG_WARNING, "VBV bufsize set but maxrate unspecified, ignored\n" );
+ h->param.rc.i_vbv_buffer_size = 0;
+ }
+ }
+ else if( h->param.rc.i_vbv_max_bitrate < h->param.rc.i_bitrate &&
+ h->param.rc.i_rc_method == X264_RC_ABR )
+ {
+ x264_log( h, X264_LOG_WARNING, "max bitrate less than average bitrate, assuming CBR\n" );
+ h->param.rc.i_vbv_max_bitrate = h->param.rc.i_bitrate;
+ }
+ }
+ else if( h->param.rc.i_vbv_max_bitrate )
+ {
+ x264_log( h, X264_LOG_WARNING, "VBV maxrate specified, but no bufsize, ignored\n" );
+ h->param.rc.i_vbv_max_bitrate = 0;
+ }
- if( ( h->param.i_width % 16 || h->param.i_height % 16 )
- && h->param.i_height != 1080 && !h->mb.b_lossless )
+ int max_slices = (h->param.i_height+((16<<h->param.b_interlaced)-1))/(16<<h->param.b_interlaced);
+ if( h->param.b_sliced_threads )
+ h->param.i_slice_count = x264_clip3( h->param.i_threads, 0, max_slices );
+ else
{
- // There's nothing special about 1080 in that the warning still applies to it,
- // but chances are the user can't help it if his content is already 1080p,
- // so there's no point in warning in that case.
- x264_log( h, X264_LOG_WARNING,
- "width or height not divisible by 16 (%dx%d), compression will suffer.\n",
- h->param.i_width, h->param.i_height );
+ h->param.i_slice_count = x264_clip3( h->param.i_slice_count, 0, max_slices );
+ h->param.i_slice_max_size = X264_MAX( h->param.i_slice_max_size, 0 );
+ h->param.i_slice_max_mbs = X264_MAX( h->param.i_slice_max_mbs, 0 );
+ if( h->param.b_interlaced && h->param.i_slice_max_size )
+ {
+ x264_log( h, X264_LOG_WARNING, "interlaced + slice-max-size is not implemented\n" );
+ h->param.i_slice_max_size = 0;
+ }
+ if( h->param.b_interlaced && h->param.i_slice_max_mbs )
+ {
+ x264_log( h, X264_LOG_WARNING, "interlaced + slice-max-mbs is not implemented\n" );
+ h->param.i_slice_max_mbs = 0;
+ }
+ if( h->param.i_slice_max_mbs || h->param.i_slice_max_size )
+ h->param.i_slice_count = 0;
}
h->param.i_frame_reference = x264_clip3( h->param.i_frame_reference, 1, 16 );
if( h->param.i_keyint_max <= 0 )
h->param.i_keyint_max = 1;
- h->param.i_keyint_min = x264_clip3( h->param.i_keyint_min, 1, h->param.i_keyint_max/2+1 );
-
+ if( h->param.i_scenecut_threshold < 0 )
+ h->param.i_scenecut_threshold = 0;
+ if( !h->param.analyse.i_subpel_refine && h->param.analyse.i_direct_mv_pred > X264_DIRECT_PRED_SPATIAL )
+ {
+ x264_log( h, X264_LOG_WARNING, "subme=0 + direct=temporal is not supported\n" );
+ h->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_SPATIAL;
+ }
h->param.i_bframe = x264_clip3( h->param.i_bframe, 0, X264_BFRAME_MAX );
+ if( h->param.i_keyint_max == 1 )
+ {
+ h->param.i_bframe = 0;
+ h->param.b_intra_refresh = 0;
+ }
h->param.i_bframe_bias = x264_clip3( h->param.i_bframe_bias, -90, 100 );
- h->param.b_bframe_pyramid = h->param.b_bframe_pyramid && h->param.i_bframe > 1;
+ if( h->param.i_bframe <= 1 )
+ h->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
+ h->param.i_bframe_pyramid = x264_clip3( h->param.i_bframe_pyramid, X264_B_PYRAMID_NONE, X264_B_PYRAMID_NORMAL );
if( !h->param.i_bframe )
+ {
h->param.i_bframe_adaptive = X264_B_ADAPT_NONE;
- h->param.analyse.b_weighted_bipred = h->param.analyse.b_weighted_bipred && h->param.i_bframe > 0;
- h->mb.b_direct_auto_write = h->param.analyse.i_direct_mv_pred == X264_DIRECT_PRED_AUTO
- && h->param.i_bframe
- && ( h->param.rc.b_stat_write || !h->param.rc.b_stat_read );
- if( h->param.i_scenecut_threshold < 0 )
- h->param.b_pre_scenecut = 0;
+ h->param.analyse.i_direct_mv_pred = 0;
+ h->param.analyse.b_weighted_bipred = 0;
+ }
+ if( h->param.b_intra_refresh && h->param.i_bframe_pyramid == X264_B_PYRAMID_NORMAL )
+ {
+ x264_log( h, X264_LOG_WARNING, "b-pyramid normal + intra-refresh is not supported\n" );
+ h->param.i_bframe_pyramid = X264_B_PYRAMID_STRICT;
+ }
+ if( h->param.b_intra_refresh && h->param.i_frame_reference > 1 )
+ {
+ x264_log( h, X264_LOG_WARNING, "ref > 1 + intra-refresh is not supported\n" );
+ h->param.i_frame_reference = 1;
+ }
+ h->param.i_keyint_min = x264_clip3( h->param.i_keyint_min, 1, h->param.i_keyint_max/2+1 );
+ h->param.rc.i_lookahead = x264_clip3( h->param.rc.i_lookahead, 0, X264_LOOKAHEAD_MAX );
+ {
+ int maxrate = X264_MAX( h->param.rc.i_vbv_max_bitrate, h->param.rc.i_bitrate );
+ float bufsize = maxrate ? (float)h->param.rc.i_vbv_buffer_size / maxrate : 0;
+ float fps = h->param.i_fps_num > 0 && h->param.i_fps_den > 0 ? (float) h->param.i_fps_num / h->param.i_fps_den : 25.0;
+ h->param.rc.i_lookahead = X264_MIN( h->param.rc.i_lookahead, X264_MAX( h->param.i_keyint_max, bufsize*fps ) );
+ }
+
+ if( !h->param.i_timebase_num || !h->param.i_timebase_den )
+ {
+ h->param.i_timebase_num = h->param.i_fps_den;
+ h->param.i_timebase_den = h->param.i_fps_num;
+ }
+
+ h->param.rc.f_qcompress = x264_clip3f( h->param.rc.f_qcompress, 0.0, 1.0 );
+ if( !h->param.rc.i_lookahead || h->param.i_keyint_max == 1 || h->param.rc.f_qcompress == 1 )
+ h->param.rc.b_mb_tree = 0;
+ if( h->param.rc.b_stat_read )
+ h->param.rc.i_lookahead = 0;
+#ifdef HAVE_PTHREAD
+ if( h->param.i_sync_lookahead )
+ h->param.i_sync_lookahead = x264_clip3( h->param.i_sync_lookahead, h->i_thread_frames + h->param.i_bframe, X264_LOOKAHEAD_MAX );
+ if( h->param.rc.b_stat_read || h->i_thread_frames == 1 )
+ h->param.i_sync_lookahead = 0;
+#else
+ h->param.i_sync_lookahead = 0;
+#endif
h->param.i_deblocking_filter_alphac0 = x264_clip3( h->param.i_deblocking_filter_alphac0, -6, 6 );
h->param.i_deblocking_filter_beta = x264_clip3( h->param.i_deblocking_filter_beta, -6, 6 );
if( h->param.analyse.i_me_method == X264_ME_TESA &&
(h->mb.b_lossless || h->param.analyse.i_subpel_refine <= 1) )
h->param.analyse.i_me_method = X264_ME_ESA;
- h->param.analyse.i_subpel_refine = x264_clip3( h->param.analyse.i_subpel_refine, 1, 9 );
+ h->param.analyse.i_subpel_refine = x264_clip3( h->param.analyse.i_subpel_refine, 0, 10 );
h->param.analyse.b_mixed_references = h->param.analyse.b_mixed_references && h->param.i_frame_reference > 1;
h->param.analyse.inter &= X264_ANALYSE_PSUB16x16|X264_ANALYSE_PSUB8x8|X264_ANALYSE_BSUB16x16|
X264_ANALYSE_I4x4|X264_ANALYSE_I8x8;
if( !h->param.b_cabac )
h->param.analyse.i_trellis = 0;
h->param.analyse.i_trellis = x264_clip3( h->param.analyse.i_trellis, 0, 2 );
+ if( !h->param.analyse.b_psy )
+ {
+ h->param.analyse.f_psy_rd = 0;
+ h->param.analyse.f_psy_trellis = 0;
+ }
if( !h->param.analyse.i_trellis )
h->param.analyse.f_psy_trellis = 0;
h->param.analyse.f_psy_rd = x264_clip3f( h->param.analyse.f_psy_rd, 0, 10 );
/* Psy trellis has a similar effect. */
if( h->mb.i_psy_trellis )
h->param.analyse.i_chroma_qp_offset -= h->param.analyse.f_psy_trellis < 0.25 ? 1 : 2;
- else
- h->mb.i_psy_trellis = 0;
h->param.analyse.i_chroma_qp_offset = x264_clip3(h->param.analyse.i_chroma_qp_offset, -12, 12);
- h->param.rc.i_aq_mode = x264_clip3( h->param.rc.i_aq_mode, 0, 1 );
- if( h->param.rc.f_aq_strength <= 0 )
+ h->param.rc.i_aq_mode = x264_clip3( h->param.rc.i_aq_mode, 0, 2 );
+ h->param.rc.f_aq_strength = x264_clip3f( h->param.rc.f_aq_strength, 0, 3 );
+ if( h->param.rc.f_aq_strength == 0 )
h->param.rc.i_aq_mode = 0;
+ /* MB-tree requires AQ to be on, even if the strength is zero. */
+ if( !h->param.rc.i_aq_mode && h->param.rc.b_mb_tree )
+ {
+ h->param.rc.i_aq_mode = 1;
+ h->param.rc.f_aq_strength = 0;
+ }
h->param.analyse.i_noise_reduction = x264_clip3( h->param.analyse.i_noise_reduction, 0, 1<<16 );
+ if( h->param.analyse.i_subpel_refine == 10 && (h->param.analyse.i_trellis != 2 || !h->param.rc.i_aq_mode) )
+ h->param.analyse.i_subpel_refine = 9;
{
const x264_level_t *l = x264_levels;
if( h->param.i_level_idc < 0 )
{
+ int maxrate_bak = h->param.rc.i_vbv_max_bitrate;
if( h->param.rc.i_rc_method == X264_RC_ABR && h->param.rc.i_vbv_buffer_size <= 0 )
h->param.rc.i_vbv_max_bitrate = h->param.rc.i_bitrate * 2;
h->sps = h->sps_array;
x264_sps_init( h->sps, h->param.i_sps_id, &h->param );
do h->param.i_level_idc = l->level_idc;
while( l[1].level_idc && x264_validate_levels( h, 0 ) && l++ );
- if( h->param.rc.i_vbv_buffer_size <= 0 )
- h->param.rc.i_vbv_max_bitrate = 0;
+ h->param.rc.i_vbv_max_bitrate = maxrate_bak;
}
else
{
h->param.analyse.i_mv_range = l->mv_range >> h->param.b_interlaced;
else
h->param.analyse.i_mv_range = x264_clip3(h->param.analyse.i_mv_range, 32, 512 >> h->param.b_interlaced);
- if( h->param.analyse.i_direct_8x8_inference < 0 )
- h->param.analyse.i_direct_8x8_inference = l->direct8x8;
}
- if( h->param.i_threads > 1 )
+ h->param.analyse.i_weighted_pred = x264_clip3( h->param.analyse.i_weighted_pred, 0, X264_WEIGHTP_SMART );
+ if( !h->param.analyse.i_weighted_pred && h->param.rc.b_mb_tree && h->param.analyse.b_psy && !h->param.b_interlaced )
+ h->param.analyse.i_weighted_pred = X264_WEIGHTP_FAKE;
+
+ if( h->i_thread_frames > 1 )
{
int r = h->param.analyse.i_mv_range_thread;
int r2;
// the rest is allocated to whichever thread is far enough ahead to use it.
// reserving more space increases quality for some videos, but costs more time
// in thread synchronization.
- int max_range = (h->param.i_height + X264_THREAD_HEIGHT) / h->param.i_threads - X264_THREAD_HEIGHT;
+ int max_range = (h->param.i_height + X264_THREAD_HEIGHT) / h->i_thread_frames - X264_THREAD_HEIGHT;
r = max_range / 2;
}
r = X264_MAX( r, h->param.analyse.i_me_range );
/* ensure the booleans are 0 or 1 so they can be used in math */
#define BOOLIFY(x) h->param.x = !!h->param.x
BOOLIFY( b_cabac );
+ BOOLIFY( b_constrained_intra );
BOOLIFY( b_deblocking_filter );
+ BOOLIFY( b_deterministic );
+ BOOLIFY( b_sliced_threads );
BOOLIFY( b_interlaced );
+ BOOLIFY( b_intra_refresh );
+ BOOLIFY( b_visualize );
+ BOOLIFY( b_aud );
+ BOOLIFY( b_repeat_headers );
+ BOOLIFY( b_annexb );
BOOLIFY( analyse.b_transform_8x8 );
- BOOLIFY( analyse.i_direct_8x8_inference );
+ BOOLIFY( analyse.b_weighted_bipred );
BOOLIFY( analyse.b_chroma_me );
+ BOOLIFY( analyse.b_mixed_references );
BOOLIFY( analyse.b_fast_pskip );
+ BOOLIFY( analyse.b_dct_decimate );
+ BOOLIFY( analyse.b_psy );
+ BOOLIFY( analyse.b_psnr );
+ BOOLIFY( analyse.b_ssim );
BOOLIFY( rc.b_stat_write );
BOOLIFY( rc.b_stat_read );
+ BOOLIFY( rc.b_mb_tree );
#undef BOOLIFY
return 0;
memcpy( h->pixf.mbcmp, satd ? h->pixf.satd : h->pixf.sad_aligned, sizeof(h->pixf.mbcmp) );
memcpy( h->pixf.mbcmp_unaligned, satd ? h->pixf.satd : h->pixf.sad, sizeof(h->pixf.mbcmp_unaligned) );
h->pixf.intra_mbcmp_x3_16x16 = satd ? h->pixf.intra_satd_x3_16x16 : h->pixf.intra_sad_x3_16x16;
+ h->pixf.intra_mbcmp_x3_8x8c = satd ? h->pixf.intra_satd_x3_8x8c : h->pixf.intra_sad_x3_8x8c;
+ h->pixf.intra_mbcmp_x3_4x4 = satd ? h->pixf.intra_satd_x3_4x4 : h->pixf.intra_sad_x3_4x4;
satd &= h->param.analyse.i_me_method == X264_ME_TESA;
memcpy( h->pixf.fpelcmp, satd ? h->pixf.satd : h->pixf.sad, sizeof(h->pixf.fpelcmp) );
memcpy( h->pixf.fpelcmp_x3, satd ? h->pixf.satd_x3 : h->pixf.sad_x3, sizeof(h->pixf.fpelcmp_x3) );
memcpy( h->pixf.fpelcmp_x4, satd ? h->pixf.satd_x4 : h->pixf.sad_x4, sizeof(h->pixf.fpelcmp_x4) );
}
+static void x264_set_aspect_ratio( x264_t *h, x264_param_t *param, int initial )
+{
+ /* VUI */
+ if( param->vui.i_sar_width > 0 && param->vui.i_sar_height > 0 )
+ {
+ int i_w = param->vui.i_sar_width;
+ int i_h = param->vui.i_sar_height;
+ int old_w = h->param.vui.i_sar_width;
+ int old_h = h->param.vui.i_sar_height;
+
+ x264_reduce_fraction( &i_w, &i_h );
+
+ while( i_w > 65535 || i_h > 65535 )
+ {
+ i_w /= 2;
+ i_h /= 2;
+ }
+
+ x264_reduce_fraction( &i_w, &i_h );
+
+ if( i_w != old_w || i_h != old_h || initial )
+ {
+ h->param.vui.i_sar_width = 0;
+ h->param.vui.i_sar_height = 0;
+ if( i_w == 0 || i_h == 0 )
+ x264_log( h, X264_LOG_WARNING, "cannot create valid sample aspect ratio\n" );
+ else
+ {
+ x264_log( h, initial?X264_LOG_INFO:X264_LOG_DEBUG, "using SAR=%d/%d\n", i_w, i_h );
+ h->param.vui.i_sar_width = i_w;
+ h->param.vui.i_sar_height = i_h;
+ }
+ }
+ }
+}
+
/****************************************************************************
* x264_encoder_open:
****************************************************************************/
-x264_t *x264_encoder_open ( x264_param_t *param )
+x264_t *x264_encoder_open( x264_param_t *param )
{
- x264_t *h = x264_malloc( sizeof( x264_t ) );
+ x264_t *h;
char buf[1000], *p;
- int i;
+ int i, qp, i_slicetype_length;
- memset( h, 0, sizeof( x264_t ) );
+ CHECKED_MALLOCZERO( h, sizeof(x264_t) );
/* Create a copy of param */
- memcpy( &h->param, param, sizeof( x264_param_t ) );
+ memcpy( &h->param, param, sizeof(x264_param_t) );
+
+ if( param->param_free )
+ param->param_free( param );
if( x264_validate_parameters( h ) < 0 )
- {
- x264_free( h );
- return NULL;
- }
+ goto fail;
if( h->param.psz_cqm_file )
if( x264_cqm_parse_file( h, h->param.psz_cqm_file ) < 0 )
- {
- x264_free( h );
- return NULL;
- }
+ goto fail;
if( h->param.rc.psz_stat_out )
h->param.rc.psz_stat_out = strdup( h->param.rc.psz_stat_out );
if( h->param.rc.psz_stat_in )
h->param.rc.psz_stat_in = strdup( h->param.rc.psz_stat_in );
- /* VUI */
- if( h->param.vui.i_sar_width > 0 && h->param.vui.i_sar_height > 0 )
- {
- int i_w = param->vui.i_sar_width;
- int i_h = param->vui.i_sar_height;
-
- x264_reduce_fraction( &i_w, &i_h );
-
- while( i_w > 65535 || i_h > 65535 )
- {
- i_w /= 2;
- i_h /= 2;
- }
-
- h->param.vui.i_sar_width = 0;
- h->param.vui.i_sar_height = 0;
- if( i_w == 0 || i_h == 0 )
- {
- x264_log( h, X264_LOG_WARNING, "cannot create valid sample aspect ratio\n" );
- }
- else
- {
- x264_log( h, X264_LOG_INFO, "using SAR=%d/%d\n", i_w, i_h );
- h->param.vui.i_sar_width = i_w;
- h->param.vui.i_sar_height = i_h;
- }
- }
+ x264_set_aspect_ratio( h, &h->param, 1 );
x264_reduce_fraction( &h->param.i_fps_num, &h->param.i_fps_den );
+ x264_reduce_fraction( &h->param.i_timebase_num, &h->param.i_timebase_den );
/* Init x264_t */
- h->i_frame = 0;
+ h->i_frame = -1;
h->i_frame_num = 0;
h->i_idr_pic_id = 0;
+ if( h->param.b_dts_compress )
+ {
+ /* h->i_dts_compress_multiplier == h->frames.i_bframe_delay + 1 */
+ h->i_dts_compress_multiplier = h->param.i_bframe ? (h->param.i_bframe_pyramid ? 3 : 2) : 1;
+ if( h->i_dts_compress_multiplier != 1 )
+ x264_log( h, X264_LOG_DEBUG, "DTS compresion changed timebase: %d/%d -> %d/%d\n",
+ h->param.i_timebase_num, h->param.i_timebase_den,
+ h->param.i_timebase_num, h->param.i_timebase_den * h->i_dts_compress_multiplier );
+ h->param.i_timebase_den *= h->i_dts_compress_multiplier;
+ }
+ else
+ h->i_dts_compress_multiplier = 1;
h->sps = &h->sps_array[0];
x264_sps_init( h->sps, h->param.i_sps_id, &h->param );
h->pps = &h->pps_array[0];
- x264_pps_init( h->pps, h->param.i_sps_id, &h->param, h->sps);
+ x264_pps_init( h->pps, h->param.i_sps_id, &h->param, h->sps );
x264_validate_levels( h, 1 );
+ h->chroma_qp_table = i_chroma_qp_table + 12 + h->pps->i_chroma_qp_index_offset;
+
if( x264_cqm_init( h ) < 0 )
- {
- x264_free( h );
- return NULL;
- }
+ goto fail;
h->mb.i_mb_count = h->sps->i_mb_width * h->sps->i_mb_height;
/* Init frames. */
if( h->param.i_bframe_adaptive == X264_B_ADAPT_TRELLIS )
- h->frames.i_delay = X264_MAX(h->param.i_bframe,3)*4 + h->param.i_threads - 1;
+ h->frames.i_delay = X264_MAX(h->param.i_bframe,3)*4;
else
- h->frames.i_delay = h->param.i_bframe + h->param.i_threads - 1;
+ h->frames.i_delay = h->param.i_bframe;
+ if( h->param.rc.b_mb_tree || h->param.rc.i_vbv_buffer_size )
+ h->frames.i_delay = X264_MAX( h->frames.i_delay, h->param.rc.i_lookahead );
+ i_slicetype_length = h->frames.i_delay;
+ h->frames.i_delay += h->i_thread_frames - 1;
+ h->frames.i_delay = X264_MIN( h->frames.i_delay, X264_LOOKAHEAD_MAX );
+ h->frames.i_delay += h->param.i_sync_lookahead;
+ h->frames.i_bframe_delay = h->param.i_bframe ? (h->param.i_bframe_pyramid ? 2 : 1) : 0;
+
h->frames.i_max_ref0 = h->param.i_frame_reference;
h->frames.i_max_ref1 = h->sps->vui.i_num_reorder_frames;
h->frames.i_max_dpb = h->sps->vui.i_max_dec_frame_buffering;
&& ( h->param.rc.i_rc_method == X264_RC_ABR
|| h->param.rc.i_rc_method == X264_RC_CRF
|| h->param.i_bframe_adaptive
- || h->param.b_pre_scenecut );
- h->frames.b_have_lowres |= (h->param.rc.b_stat_read && h->param.rc.i_vbv_buffer_size > 0);
+ || h->param.i_scenecut_threshold
+ || h->param.rc.b_mb_tree
+ || h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART );
+ h->frames.b_have_lowres |= h->param.rc.b_stat_read && h->param.rc.i_vbv_buffer_size > 0;
+ h->frames.b_have_sub8x8_esa = !!(h->param.analyse.inter & X264_ANALYSE_PSUB8x8);
- h->frames.i_last_idr = - h->param.i_keyint_max;
+ h->frames.i_last_keyframe = - h->param.i_keyint_max;
h->frames.i_input = 0;
- h->frames.last_nonb = NULL;
+ CHECKED_MALLOCZERO( h->frames.unused[0], (h->frames.i_delay + 3) * sizeof(x264_frame_t *) );
+ /* Allocate room for max refs plus a few extra just in case. */
+ CHECKED_MALLOCZERO( h->frames.unused[1], (h->i_thread_frames + 20) * sizeof(x264_frame_t *) );
+ CHECKED_MALLOCZERO( h->frames.current, (h->param.i_sync_lookahead + h->param.i_bframe
+ + h->i_thread_frames + 3) * sizeof(x264_frame_t *) );
+ if( h->param.analyse.i_weighted_pred > 0 )
+ CHECKED_MALLOCZERO( h->frames.blank_unused, h->i_thread_frames * 4 * sizeof(x264_frame_t *) );
h->i_ref0 = 0;
h->i_ref1 = 0;
- h->chroma_qp_table = i_chroma_qp_table + 12 + h->pps->i_chroma_qp_index_offset;
-
- x264_rdo_init( );
+ x264_rdo_init();
/* init CPU functions */
x264_predict_16x16_init( h->param.cpu, h->predict_16x16 );
x264_predict_8x8c_init( h->param.cpu, h->predict_8x8c );
- x264_predict_8x8_init( h->param.cpu, h->predict_8x8 );
+ x264_predict_8x8_init( h->param.cpu, h->predict_8x8, &h->predict_8x8_filter );
x264_predict_4x4_init( h->param.cpu, h->predict_4x4 );
-
+ if( !h->param.b_cabac )
+ x264_init_vlc_tables();
x264_pixel_init( h->param.cpu, &h->pixf );
x264_dct_init( h->param.cpu, &h->dctf );
x264_zigzag_init( h->param.cpu, &h->zigzagf, h->param.b_interlaced );
for( i=0; x264_cpu_names[i].flags; i++ )
{
if( !strcmp(x264_cpu_names[i].name, "SSE2")
- && param->cpu & (X264_CPU_SSE2_IS_FAST|X264_CPU_SSE2_IS_SLOW) )
+ && h->param.cpu & (X264_CPU_SSE2_IS_FAST|X264_CPU_SSE2_IS_SLOW) )
continue;
if( !strcmp(x264_cpu_names[i].name, "SSE3")
- && (param->cpu & X264_CPU_SSSE3 || !(param->cpu & X264_CPU_CACHELINE_64)) )
+ && (h->param.cpu & X264_CPU_SSSE3 || !(h->param.cpu & X264_CPU_CACHELINE_64)) )
continue;
- if( (param->cpu & x264_cpu_names[i].flags) == x264_cpu_names[i].flags
+ if( !strcmp(x264_cpu_names[i].name, "SSE4.1")
+ && (h->param.cpu & X264_CPU_SSE42) )
+ continue;
+ if( (h->param.cpu & x264_cpu_names[i].flags) == x264_cpu_names[i].flags
&& (!i || x264_cpu_names[i].flags != x264_cpu_names[i-1].flags) )
p += sprintf( p, " %s", x264_cpu_names[i].name );
}
- if( !param->cpu )
+ if( !h->param.cpu )
p += sprintf( p, " none!" );
x264_log( h, X264_LOG_INFO, "%s\n", buf );
+ for( qp = h->param.rc.i_qp_min; qp <= h->param.rc.i_qp_max; qp++ )
+ if( x264_analyse_init_costs( h, qp ) )
+ goto fail;
+ if( x264_analyse_init_costs( h, X264_LOOKAHEAD_QP ) )
+ goto fail;
+ if( h->cost_mv[1][2013] != 24 )
+ {
+ x264_log( h, X264_LOG_ERROR, "MV cost test failed: x264 has been miscompiled!\n" );
+ goto fail;
+ }
+
h->out.i_nal = 0;
h->out.i_bitstream = X264_MAX( 1000000, h->param.i_width * h->param.i_height * 4
* ( h->param.rc.i_rc_method == X264_RC_ABR ? pow( 0.95, h->param.rc.i_qp_min )
: pow( 0.95, h->param.rc.i_qp_constant ) * X264_MAX( 1, h->param.rc.f_ip_factor )));
+ CHECKED_MALLOC( h->nal_buffer, h->out.i_bitstream * 3/2 + 4 );
+ h->nal_buffer_size = h->out.i_bitstream * 3/2 + 4;
+
h->thread[0] = h;
- h->i_thread_num = 0;
- for( i = 1; i < h->param.i_threads; i++ )
- h->thread[i] = x264_malloc( sizeof(x264_t) );
+ for( i = 1; i < h->param.i_threads + !!h->param.i_sync_lookahead; i++ )
+ CHECKED_MALLOC( h->thread[i], sizeof(x264_t) );
+
+ if( x264_lookahead_init( h, i_slicetype_length ) )
+ goto fail;
for( i = 0; i < h->param.i_threads; i++ )
{
+ int init_nal_count = h->param.i_slice_count + 3;
+ int allocate_threadlocal_data = !h->param.b_sliced_threads || !i;
if( i > 0 )
*h->thread[i] = *h;
- h->thread[i]->fdec = x264_frame_pop_unused( h );
- h->thread[i]->out.p_bitstream = x264_malloc( h->out.i_bitstream );
- if( x264_macroblock_cache_init( h->thread[i] ) < 0 )
- return NULL;
+
+ if( allocate_threadlocal_data )
+ {
+ h->thread[i]->fdec = x264_frame_pop_unused( h, 1 );
+ if( !h->thread[i]->fdec )
+ goto fail;
+ }
+ else
+ h->thread[i]->fdec = h->thread[0]->fdec;
+
+ CHECKED_MALLOC( h->thread[i]->out.p_bitstream, h->out.i_bitstream );
+ /* Start each thread with room for init_nal_count NAL units; it'll realloc later if needed. */
+ CHECKED_MALLOC( h->thread[i]->out.nal, init_nal_count*sizeof(x264_nal_t) );
+ h->thread[i]->out.i_nals_allocated = init_nal_count;
+
+ if( allocate_threadlocal_data && x264_macroblock_cache_init( h->thread[i] ) < 0 )
+ goto fail;
+ }
+
+ /* Allocate scratch buffer */
+ for( i = 0; i < h->param.i_threads + !!h->param.i_sync_lookahead; i++ )
+ {
+ int buf_hpel = (h->param.i_width+48) * sizeof(int16_t);
+ int buf_ssim = h->param.analyse.b_ssim * 8 * (h->param.i_width/4+3) * sizeof(int);
+ int me_range = X264_MIN(h->param.analyse.i_me_range, h->param.analyse.i_mv_range);
+ int buf_tesa = (h->param.analyse.i_me_method >= X264_ME_ESA) *
+ ((me_range*2+18) * sizeof(int16_t) + (me_range+4) * (me_range+1) * 4 * sizeof(mvsad_t));
+ int buf_mbtree = h->param.rc.b_mb_tree * ((h->sps->i_mb_width+3)&~3) * sizeof(int);
+ int buf_nnz = !h->param.b_cabac * h->pps->b_transform_8x8_mode * (h->sps->i_mb_width * 4 * 16 * sizeof(uint8_t));
+ int scratch_size = X264_MAX4( buf_hpel, buf_ssim, buf_tesa, X264_MAX( buf_mbtree, buf_nnz ) );
+ CHECKED_MALLOC( h->thread[i]->scratch_buffer, scratch_size );
}
if( x264_ratecontrol_new( h ) < 0 )
- return NULL;
+ goto fail;
if( h->param.psz_dump_yuv )
{
/* create or truncate the reconstructed video file */
FILE *f = fopen( h->param.psz_dump_yuv, "w" );
- if( f )
- fclose( f );
- else
+ if( !f )
{
- x264_log( h, X264_LOG_ERROR, "can't write to fdec.yuv\n" );
- x264_free( h );
- return NULL;
+ x264_log( h, X264_LOG_ERROR, "dump_yuv: can't write to %s\n", h->param.psz_dump_yuv );
+ goto fail;
}
+ else if( !x264_is_regular_file( f ) )
+ {
+ x264_log( h, X264_LOG_ERROR, "dump_yuv: incompatible with non-regular file %s\n", h->param.psz_dump_yuv );
+ goto fail;
+ }
+ fclose( f );
}
x264_log( h, X264_LOG_INFO, "profile %s, level %d.%d\n",
"High 4:4:4 Predictive", h->sps->i_level_idc/10, h->sps->i_level_idc%10 );
return h;
+fail:
+ x264_free( h );
+ return NULL;
}
/****************************************************************************
****************************************************************************/
int x264_encoder_reconfig( x264_t *h, x264_param_t *param )
{
+ h = h->thread[h->thread[0]->i_thread_phase];
+ x264_set_aspect_ratio( h, param, 0 );
#define COPY(var) h->param.var = param->var
COPY( i_frame_reference ); // but never uses more refs than initially specified
COPY( i_bframe_bias );
- if( h->param.i_scenecut_threshold >= 0 && param->i_scenecut_threshold >= 0 )
+ if( h->param.i_scenecut_threshold )
COPY( i_scenecut_threshold ); // can't turn it on or off, only vary the threshold
COPY( b_deblocking_filter );
COPY( i_deblocking_filter_alphac0 );
COPY( i_deblocking_filter_beta );
- COPY( analyse.intra );
COPY( analyse.inter );
+ COPY( analyse.intra );
COPY( analyse.i_direct_mv_pred );
- COPY( analyse.i_me_method );
- COPY( analyse.i_me_range );
+ /* Scratch buffer prevents me_range from being increased for esa/tesa */
+ if( h->param.analyse.i_me_method < X264_ME_ESA || param->analyse.i_me_range < h->param.analyse.i_me_range )
+ COPY( analyse.i_me_range );
COPY( analyse.i_noise_reduction );
- COPY( analyse.i_subpel_refine );
+ /* We can't switch out of subme=0 during encoding. */
+ if( h->param.analyse.i_subpel_refine )
+ COPY( analyse.i_subpel_refine );
COPY( analyse.i_trellis );
COPY( analyse.b_chroma_me );
COPY( analyse.b_dct_decimate );
COPY( analyse.b_fast_pskip );
COPY( analyse.b_mixed_references );
+ COPY( analyse.f_psy_rd );
+ COPY( analyse.f_psy_trellis );
// can only twiddle these if they were enabled to begin with:
+ if( h->param.analyse.i_me_method >= X264_ME_ESA || param->analyse.i_me_method < X264_ME_ESA )
+ COPY( analyse.i_me_method );
+ if( h->param.analyse.i_me_method >= X264_ME_ESA && !h->frames.b_have_sub8x8_esa )
+ h->param.analyse.inter &= ~X264_ANALYSE_PSUB8x8;
if( h->pps->b_transform_8x8_mode )
COPY( analyse.b_transform_8x8 );
if( h->frames.i_max_ref1 > 1 )
- COPY( b_bframe_pyramid );
+ COPY( i_bframe_pyramid );
+ COPY( i_slice_max_size );
+ COPY( i_slice_max_mbs );
+ COPY( i_slice_count );
+ /* VBV can't be turned on if it wasn't on to begin with */
+ if( h->param.rc.i_vbv_max_bitrate > 0 && h->param.rc.i_vbv_buffer_size > 0 &&
+ param->rc.i_vbv_max_bitrate > 0 && param->rc.i_vbv_buffer_size > 0 )
+ {
+ COPY( rc.i_vbv_max_bitrate );
+ COPY( rc.i_vbv_buffer_size );
+ COPY( rc.i_bitrate );
+ }
+ COPY( rc.f_rf_constant );
#undef COPY
mbcmp_init( h );
- return x264_validate_parameters( h );
+ int ret = x264_validate_parameters( h );
+
+ /* Supported reconfiguration options (1-pass only):
+ * vbv-maxrate
+ * vbv-bufsize
+ * crf
+ * bitrate (CBR only) */
+ if( !ret )
+ x264_ratecontrol_init_reconfigurable( h, 0 );
+
+ return ret;
+}
+
+/****************************************************************************
+ * x264_encoder_parameters:
+ ****************************************************************************/
+void x264_encoder_parameters( x264_t *h, x264_param_t *param )
+{
+ memcpy( param, &h->thread[h->i_thread_phase]->param, sizeof(x264_param_t) );
}
/* internal usage */
nal->i_payload= 0;
nal->p_payload= &h->out.p_bitstream[bs_pos( &h->out.bs ) / 8];
}
-static void x264_nal_end( x264_t *h )
+/* if number of allocated nals is not enough, re-allocate a larger one. */
+static int x264_nal_check_buffer( x264_t *h )
+{
+ if( h->out.i_nal >= h->out.i_nals_allocated )
+ {
+ x264_nal_t *new_out = x264_malloc( sizeof(x264_nal_t) * (h->out.i_nals_allocated*2) );
+ if( !new_out )
+ return -1;
+ memcpy( new_out, h->out.nal, sizeof(x264_nal_t) * (h->out.i_nals_allocated) );
+ x264_free( h->out.nal );
+ h->out.nal = new_out;
+ h->out.i_nals_allocated *= 2;
+ }
+ return 0;
+}
+static int x264_nal_end( x264_t *h )
{
x264_nal_t *nal = &h->out.nal[h->out.i_nal];
nal->i_payload = &h->out.p_bitstream[bs_pos( &h->out.bs ) / 8] - nal->p_payload;
h->out.i_nal++;
+
+ return x264_nal_check_buffer( h );
+}
+
+static int x264_encoder_encapsulate_nals( x264_t *h )
+{
+ int nal_size = 0, i;
+ for( i = 0; i < h->out.i_nal; i++ )
+ nal_size += h->out.nal[i].i_payload;
+
+ /* Worst-case NAL unit escaping: reallocate the buffer if it's too small. */
+ if( h->nal_buffer_size < nal_size * 3/2 + h->out.i_nal * 4 )
+ {
+ uint8_t *buf = x264_malloc( nal_size * 2 + h->out.i_nal * 4 );
+ if( !buf )
+ return -1;
+ x264_free( h->nal_buffer );
+ h->nal_buffer = buf;
+ }
+
+ uint8_t *nal_buffer = h->nal_buffer;
+
+ for( i = 0; i < h->out.i_nal; i++ )
+ {
+ int size = x264_nal_encode( nal_buffer, h->param.b_annexb, &h->out.nal[i] );
+ h->out.nal[i].i_payload = size;
+ h->out.nal[i].p_payload = nal_buffer;
+ nal_buffer += size;
+ }
+
+ return nal_buffer - h->nal_buffer;
}
/****************************************************************************
****************************************************************************/
int x264_encoder_headers( x264_t *h, x264_nal_t **pp_nal, int *pi_nal )
{
+ int frame_size = 0;
/* init bitstream context */
h->out.i_nal = 0;
bs_init( &h->out.bs, h->out.p_bitstream, h->out.i_bitstream );
- /* Put SPS and PPS */
- if( h->i_frame == 0 )
- {
- /* identify ourself */
- x264_nal_start( h, NAL_SEI, NAL_PRIORITY_DISPOSABLE );
- x264_sei_version_write( h, &h->out.bs );
- x264_nal_end( h );
+ /* Write SEI, SPS and PPS. */
+ x264_nal_start( h, NAL_SEI, NAL_PRIORITY_DISPOSABLE );
+ if( x264_sei_version_write( h, &h->out.bs ) )
+ return -1;
+ if( x264_nal_end( h ) )
+ return -1;
- /* generate sequence parameters */
- x264_nal_start( h, NAL_SPS, NAL_PRIORITY_HIGHEST );
- x264_sps_write( &h->out.bs, h->sps );
- x264_nal_end( h );
+ /* generate sequence parameters */
+ x264_nal_start( h, NAL_SPS, NAL_PRIORITY_HIGHEST );
+ x264_sps_write( &h->out.bs, h->sps );
+ if( x264_nal_end( h ) )
+ return -1;
+
+ /* generate picture parameters */
+ x264_nal_start( h, NAL_PPS, NAL_PRIORITY_HIGHEST );
+ x264_pps_write( &h->out.bs, h->pps );
+ if( x264_nal_end( h ) )
+ return -1;
+
+ frame_size = x264_encoder_encapsulate_nals( h );
- /* generate picture parameters */
- x264_nal_start( h, NAL_PPS, NAL_PRIORITY_HIGHEST );
- x264_pps_write( &h->out.bs, h->pps );
- x264_nal_end( h );
- }
/* now set output*/
*pi_nal = h->out.i_nal;
*pp_nal = &h->out.nal[0];
h->out.i_nal = 0;
- return 0;
+ return frame_size;
}
-static inline void x264_reference_build_list( x264_t *h, int i_poc )
+/* Check to see whether we have chosen a reference list ordering different
+ * from the standard's default. */
+static inline void x264_reference_check_reorder( x264_t *h )
{
int i;
- int b_ok;
+ for( i = 0; i < h->i_ref0 - 1; i++ )
+ /* P and B-frames use different default orders. */
+ if( h->sh.i_type == SLICE_TYPE_P ? h->fref0[i]->i_frame_num < h->fref0[i+1]->i_frame_num
+ : h->fref0[i]->i_poc < h->fref0[i+1]->i_poc )
+ {
+ h->b_ref_reorder[0] = 1;
+ break;
+ }
+}
+
+/* return -1 on failure, else return the index of the new reference frame */
+int x264_weighted_reference_duplicate( x264_t *h, int i_ref, const x264_weight_t *w )
+{
+ int i = h->i_ref0;
+ int j;
+ x264_frame_t *newframe;
+ if( i <= 1 ) /* empty list, definitely can't duplicate frame */
+ return -1;
+
+ /* Find a place to insert the duplicate in the reference list. */
+ for( j = 0; j < i; j++ )
+ if( h->fref0[i_ref]->i_frame != h->fref0[j]->i_frame )
+ {
+ /* found a place, after j, make sure there is not already a duplicate there */
+ if( j == i-1 || ( h->fref0[j+1] && h->fref0[i_ref]->i_frame != h->fref0[j+1]->i_frame ) )
+ break;
+ }
+
+ if( j == i ) /* No room in the reference list for the duplicate. */
+ return -1;
+ j++;
+
+ newframe = x264_frame_pop_blank_unused( h );
+
+ //FIXME: probably don't need to copy everything
+ *newframe = *h->fref0[i_ref];
+ newframe->i_reference_count = 1;
+ newframe->orig = h->fref0[i_ref];
+ newframe->b_duplicate = 1;
+ memcpy( h->fenc->weight[j], w, sizeof(h->fenc->weight[i]) );
+
+ /* shift the frames to make space for the dupe. */
+ h->b_ref_reorder[0] = 1;
+ if( h->i_ref0 < 16 )
+ ++h->i_ref0;
+ h->fref0[15] = NULL;
+ x264_frame_unshift( &h->fref0[j], newframe );
+
+ return j;
+}
+
+static void x264_weighted_pred_init( x264_t *h )
+{
+ int i_ref;
+ int i;
+
+ /* for now no analysis and set all weights to nothing */
+ for( i_ref = 0; i_ref < h->i_ref0; i_ref++ )
+ h->fenc->weighted[i_ref] = h->fref0[i_ref]->filtered[0];
+
+ // FIXME: This only supports weighting of one reference frame
+ // and duplicates of that frame.
+ h->fenc->i_lines_weighted = 0;
+
+ for( i_ref = 0; i_ref < (h->i_ref0 << h->sh.b_mbaff); i_ref++ )
+ for( i = 0; i < 3; i++ )
+ h->sh.weight[i_ref][i].weightfn = NULL;
+
+
+ if( h->sh.i_type != SLICE_TYPE_P || h->param.analyse.i_weighted_pred <= 0 )
+ return;
+
+ int i_padv = PADV << h->param.b_interlaced;
+ int denom = -1;
+ int weightluma = 0;
+ int buffer_next = 0;
+ int j;
+ //FIXME: when chroma support is added, move this into loop
+ h->sh.weight[0][1].weightfn = h->sh.weight[0][2].weightfn = NULL;
+ h->sh.weight[0][1].i_denom = h->sh.weight[0][2].i_denom = 0;
+ for( j = 0; j < h->i_ref0; j++ )
+ {
+ if( h->fenc->weight[j][0].weightfn )
+ {
+ h->sh.weight[j][0] = h->fenc->weight[j][0];
+ // if weight is useless, don't write it to stream
+ if( h->sh.weight[j][0].i_scale == 1<<h->sh.weight[j][0].i_denom && h->sh.weight[j][0].i_offset == 0 )
+ h->sh.weight[j][0].weightfn = NULL;
+ else
+ {
+ if( !weightluma )
+ {
+ weightluma = 1;
+ h->sh.weight[0][0].i_denom = denom = h->sh.weight[j][0].i_denom;
+ assert( x264_clip3( denom, 0, 7 ) == denom );
+ }
+ assert( h->sh.weight[j][0].i_denom == denom );
+ assert( x264_clip3( h->sh.weight[j][0].i_scale, 0, 127 ) == h->sh.weight[j][0].i_scale );
+ assert( x264_clip3( h->sh.weight[j][0].i_offset, -128, 127 ) == h->sh.weight[j][0].i_offset );
+ h->fenc->weighted[j] = h->mb.p_weight_buf[buffer_next++] +
+ h->fenc->i_stride[0] * i_padv + PADH;
+ }
+ }
+
+ //scale full resolution frame
+ if( h->sh.weight[j][0].weightfn && h->param.i_threads == 1 )
+ {
+ uint8_t *src = h->fref0[j]->filtered[0] - h->fref0[j]->i_stride[0]*i_padv - PADH;
+ uint8_t *dst = h->fenc->weighted[j] - h->fenc->i_stride[0]*i_padv - PADH;
+ int stride = h->fenc->i_stride[0];
+ int width = h->fenc->i_width[0] + PADH*2;
+ int height = h->fenc->i_lines[0] + i_padv*2;
+ x264_weight_scale_plane( h, dst, stride, src, stride, width, height, &h->sh.weight[j][0] );
+ h->fenc->i_lines_weighted = height;
+ }
+ }
+ if( !weightluma )
+ h->sh.weight[0][0].i_denom = 0;
+}
+
+static inline void x264_reference_build_list( x264_t *h, int i_poc )
+{
+ int i, b_ok;
/* build ref list 0/1 */
- h->i_ref0 = 0;
- h->i_ref1 = 0;
+ h->mb.pic.i_fref[0] = h->i_ref0 = 0;
+ h->mb.pic.i_fref[1] = h->i_ref1 = 0;
+ if( h->sh.i_type == SLICE_TYPE_I )
+ return;
+
for( i = 0; h->frames.reference[i]; i++ )
{
if( h->frames.reference[i]->i_poc < i_poc )
}
}
} while( !b_ok );
+
+ if( h->sh.i_mmco_remove_from_end )
+ for( i = h->i_ref0-1; i >= h->i_ref0 - h->sh.i_mmco_remove_from_end; i-- )
+ {
+ int diff = h->i_frame_num - h->fref0[i]->i_frame_num;
+ h->sh.mmco[h->sh.i_mmco_command_count].i_poc = h->fref0[i]->i_poc;
+ h->sh.mmco[h->sh.i_mmco_command_count++].i_difference_of_pic_nums = diff;
+ }
+
/* Order ref1 from lower to higher poc (bubble sort) for B-frame */
do
{
}
} while( !b_ok );
- /* In the standard, a P-frame's ref list is sorted by frame_num.
- * We use POC, but check whether explicit reordering is needed */
- h->b_ref_reorder[0] =
- h->b_ref_reorder[1] = 0;
- if( h->sh.i_type == SLICE_TYPE_P )
+ x264_reference_check_reorder( h );
+
+ h->i_ref1 = X264_MIN( h->i_ref1, h->frames.i_max_ref1 );
+ h->i_ref0 = X264_MIN( h->i_ref0, h->frames.i_max_ref0 );
+ h->i_ref0 = X264_MIN( h->i_ref0, h->param.i_frame_reference ); // if reconfig() has lowered the limit
+
+ /* add duplicates */
+ if( h->fenc->i_type == X264_TYPE_P )
{
- for( i = 0; i < h->i_ref0 - 1; i++ )
- if( h->fref0[i]->i_frame_num < h->fref0[i+1]->i_frame_num )
+ int idx = -1;
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART )
+ {
+ x264_weight_t w[3];
+ w[1].weightfn = w[2].weightfn = NULL;
+ if( h->param.rc.b_stat_read )
+ x264_ratecontrol_set_weights( h, h->fenc );
+
+ if( !h->fenc->weight[0][0].weightfn )
{
- h->b_ref_reorder[0] = 1;
- break;
+ h->fenc->weight[0][0].i_denom = 0;
+ SET_WEIGHT( w[0], 1, 1, 0, -1 );
+ idx = x264_weighted_reference_duplicate( h, 0, w );
+ }
+ else
+ {
+ if( h->fenc->weight[0][0].i_scale == 1<<h->fenc->weight[0][0].i_denom )
+ {
+ SET_WEIGHT( h->fenc->weight[0][0], 1, 1, 0, h->fenc->weight[0][0].i_offset );
+ }
+ x264_weighted_reference_duplicate( h, 0, weight_none );
+ if( h->fenc->weight[0][0].i_offset > -128 )
+ {
+ w[0] = h->fenc->weight[0][0];
+ w[0].i_offset--;
+ h->mc.weight_cache( h, &w[0] );
+ idx = x264_weighted_reference_duplicate( h, 0, w );
+ }
}
+ }
+ else if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_BLIND )
+ {
+ //weighted offset=-1
+ x264_weight_t w[3];
+ SET_WEIGHT( w[0], 1, 1, 0, -1 );
+ h->fenc->weight[0][0].i_denom = 0;
+ w[1].weightfn = w[2].weightfn = NULL;
+ idx = x264_weighted_reference_duplicate( h, 0, w );
+ }
+ h->mb.ref_blind_dupe = idx;
}
- h->i_ref1 = X264_MIN( h->i_ref1, h->frames.i_max_ref1 );
- h->i_ref0 = X264_MIN( h->i_ref0, h->frames.i_max_ref0 );
- h->i_ref0 = X264_MIN( h->i_ref0, h->param.i_frame_reference ); // if reconfig() has lowered the limit
assert( h->i_ref0 + h->i_ref1 <= 16 );
h->mb.pic.i_fref[0] = h->i_ref0;
h->mb.pic.i_fref[1] = h->i_ref1;
if( min_y < 0 )
return;
- if( !b_end )
+ if( !b_end && !h->param.b_sliced_threads )
{
int i, j;
for( j=0; j<=h->sh.b_mbaff; j++ )
if( b_hpel )
{
x264_frame_expand_border( h, h->fdec, min_y, b_end );
- x264_frame_filter( h, h->fdec, min_y, b_end );
- x264_frame_expand_border_filtered( h, h->fdec, min_y, b_end );
+ if( h->param.analyse.i_subpel_refine )
+ {
+ x264_frame_filter( h, h->fdec, min_y, b_end );
+ x264_frame_expand_border_filtered( h, h->fdec, min_y, b_end );
+ }
}
- if( h->param.i_threads > 1 && h->fdec->b_kept_as_ref )
- {
+ if( h->i_thread_frames > 1 && h->fdec->b_kept_as_ref )
x264_frame_cond_broadcast( h->fdec, mb_y*16 + (b_end ? 10000 : -(X264_THREAD_HEIGHT << h->sh.b_mbaff)) );
- }
min_y = X264_MAX( min_y*16-8, 0 );
max_y = b_end ? h->param.i_height : mb_y*16-8;
x264_pixel_ssim_wxh( &h->pixf,
h->fdec->plane[0] + 2+min_y*h->fdec->i_stride[0], h->fdec->i_stride[0],
h->fenc->plane[0] + 2+min_y*h->fenc->i_stride[0], h->fenc->i_stride[0],
- h->param.i_width-2, max_y-min_y );
+ h->param.i_width-2, max_y-min_y, h->scratch_buffer );
}
}
-static inline void x264_reference_update( x264_t *h )
+static inline int x264_reference_update( x264_t *h )
{
- int i;
-
- if( h->fdec->i_frame >= 0 )
- h->i_frame++;
-
+ int i, j;
if( !h->fdec->b_kept_as_ref )
{
- if( h->param.i_threads > 1 )
+ if( h->i_thread_frames > 1 )
{
x264_frame_push_unused( h, h->fdec );
- h->fdec = x264_frame_pop_unused( h );
+ h->fdec = x264_frame_pop_unused( h, 1 );
+ if( !h->fdec )
+ return -1;
}
- return;
- }
-
- /* move lowres copy of the image to the ref frame */
- for( i = 0; i < 4; i++)
- {
- XCHG( uint8_t*, h->fdec->lowres[i], h->fenc->lowres[i] );
- XCHG( uint8_t*, h->fdec->buffer_lowres[i], h->fenc->buffer_lowres[i] );
+ return 0;
}
- /* adaptive B decision needs a pointer, since it can't use the ref lists */
- if( h->sh.i_type != SLICE_TYPE_B )
- h->frames.last_nonb = h->fdec;
+ /* apply mmco from previous frame. */
+ for( i = 0; i < h->sh.i_mmco_command_count; i++ )
+ for( j = 0; h->frames.reference[j]; j++ )
+ if( h->frames.reference[j]->i_poc == h->sh.mmco[i].i_poc )
+ x264_frame_push_unused( h, x264_frame_shift( &h->frames.reference[j] ) );
/* move frame in the buffer */
x264_frame_push( h->frames.reference, h->fdec );
- if( h->frames.reference[h->frames.i_max_dpb] )
+ if( h->frames.reference[h->sps->i_num_ref_frames] )
x264_frame_push_unused( h, x264_frame_shift( h->frames.reference ) );
- h->fdec = x264_frame_pop_unused( h );
+ h->fdec = x264_frame_pop_unused( h, 1 );
+ if( !h->fdec )
+ return -1;
+ return 0;
}
static inline void x264_reference_reset( x264_t *h )
h->fenc->i_poc = 0;
}
+static inline void x264_reference_hierarchy_reset( x264_t *h )
+{
+ int i, ref;
+ int b_hasdelayframe = 0;
+ if( !h->param.i_bframe_pyramid )
+ return;
+
+ /* look for delay frames -- chain must only contain frames that are disposable */
+ for( i = 0; h->frames.current[i] && IS_DISPOSABLE( h->frames.current[i]->i_type ); i++ )
+ b_hasdelayframe |= h->frames.current[i]->i_coded
+ != h->frames.current[i]->i_frame + h->sps->vui.i_num_reorder_frames;
+
+ if( h->param.i_bframe_pyramid != X264_B_PYRAMID_STRICT && !b_hasdelayframe )
+ return;
+
+ /* Remove last BREF. There will never be old BREFs in the
+ * dpb during a BREF decode when pyramid == STRICT */
+ for( ref = 0; h->frames.reference[ref]; ref++ )
+ {
+ if( h->param.i_bframe_pyramid == X264_B_PYRAMID_STRICT
+ && h->frames.reference[ref]->i_type == X264_TYPE_BREF )
+ {
+ int diff = h->i_frame_num - h->frames.reference[ref]->i_frame_num;
+ h->sh.mmco[h->sh.i_mmco_command_count].i_difference_of_pic_nums = diff;
+ h->sh.mmco[h->sh.i_mmco_command_count++].i_poc = h->frames.reference[ref]->i_poc;
+ x264_frame_push_unused( h, x264_frame_pop( h->frames.reference ) );
+ h->b_ref_reorder[0] = 1;
+ break;
+ }
+ }
+
+ /* Prepare to room in the dpb for the delayed display time of the later b-frame's */
+ h->sh.i_mmco_remove_from_end = X264_MAX( ref + 2 - h->frames.i_max_dpb, 0 );
+}
+
static inline void x264_slice_init( x264_t *h, int i_nal_type, int i_global_qp )
{
/* ------------------------ Create slice header ----------------------- */
if( h->sps->i_poc_type == 0 )
{
h->sh.i_poc_lsb = h->fdec->i_poc & ( (1 << h->sps->i_log2_max_poc_lsb) - 1 );
- h->sh.i_delta_poc_bottom = 0; /* XXX won't work for field */
+ h->sh.i_delta_poc_bottom = 0;
}
else if( h->sps->i_poc_type == 1 )
{
x264_macroblock_slice_init( h );
}
-static void x264_slice_write( x264_t *h )
+static int x264_slice_write( x264_t *h )
{
int i_skip;
int mb_xy, i_mb_x, i_mb_y;
- int i, i_list, i_ref;
-
- /* init stats */
- memset( &h->stat.frame, 0, sizeof(h->stat.frame) );
+ int i, i_list, i_ref, i_skip_bak = 0; /* Shut up GCC. */
+ bs_t bs_bak;
+ x264_cabac_t cabac_bak;
+ uint8_t cabac_prevbyte_bak = 0; /* Shut up GCC. */
+ /* Assume no more than 3 bytes of NALU escaping. */
+ int slice_max_size = h->param.i_slice_max_size > 0 ? (h->param.i_slice_max_size-3-NALU_OVERHEAD)*8 : INT_MAX;
+ int starting_bits = bs_pos(&h->out.bs);
+ bs_realign( &h->out.bs );
/* Slice */
x264_nal_start( h, h->i_nal_type, h->i_nal_ref_idc );
/* Slice header */
+ x264_macroblock_thread_init( h );
x264_slice_header_write( &h->out.bs, &h->sh, h->i_nal_ref_idc );
if( h->param.b_cabac )
{
i_mb_x = h->sh.i_first_mb % h->sps->i_mb_width;
i_skip = 0;
- while( (mb_xy = i_mb_x + i_mb_y * h->sps->i_mb_width) < h->sh.i_last_mb )
+ while( (mb_xy = i_mb_x + i_mb_y * h->sps->i_mb_width) <= h->sh.i_last_mb )
{
int mb_spos = bs_pos(&h->out.bs) + x264_cabac_pos(&h->cabac);
+ if( h->param.i_slice_max_size > 0 )
+ {
+ /* We don't need the contexts because flushing the CABAC encoder has no context
+ * dependency and macroblocks are only re-encoded in the case where a slice is
+ * ended (and thus the content of all contexts are thrown away). */
+ if( h->param.b_cabac )
+ {
+ memcpy( &cabac_bak, &h->cabac, offsetof(x264_cabac_t, f8_bits_encoded) );
+ /* x264's CABAC writer modifies the previous byte during carry, so it has to be
+ * backed up. */
+ cabac_prevbyte_bak = h->cabac.p[-1];
+ }
+ else
+ {
+ bs_bak = h->out.bs;
+ i_skip_bak = i_skip;
+ }
+ }
- if( i_mb_x == 0 )
+ if( i_mb_x == 0 && !h->mb.b_reencode_mb && !h->param.b_sliced_threads )
x264_fdec_filter_row( h, i_mb_y );
/* load cache */
x264_macroblock_cache_load( h, i_mb_x, i_mb_y );
- /* analyse parameters
- * Slice I: choose I_4x4 or I_16x16 mode
- * Slice P: choose between using P mode or intra (4x4 or 16x16)
- * */
x264_macroblock_analyse( h );
/* encode this macroblock -> be careful it can change the mb type to P_SKIP if needed */
x264_macroblock_encode( h );
- x264_bitstream_check_buffer( h );
+ if( x264_bitstream_check_buffer( h ) )
+ return -1;
if( h->param.b_cabac )
{
bs_write_ue( &h->out.bs, i_skip ); /* skip run */
i_skip = 0;
}
- x264_macroblock_write_cavlc( h, &h->out.bs );
+ x264_macroblock_write_cavlc( h );
}
}
-#if VISUALIZE
+ int total_bits = bs_pos(&h->out.bs) + x264_cabac_pos(&h->cabac);
+ int mb_size = total_bits - mb_spos;
+
+ /* We'll just re-encode this last macroblock if we go over the max slice size. */
+ if( total_bits - starting_bits > slice_max_size && !h->mb.b_reencode_mb )
+ {
+ if( mb_xy != h->sh.i_first_mb )
+ {
+ if( h->param.b_cabac )
+ {
+ memcpy( &h->cabac, &cabac_bak, offsetof(x264_cabac_t, f8_bits_encoded) );
+ h->cabac.p[-1] = cabac_prevbyte_bak;
+ }
+ else
+ {
+ h->out.bs = bs_bak;
+ i_skip = i_skip_bak;
+ }
+ h->mb.b_reencode_mb = 1;
+ h->sh.i_last_mb = mb_xy-1;
+ break;
+ }
+ else
+ {
+ h->sh.i_last_mb = mb_xy;
+ h->mb.b_reencode_mb = 0;
+ }
+ }
+ else
+ h->mb.b_reencode_mb = 0;
+
+#ifdef HAVE_VISUALIZE
if( h->param.b_visualize )
x264_visualize_mb( h );
#endif
/* accumulate mb stats */
h->stat.frame.i_mb_count[h->mb.i_type]++;
- if( !IS_SKIP(h->mb.i_type) && !IS_INTRA(h->mb.i_type) && !IS_DIRECT(h->mb.i_type) )
+
+ if( !IS_INTRA(h->mb.i_type) && !IS_SKIP(h->mb.i_type) && !IS_DIRECT(h->mb.i_type) )
{
if( h->mb.i_partition != D_8x8 )
- h->stat.frame.i_mb_partition[h->mb.i_partition] += 4;
- else
- for( i = 0; i < 4; i++ )
- h->stat.frame.i_mb_partition[h->mb.i_sub_partition[i]] ++;
+ h->stat.frame.i_mb_partition[h->mb.i_partition] += 4;
+ else
+ for( i = 0; i < 4; i++ )
+ h->stat.frame.i_mb_partition[h->mb.i_sub_partition[i]] ++;
if( h->param.i_frame_reference > 1 )
for( i_list = 0; i_list <= (h->sh.i_type == SLICE_TYPE_B); i_list++ )
for( i = 0; i < 4; i++ )
h->stat.frame.i_mb_count_ref[i_list][i_ref] ++;
}
}
- if( h->mb.i_cbp_luma && !IS_INTRA(h->mb.i_type) )
+
+ if( h->param.i_log_level >= X264_LOG_INFO )
{
- h->stat.frame.i_mb_count_8x8dct[0] ++;
- h->stat.frame.i_mb_count_8x8dct[1] += h->mb.b_transform_8x8;
+ if( h->mb.i_cbp_luma || h->mb.i_cbp_chroma )
+ {
+ int cbpsum = (h->mb.i_cbp_luma&1) + ((h->mb.i_cbp_luma>>1)&1)
+ + ((h->mb.i_cbp_luma>>2)&1) + (h->mb.i_cbp_luma>>3);
+ int b_intra = IS_INTRA(h->mb.i_type);
+ h->stat.frame.i_mb_cbp[!b_intra + 0] += cbpsum;
+ h->stat.frame.i_mb_cbp[!b_intra + 2] += h->mb.i_cbp_chroma >= 1;
+ h->stat.frame.i_mb_cbp[!b_intra + 4] += h->mb.i_cbp_chroma == 2;
+ }
+ if( h->mb.i_cbp_luma && !IS_INTRA(h->mb.i_type) )
+ {
+ h->stat.frame.i_mb_count_8x8dct[0] ++;
+ h->stat.frame.i_mb_count_8x8dct[1] += h->mb.b_transform_8x8;
+ }
+ if( IS_INTRA(h->mb.i_type) && h->mb.i_type != I_PCM )
+ {
+ if( h->mb.i_type == I_16x16 )
+ h->stat.frame.i_mb_pred_mode[0][h->mb.i_intra16x16_pred_mode]++;
+ else if( h->mb.i_type == I_8x8 )
+ for( i = 0; i < 16; i += 4 )
+ h->stat.frame.i_mb_pred_mode[1][h->mb.cache.intra4x4_pred_mode[x264_scan8[i]]]++;
+ else //if( h->mb.i_type == I_4x4 )
+ for( i = 0; i < 16; i++ )
+ h->stat.frame.i_mb_pred_mode[2][h->mb.cache.intra4x4_pred_mode[x264_scan8[i]]]++;
+ }
}
- x264_ratecontrol_mb( h, bs_pos(&h->out.bs) + x264_cabac_pos(&h->cabac) - mb_spos );
+ x264_ratecontrol_mb( h, mb_size );
if( h->sh.b_mbaff )
{
}
else
i_mb_x++;
- if(i_mb_x == h->sps->i_mb_width)
+ if( i_mb_x == h->sps->i_mb_width )
{
i_mb_y++;
i_mb_x = 0;
bs_write_ue( &h->out.bs, i_skip ); /* last skip run */
/* rbsp_slice_trailing_bits */
bs_rbsp_trailing( &h->out.bs );
+ bs_flush( &h->out.bs );
}
+ if( x264_nal_end( h ) )
+ return -1;
- x264_nal_end( h );
-
- x264_fdec_filter_row( h, h->sps->i_mb_height );
+ if( h->sh.i_last_mb == h->mb.i_mb_count-1 )
+ {
+ h->stat.frame.i_misc_bits = bs_pos( &h->out.bs )
+ + (h->out.i_nal*NALU_OVERHEAD * 8)
+ - h->stat.frame.i_tex_bits
+ - h->stat.frame.i_mv_bits;
+ if( !h->param.b_sliced_threads )
+ x264_fdec_filter_row( h, h->sps->i_mb_height );
+ }
- /* Compute misc bits */
- h->stat.frame.i_misc_bits = bs_pos( &h->out.bs )
- + NALU_OVERHEAD * 8
- - h->stat.frame.i_tex_bits
- - h->stat.frame.i_mv_bits;
+ return 0;
}
static void x264_thread_sync_context( x264_t *dst, x264_t *src )
{
- x264_frame_t **f;
if( dst == src )
return;
// reference counting
+ x264_frame_t **f;
for( f = src->frames.reference; *f; f++ )
(*f)->i_reference_count++;
for( f = dst->frames.reference; *f; f++ )
// copy everything except the per-thread pointers and the constants.
memcpy( &dst->i_frame, &src->i_frame, offsetof(x264_t, mb.type) - offsetof(x264_t, i_frame) );
+ dst->param = src->param;
dst->stat = src->stat;
}
{
if( dst == src )
return;
- memcpy( &dst->stat.i_slice_count, &src->stat.i_slice_count, sizeof(dst->stat) - sizeof(dst->stat.frame) );
+ memcpy( &dst->stat.i_frame_count, &src->stat.i_frame_count, sizeof(dst->stat) - sizeof(dst->stat.frame) );
}
-static int x264_slices_write( x264_t *h )
+static void *x264_slices_write( x264_t *h )
{
- int i_frame_size;
+ int i_slice_num = 0;
+ int last_thread_mb = h->sh.i_last_mb;
+ if( h->param.i_sync_lookahead )
+ x264_lower_thread_priority( 10 );
-#if VISUALIZE
+#ifdef HAVE_MMX
+ /* Misalign mask has to be set separately for each thread. */
+ if( h->param.cpu&X264_CPU_SSE_MISALIGN )
+ x264_cpu_mask_misalign_sse();
+#endif
+
+#ifdef HAVE_VISUALIZE
if( h->param.b_visualize )
- x264_visualize_init( h );
+ if( x264_visualize_init( h ) )
+ return (void *)-1;
#endif
- x264_stack_align( x264_slice_write, h );
- i_frame_size = h->out.nal[h->out.i_nal-1].i_payload;
+ /* init stats */
+ memset( &h->stat.frame, 0, sizeof(h->stat.frame) );
+ h->mb.b_reencode_mb = 0;
+ while( h->sh.i_first_mb <= last_thread_mb )
+ {
+ h->sh.i_last_mb = last_thread_mb;
+ if( h->param.i_slice_max_mbs )
+ h->sh.i_last_mb = h->sh.i_first_mb + h->param.i_slice_max_mbs - 1;
+ else if( h->param.i_slice_count && !h->param.b_sliced_threads )
+ {
+ int height = h->sps->i_mb_height >> h->param.b_interlaced;
+ int width = h->sps->i_mb_width << h->param.b_interlaced;
+ i_slice_num++;
+ h->sh.i_last_mb = (height * i_slice_num + h->param.i_slice_count/2) / h->param.i_slice_count * width - 1;
+ }
+ h->sh.i_last_mb = X264_MIN( h->sh.i_last_mb, last_thread_mb );
+ if( x264_stack_align( x264_slice_write, h ) )
+ return (void *)-1;
+ h->sh.i_first_mb = h->sh.i_last_mb + 1;
+ }
-#if VISUALIZE
+#ifdef HAVE_VISUALIZE
if( h->param.b_visualize )
{
x264_visualize_show( h );
}
#endif
- h->out.i_frame_size = i_frame_size;
+ return (void *)0;
+}
+
+static int x264_threaded_slices_write( x264_t *h )
+{
+ int i, j;
+ void *ret = NULL;
+ /* set first/last mb and sync contexts */
+ for( i = 0; i < h->param.i_threads; i++ )
+ {
+ x264_t *t = h->thread[i];
+ if( i )
+ {
+ t->param = h->param;
+ memcpy( &t->i_frame, &h->i_frame, offsetof(x264_t, rc) - offsetof(x264_t, i_frame) );
+ }
+ int height = h->sps->i_mb_height >> h->param.b_interlaced;
+ t->i_threadslice_start = ((height * i + h->param.i_slice_count/2) / h->param.i_threads) << h->param.b_interlaced;
+ t->i_threadslice_end = ((height * (i+1) + h->param.i_slice_count/2) / h->param.i_threads) << h->param.b_interlaced;
+ t->sh.i_first_mb = t->i_threadslice_start * h->sps->i_mb_width;
+ t->sh.i_last_mb = t->i_threadslice_end * h->sps->i_mb_width - 1;
+ }
+
+ x264_analyse_weight_frame( h, h->sps->i_mb_height*16 + 16 );
+
+ x264_threads_distribute_ratecontrol( h );
+
+ /* dispatch */
+ for( i = 0; i < h->param.i_threads; i++ )
+ {
+ if( x264_pthread_create( &h->thread[i]->thread_handle, NULL, (void*)x264_slices_write, (void*)h->thread[i] ) )
+ return -1;
+ h->thread[i]->b_thread_active = 1;
+ }
+ for( i = 0; i < h->param.i_threads; i++ )
+ {
+ x264_pthread_join( h->thread[i]->thread_handle, &ret );
+ h->thread[i]->b_thread_active = 0;
+ if( (intptr_t)ret )
+ return (intptr_t)ret;
+ }
+
+ /* deblocking and hpel filtering */
+ for( i = 0; i <= h->sps->i_mb_height; i++ )
+ x264_fdec_filter_row( h, i );
+
+ x264_threads_merge_ratecontrol( h );
+
+ for( i = 1; i < h->param.i_threads; i++ )
+ {
+ x264_t *t = h->thread[i];
+ for( j = 0; j < t->out.i_nal; j++ )
+ {
+ h->out.nal[h->out.i_nal] = t->out.nal[j];
+ h->out.i_nal++;
+ x264_nal_check_buffer( h );
+ }
+ /* All entries in stat.frame are ints except for ssd/ssim,
+ * which are only calculated in the main thread. */
+ for( j = 0; j < (offsetof(x264_t,stat.frame.i_ssd) - offsetof(x264_t,stat.frame.i_mv_bits)) / sizeof(int); j++ )
+ ((int*)&h->stat.frame)[j] += ((int*)&t->stat.frame)[j];
+ }
+
return 0;
}
x264_picture_t *pic_out )
{
x264_t *thread_current, *thread_prev, *thread_oldest;
- int i_nal_type;
- int i_nal_ref_idc;
+ int i_nal_type, i_nal_ref_idc, i_global_qp, i;
- int i_global_qp;
-
- if( h->param.i_threads > 1)
+ if( h->i_thread_frames > 1 )
{
- int i = ++h->i_thread_phase;
- int t = h->param.i_threads;
- thread_current = h->thread[ i%t ];
- thread_prev = h->thread[ (i-1)%t ];
- thread_oldest = h->thread[ (i+1)%t ];
+ thread_prev = h->thread[ h->i_thread_phase ];
+ h->i_thread_phase = (h->i_thread_phase + 1) % h->i_thread_frames;
+ thread_current = h->thread[ h->i_thread_phase ];
+ thread_oldest = h->thread[ (h->i_thread_phase + 1) % h->i_thread_frames ];
x264_thread_sync_context( thread_current, thread_prev );
x264_thread_sync_ratecontrol( thread_current, thread_prev, thread_oldest );
h = thread_current;
else
{
thread_current =
- thread_prev =
thread_oldest = h;
}
// ok to call this before encoding any frames, since the initial values of fdec have b_kept_as_ref=0
- x264_reference_update( h );
+ if( x264_reference_update( h ) )
+ return -1;
h->fdec->i_lines_completed = -1;
/* no data out */
if( pic_in != NULL )
{
/* 1: Copy the picture to a frame and move it to a buffer */
- x264_frame_t *fenc = x264_frame_pop_unused( h );
+ x264_frame_t *fenc = x264_frame_pop_unused( h, 0 );
+ if( !fenc )
+ return -1;
if( x264_frame_copy_picture( h, fenc, pic_in ) < 0 )
return -1;
fenc->i_frame = h->frames.i_input++;
- x264_frame_push( h->frames.next, fenc );
+ if( h->frames.i_bframe_delay && fenc->i_frame == h->frames.i_bframe_delay )
+ h->frames.i_bframe_delay_time = fenc->i_pts;
if( h->frames.b_have_lowres )
+ {
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_FAKE || h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART )
+ x264_weight_plane_analyse( h, fenc );
x264_frame_init_lowres( h, fenc );
+ }
- if( h->param.rc.i_aq_mode )
+ if( h->param.rc.b_mb_tree && h->param.rc.b_stat_read )
+ {
+ if( x264_macroblock_tree_read( h, fenc ) )
+ return -1;
+ }
+ else if( h->param.rc.i_aq_mode )
x264_adaptive_quant_frame( h, fenc );
- if( h->frames.i_input <= h->frames.i_delay + 1 - h->param.i_threads )
+ /* 2: Place the frame into the queue for its slice type decision */
+ x264_lookahead_put_frame( h, fenc );
+
+ if( h->frames.i_input <= h->frames.i_delay + 1 - h->i_thread_frames )
{
- /* Nothing yet to encode */
- /* waiting for filling bframe buffer */
+ /* Nothing yet to encode, waiting for filling of buffers */
pic_out->i_type = X264_TYPE_AUTO;
return 0;
}
}
-
- if( h->frames.current[0] == NULL )
+ else
{
- int bframes = 0;
- /* 2: Select frame types */
- if( h->frames.next[0] == NULL )
- {
- x264_encoder_frame_end( thread_oldest, thread_current, pp_nal, pi_nal, pic_out );
- return 0;
- }
+ /* signal kills for lookahead thread */
+ x264_pthread_mutex_lock( &h->lookahead->ifbuf.mutex );
+ h->lookahead->b_exit_thread = 1;
+ x264_pthread_cond_broadcast( &h->lookahead->ifbuf.cv_fill );
+ x264_pthread_mutex_unlock( &h->lookahead->ifbuf.mutex );
+ }
- x264_slicetype_decide( h );
+ h->i_frame++;
+ /* 3: The picture is analyzed in the lookahead */
+ if( !h->frames.current[0] )
+ x264_lookahead_get_frames( h );
- /* 3: move some B-frames and 1 non-B to encode queue */
- while( IS_X264_TYPE_B( h->frames.next[bframes]->i_type ) )
- bframes++;
- x264_frame_push( h->frames.current, x264_frame_shift( &h->frames.next[bframes] ) );
- /* FIXME: when max B-frames > 3, BREF may no longer be centered after GOP closing */
- if( h->param.b_bframe_pyramid && bframes > 1 )
- {
- x264_frame_t *mid = x264_frame_shift( &h->frames.next[bframes/2] );
- mid->i_type = X264_TYPE_BREF;
- x264_frame_push( h->frames.current, mid );
- bframes--;
- }
- while( bframes-- )
- x264_frame_push( h->frames.current, x264_frame_shift( h->frames.next ) );
- }
+ if( !h->frames.current[0] && x264_lookahead_is_empty( h ) )
+ return x264_encoder_frame_end( thread_oldest, thread_current, pp_nal, pi_nal, pic_out );
/* ------------------- Get frame to be encoded ------------------------- */
/* 4: get picture to encode */
h->fenc = x264_frame_shift( h->frames.current );
- if( h->fenc == NULL )
+ if( h->fenc->param )
{
- /* Nothing yet to encode (ex: waiting for I/P with B frames) */
- /* waiting for filling bframe buffer */
- pic_out->i_type = X264_TYPE_AUTO;
- return 0;
+ x264_encoder_reconfig( h, h->fenc->param );
+ if( h->fenc->param->param_free )
+ h->fenc->param->param_free( h->fenc->param );
}
-do_encode:
-
- if( h->fenc->i_type == X264_TYPE_IDR )
+ if( h->fenc->b_keyframe )
{
- h->frames.i_last_idr = h->fenc->i_frame;
+ h->frames.i_last_keyframe = h->fenc->i_frame;
+ if( h->fenc->i_type == X264_TYPE_IDR )
+ h->i_frame_num = 0;
}
+ h->sh.i_mmco_command_count =
+ h->sh.i_mmco_remove_from_end = 0;
+ h->b_ref_reorder[0] =
+ h->b_ref_reorder[1] = 0;
/* ------------------- Setup frame context ----------------------------- */
/* 5: Init data dependent of frame type */
if( h->fenc->i_type == X264_TYPE_IDR )
{
/* reset ref pictures */
- x264_reference_reset( h );
-
i_nal_type = NAL_SLICE_IDR;
i_nal_ref_idc = NAL_PRIORITY_HIGHEST;
h->sh.i_type = SLICE_TYPE_I;
+ x264_reference_reset( h );
}
else if( h->fenc->i_type == X264_TYPE_I )
{
i_nal_type = NAL_SLICE;
i_nal_ref_idc = NAL_PRIORITY_HIGH; /* Not completely true but for now it is (as all I/P are kept as ref)*/
h->sh.i_type = SLICE_TYPE_I;
+ x264_reference_hierarchy_reset( h );
}
else if( h->fenc->i_type == X264_TYPE_P )
{
i_nal_type = NAL_SLICE;
i_nal_ref_idc = NAL_PRIORITY_HIGH; /* Not completely true but for now it is (as all I/P are kept as ref)*/
h->sh.i_type = SLICE_TYPE_P;
+ x264_reference_hierarchy_reset( h );
}
else if( h->fenc->i_type == X264_TYPE_BREF )
{
i_nal_type = NAL_SLICE;
- i_nal_ref_idc = NAL_PRIORITY_HIGH; /* maybe add MMCO to forget it? -> low */
+ i_nal_ref_idc = h->param.i_bframe_pyramid == X264_B_PYRAMID_STRICT ? NAL_PRIORITY_LOW : NAL_PRIORITY_HIGH;
h->sh.i_type = SLICE_TYPE_B;
+ x264_reference_hierarchy_reset( h );
}
else /* B frame */
{
}
h->fdec->i_poc =
- h->fenc->i_poc = 2 * (h->fenc->i_frame - h->frames.i_last_idr);
+ h->fenc->i_poc = 2 * (h->fenc->i_frame - h->frames.i_last_keyframe);
h->fdec->i_type = h->fenc->i_type;
h->fdec->i_frame = h->fenc->i_frame;
h->fenc->b_kept_as_ref =
/* build ref list 0/1 */
x264_reference_build_list( h, h->fdec->i_poc );
- /* Init the rate control */
- x264_ratecontrol_start( h, h->fenc->i_qpplus1 );
- i_global_qp = x264_ratecontrol_qp( h );
-
- pic_out->i_qpplus1 =
- h->fdec->i_qpplus1 = i_global_qp + 1;
-
- if( h->sh.i_type == SLICE_TYPE_B )
- x264_macroblock_bipred_init( h );
-
- /* ------------------------ Create slice header ----------------------- */
- x264_slice_init( h, i_nal_type, i_global_qp );
-
- if( i_nal_ref_idc != NAL_PRIORITY_DISPOSABLE )
- h->i_frame_num++;
-
/* ---------------------- Write the bitstream -------------------------- */
/* Init bitstream context */
- h->out.i_nal = 0;
- bs_init( &h->out.bs, h->out.p_bitstream, h->out.i_bitstream );
+ if( h->param.b_sliced_threads )
+ {
+ for( i = 0; i < h->param.i_threads; i++ )
+ {
+ bs_init( &h->thread[i]->out.bs, h->thread[i]->out.p_bitstream, h->thread[i]->out.i_bitstream );
+ h->thread[i]->out.i_nal = 0;
+ }
+ }
+ else
+ {
+ bs_init( &h->out.bs, h->out.p_bitstream, h->out.i_bitstream );
+ h->out.i_nal = 0;
+ }
- if(h->param.b_aud){
+ if( h->param.b_aud )
+ {
int pic_type;
- if(h->sh.i_type == SLICE_TYPE_I)
+ if( h->sh.i_type == SLICE_TYPE_I )
pic_type = 0;
- else if(h->sh.i_type == SLICE_TYPE_P)
+ else if( h->sh.i_type == SLICE_TYPE_P )
pic_type = 1;
- else if(h->sh.i_type == SLICE_TYPE_B)
+ else if( h->sh.i_type == SLICE_TYPE_B )
pic_type = 2;
else
pic_type = 7;
- x264_nal_start(h, NAL_AUD, NAL_PRIORITY_DISPOSABLE);
- bs_write(&h->out.bs, 3, pic_type);
- bs_rbsp_trailing(&h->out.bs);
- x264_nal_end(h);
+ x264_nal_start( h, NAL_AUD, NAL_PRIORITY_DISPOSABLE );
+ bs_write( &h->out.bs, 3, pic_type );
+ bs_rbsp_trailing( &h->out.bs );
+ if( x264_nal_end( h ) )
+ return -1;
}
h->i_nal_type = i_nal_type;
h->i_nal_ref_idc = i_nal_ref_idc;
+ int overhead = NALU_OVERHEAD;
+
+ if( h->param.b_intra_refresh && h->fenc->i_type == X264_TYPE_P )
+ {
+ int pocdiff = (h->fdec->i_poc - h->fref0[0]->i_poc)/2;
+ float increment = X264_MAX( ((float)h->sps->i_mb_width-1) / h->param.i_keyint_max, 1 );
+ int max_position = (int)(increment * h->param.i_keyint_max);
+ if( IS_X264_TYPE_I( h->fref0[0]->i_type ) )
+ h->fdec->f_pir_position = 0;
+ else
+ {
+ h->fdec->f_pir_position = h->fref0[0]->f_pir_position;
+ if( h->fdec->f_pir_position+0.5 >= max_position )
+ {
+ h->fdec->f_pir_position = 0;
+ h->fenc->b_keyframe = 1;
+ }
+ }
+ h->fdec->i_pir_start_col = h->fdec->f_pir_position+0.5;
+ h->fdec->f_pir_position += increment * pocdiff;
+ h->fdec->i_pir_end_col = h->fdec->f_pir_position+0.5;
+ }
+
/* Write SPS and PPS */
- if( i_nal_type == NAL_SLICE_IDR && h->param.b_repeat_headers )
+ if( h->fenc->b_keyframe )
{
- if( h->fenc->i_frame == 0 )
+ if( h->param.b_repeat_headers )
+ {
+ if( h->fenc->i_frame == 0 )
+ {
+ /* identify ourself */
+ x264_nal_start( h, NAL_SEI, NAL_PRIORITY_DISPOSABLE );
+ if( x264_sei_version_write( h, &h->out.bs ) )
+ return -1;
+ if( x264_nal_end( h ) )
+ return -1;
+ overhead += h->out.nal[h->out.i_nal-1].i_payload + NALU_OVERHEAD;
+ }
+
+ /* generate sequence parameters */
+ x264_nal_start( h, NAL_SPS, NAL_PRIORITY_HIGHEST );
+ x264_sps_write( &h->out.bs, h->sps );
+ if( x264_nal_end( h ) )
+ return -1;
+ overhead += h->out.nal[h->out.i_nal-1].i_payload + NALU_OVERHEAD;
+
+ /* generate picture parameters */
+ x264_nal_start( h, NAL_PPS, NAL_PRIORITY_HIGHEST );
+ x264_pps_write( &h->out.bs, h->pps );
+ if( x264_nal_end( h ) )
+ return -1;
+ overhead += h->out.nal[h->out.i_nal-1].i_payload + NALU_OVERHEAD;
+ }
+
+ if( h->fenc->i_type != X264_TYPE_IDR )
{
- /* identify ourself */
+ int time_to_recovery = X264_MIN( h->sps->i_mb_width - 1, h->param.i_keyint_max ) + h->param.i_bframe;
x264_nal_start( h, NAL_SEI, NAL_PRIORITY_DISPOSABLE );
- x264_sei_version_write( h, &h->out.bs );
+ x264_sei_recovery_point_write( h, &h->out.bs, time_to_recovery );
x264_nal_end( h );
+ overhead += h->out.nal[h->out.i_nal-1].i_payload + NALU_OVERHEAD;
}
+ }
- /* generate sequence parameters */
- x264_nal_start( h, NAL_SPS, NAL_PRIORITY_HIGHEST );
- x264_sps_write( &h->out.bs, h->sps );
- x264_nal_end( h );
+ /* Init the rate control */
+ /* FIXME: Include slice header bit cost. */
+ x264_ratecontrol_start( h, h->fenc->i_qpplus1, overhead*8 );
+ i_global_qp = x264_ratecontrol_qp( h );
- /* generate picture parameters */
- x264_nal_start( h, NAL_PPS, NAL_PRIORITY_HIGHEST );
- x264_pps_write( &h->out.bs, h->pps );
- x264_nal_end( h );
- }
+ pic_out->i_qpplus1 =
+ h->fdec->i_qpplus1 = i_global_qp + 1;
- /* Write frame */
- if( h->param.i_threads > 1 )
+ if( h->param.rc.b_stat_read && h->sh.i_type != SLICE_TYPE_I )
{
- x264_pthread_create( &h->thread_handle, NULL, (void*)x264_slices_write, h );
- h->b_thread_active = 1;
+ x264_reference_build_list_optimal( h );
+ x264_reference_check_reorder( h );
}
- else
- x264_slices_write( h );
-
- /* restore CPU state (before using float again) */
- x264_emms();
- if( h->sh.i_type == SLICE_TYPE_P && !h->param.rc.b_stat_read
- && h->param.i_scenecut_threshold >= 0
- && !h->param.b_pre_scenecut )
- {
- const int *mbs = h->stat.frame.i_mb_count;
- int i_mb_i = mbs[I_16x16] + mbs[I_8x8] + mbs[I_4x4];
- int i_mb_p = mbs[P_L0] + mbs[P_8x8];
- int i_mb_s = mbs[P_SKIP];
- int i_mb = h->sps->i_mb_width * h->sps->i_mb_height;
- int64_t i_inter_cost = h->stat.frame.i_inter_cost;
- int64_t i_intra_cost = h->stat.frame.i_intra_cost;
-
- float f_bias;
- int i_gop_size = h->fenc->i_frame - h->frames.i_last_idr;
- float f_thresh_max = h->param.i_scenecut_threshold / 100.0;
- /* magic numbers pulled out of thin air */
- float f_thresh_min = f_thresh_max * h->param.i_keyint_min
- / ( h->param.i_keyint_max * 4 );
- if( h->param.i_keyint_min == h->param.i_keyint_max )
- f_thresh_min= f_thresh_max;
-
- /* macroblock_analyse() doesn't further analyse skipped mbs,
- * so we have to guess their cost */
- if( h->stat.frame.i_mbs_analysed > 0 )
- i_intra_cost = i_intra_cost * i_mb / h->stat.frame.i_mbs_analysed;
-
- if( i_gop_size < h->param.i_keyint_min / 4 )
- f_bias = f_thresh_min / 4;
- else if( i_gop_size <= h->param.i_keyint_min )
- f_bias = f_thresh_min * i_gop_size / h->param.i_keyint_min;
- else
- {
- f_bias = f_thresh_min
- + ( f_thresh_max - f_thresh_min )
- * ( i_gop_size - h->param.i_keyint_min )
- / ( h->param.i_keyint_max - h->param.i_keyint_min );
- }
- f_bias = X264_MIN( f_bias, 1.0 );
-
- /* Bad P will be reencoded as I */
- if( h->stat.frame.i_mbs_analysed > 0 &&
- i_inter_cost >= (1.0 - f_bias) * i_intra_cost )
- {
- int b;
+ if( h->i_ref0 )
+ h->fdec->i_poc_l0ref0 = h->fref0[0]->i_poc;
- x264_log( h, X264_LOG_DEBUG, "scene cut at %d Icost:%.0f Pcost:%.0f ratio:%.4f bias:%.4f gop:%d (imb:%d pmb:%d smb:%d)\n",
- h->fenc->i_frame,
- (double)i_intra_cost, (double)i_inter_cost,
- 1. - (double)i_inter_cost / i_intra_cost,
- f_bias, i_gop_size,
- i_mb_i, i_mb_p, i_mb_s );
+ if( h->sh.i_type == SLICE_TYPE_B )
+ x264_macroblock_bipred_init( h );
- /* Restore frame num */
- h->i_frame_num--;
+ /*------------------------- Weights -------------------------------------*/
+ x264_weighted_pred_init( h );
- for( b = 0; h->frames.current[b] && IS_X264_TYPE_B( h->frames.current[b]->i_type ); b++ );
- if( b > 0 )
- {
- /* If using B-frames, force GOP to be closed.
- * Even if this frame is going to be I and not IDR, forcing a
- * P-frame before the scenecut will probably help compression.
- *
- * We don't yet know exactly which frame is the scene cut, so
- * we can't assign an I-frame. Instead, change the previous
- * B-frame to P, and rearrange coding order. */
-
- if( h->param.i_bframe_adaptive || b > 1 )
- h->fenc->i_type = X264_TYPE_AUTO;
- x264_frame_sort_pts( h->frames.current );
- x264_frame_unshift( h->frames.next, h->fenc );
- h->fenc = h->frames.current[b-1];
- h->frames.current[b-1] = NULL;
- h->fenc->i_type = X264_TYPE_P;
- x264_frame_sort_dts( h->frames.current );
- }
- /* Do IDR if needed */
- else if( i_gop_size >= h->param.i_keyint_min )
- {
- /* Reset */
- h->i_frame_num = 0;
+ /* ------------------------ Create slice header ----------------------- */
+ x264_slice_init( h, i_nal_type, i_global_qp );
- /* Reinit field of fenc */
- h->fenc->i_type = X264_TYPE_IDR;
- h->fenc->i_poc = 0;
+ if( i_nal_ref_idc != NAL_PRIORITY_DISPOSABLE )
+ h->i_frame_num++;
- /* Put enqueued frames back in the pool */
- while( h->frames.current[0] )
- x264_frame_push( h->frames.next, x264_frame_shift( h->frames.current ) );
- x264_frame_sort_pts( h->frames.next );
- }
- else
- {
- h->fenc->i_type = X264_TYPE_I;
- }
- goto do_encode;
- }
+ /* Write frame */
+ h->i_threadslice_start = 0;
+ h->i_threadslice_end = h->sps->i_mb_height;
+ if( h->i_thread_frames > 1 )
+ {
+ if( x264_pthread_create( &h->thread_handle, NULL, (void*)x264_slices_write, h ) )
+ return -1;
+ h->b_thread_active = 1;
+ }
+ else if( h->param.b_sliced_threads )
+ {
+ if( x264_threaded_slices_write( h ) )
+ return -1;
}
+ else
+ if( (intptr_t)x264_slices_write( h ) )
+ return -1;
- x264_encoder_frame_end( thread_oldest, thread_current, pp_nal, pi_nal, pic_out );
- return 0;
+ return x264_encoder_frame_end( thread_oldest, thread_current, pp_nal, pi_nal, pic_out );
}
-static void x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
- x264_nal_t **pp_nal, int *pi_nal,
- x264_picture_t *pic_out )
+static int x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
+ x264_nal_t **pp_nal, int *pi_nal,
+ x264_picture_t *pic_out )
{
- int i, i_list;
+ int i, j, i_list, frame_size;
char psz_message[80];
if( h->b_thread_active )
{
- x264_pthread_join( h->thread_handle, NULL );
+ void *ret = NULL;
+ x264_pthread_join( h->thread_handle, &ret );
h->b_thread_active = 0;
+ if( (intptr_t)ret )
+ return (intptr_t)ret;
}
if( !h->out.i_nal )
{
pic_out->i_type = X264_TYPE_AUTO;
- return;
+ return 0;
}
x264_frame_push_unused( thread_current, h->fenc );
/* End bitstream, set output */
*pi_nal = h->out.i_nal;
*pp_nal = h->out.nal;
+
+ frame_size = x264_encoder_encapsulate_nals( h );
+
h->out.i_nal = 0;
/* Set output picture properties */
pic_out->i_type = X264_TYPE_P;
else
pic_out->i_type = X264_TYPE_B;
- pic_out->i_pts = h->fenc->i_pts;
+
+ pic_out->b_keyframe = h->fenc->b_keyframe;
+
+ pic_out->i_pts = h->fenc->i_pts *= h->i_dts_compress_multiplier;
+ if( h->frames.i_bframe_delay )
+ {
+ int64_t *i_prev_dts = thread_current->frames.i_prev_dts;
+ if( h->i_frame <= h->frames.i_bframe_delay )
+ {
+ if( h->i_dts_compress_multiplier == 1 )
+ pic_out->i_dts = h->fenc->i_reordered_pts - h->frames.i_bframe_delay_time;
+ else
+ {
+ /* DTS compression */
+ if( h->i_frame == 1 )
+ thread_current->frames.i_init_delta = h->fenc->i_reordered_pts * h->i_dts_compress_multiplier;
+ pic_out->i_dts = h->i_frame * thread_current->frames.i_init_delta / h->i_dts_compress_multiplier;
+ }
+ }
+ else
+ pic_out->i_dts = i_prev_dts[ (h->i_frame - h->frames.i_bframe_delay) % h->frames.i_bframe_delay ];
+ i_prev_dts[ h->i_frame % h->frames.i_bframe_delay ] = h->fenc->i_reordered_pts * h->i_dts_compress_multiplier;
+ }
+ else
+ pic_out->i_dts = h->fenc->i_reordered_pts;
+ assert( pic_out->i_pts >= pic_out->i_dts );
pic_out->img.i_plane = h->fdec->i_plane;
- for(i = 0; i < 4; i++){
+ for(i = 0; i < 3; i++)
+ {
pic_out->img.i_stride[i] = h->fdec->i_stride[i];
pic_out->img.plane[i] = h->fdec->plane[i];
}
/* update rc */
x264_emms();
- x264_ratecontrol_end( h, h->out.i_frame_size * 8 );
-
- /* restore CPU state (before using float again) */
- x264_emms();
+ if( x264_ratecontrol_end( h, frame_size * 8 ) < 0 )
+ return -1;
x264_noise_reduction_update( thread_current );
x264_thread_sync_stat( h, h->thread[0] );
/* Slice stat */
- h->stat.i_slice_count[h->sh.i_type]++;
- h->stat.i_slice_size[h->sh.i_type] += h->out.i_frame_size + NALU_OVERHEAD;
- h->stat.f_slice_qp[h->sh.i_type] += h->fdec->f_qp_avg_aq;
+ h->stat.i_frame_count[h->sh.i_type]++;
+ h->stat.i_frame_size[h->sh.i_type] += frame_size;
+ h->stat.f_frame_qp[h->sh.i_type] += h->fdec->f_qp_avg_aq;
for( i = 0; i < X264_MBTYPE_MAX; i++ )
h->stat.i_mb_count[h->sh.i_type][i] += h->stat.frame.i_mb_count[i];
h->stat.i_mb_partition[h->sh.i_type][i] += h->stat.frame.i_mb_partition[i];
for( i = 0; i < 2; i++ )
h->stat.i_mb_count_8x8dct[i] += h->stat.frame.i_mb_count_8x8dct[i];
+ for( i = 0; i < 6; i++ )
+ h->stat.i_mb_cbp[i] += h->stat.frame.i_mb_cbp[i];
+ for( i = 0; i < 3; i++ )
+ for( j = 0; j < 13; j++ )
+ h->stat.i_mb_pred_mode[i][j] += h->stat.frame.i_mb_pred_mode[i][j];
if( h->sh.i_type != SLICE_TYPE_I )
for( i_list = 0; i_list < 2; i_list++ )
for( i = 0; i < 32; i++ )
h->stat.i_mb_count_ref[h->sh.i_type][i_list][i] += h->stat.frame.i_mb_count_ref[i_list][i];
if( h->sh.i_type == SLICE_TYPE_P )
+ {
h->stat.i_consecutive_bframes[h->fdec->i_frame - h->fref0[0]->i_frame - 1]++;
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART )
+ {
+ for( i = 0; i < 3; i++ )
+ for( j = 0; j < h->i_ref0; j++ )
+ if( h->sh.weight[0][i].i_denom != 0 )
+ {
+ h->stat.i_wpred[i]++;
+ break;
+ }
+ }
+ }
if( h->sh.i_type == SLICE_TYPE_B )
{
h->stat.i_direct_frames[ h->sh.b_direct_spatial_mv_pred ] ++;
h->stat.frame.i_mb_count_i,
h->stat.frame.i_mb_count_p,
h->stat.frame.i_mb_count_skip,
- h->out.i_frame_size,
+ frame_size,
psz_message );
// keep stats all in one place
}
#endif
+ /* Remove duplicates, must be done near the end as breaks h->fref0 array
+ * by freeing some of its pointers. */
+ for( i = 0; i < h->i_ref0; i++ )
+ if( h->fref0[i] && h->fref0[i]->b_duplicate )
+ {
+ x264_frame_push_blank_unused( h, h->fref0[i] );
+ h->fref0[i] = 0;
+ }
+
if( h->param.psz_dump_yuv )
x264_frame_dump( h );
+
+ return frame_size;
}
static void x264_print_intra( int64_t *i_mb_count, double i_count, int b_print_pcm, char *intra )
|| h->stat.i_mb_count[SLICE_TYPE_P][I_PCM]
|| h->stat.i_mb_count[SLICE_TYPE_B][I_PCM];
- for( i=0; i<h->param.i_threads; i++ )
+ x264_lookahead_delete( h );
+
+ if( h->param.i_threads > 1 )
{
// don't strictly have to wait for the other threads, but it's simpler than canceling them
- if( h->thread[i]->b_thread_active )
+ for( i = 0; i < h->param.i_threads; i++ )
+ if( h->thread[i]->b_thread_active )
+ x264_pthread_join( h->thread[i]->thread_handle, NULL );
+ if( h->i_thread_frames > 1 )
{
- x264_pthread_join( h->thread[i]->thread_handle, NULL );
- assert( h->thread[i]->fenc->i_reference_count == 1 );
- x264_frame_delete( h->thread[i]->fenc );
+ for( i = 0; i < h->i_thread_frames; i++ )
+ {
+ if( h->thread[i]->b_thread_active )
+ {
+ assert( h->thread[i]->fenc->i_reference_count == 1 );
+ x264_frame_delete( h->thread[i]->fenc );
+ }
+ }
+
+ x264_t *thread_prev = h->thread[h->i_thread_phase];
+ x264_thread_sync_ratecontrol( h, thread_prev, h );
+ x264_thread_sync_ratecontrol( thread_prev, thread_prev, h );
+ h->i_frame = thread_prev->i_frame + 1 - h->i_thread_frames;
}
}
+ h->i_frame++;
/* Slices used and PSNR */
for( i=0; i<5; i++ )
static const char *slice_name[] = { "P", "B", "I", "SP", "SI" };
int i_slice = slice_order[i];
- if( h->stat.i_slice_count[i_slice] > 0 )
+ if( h->stat.i_frame_count[i_slice] > 0 )
{
- const int i_count = h->stat.i_slice_count[i_slice];
+ const int i_count = h->stat.i_frame_count[i_slice];
if( h->param.analyse.b_psnr )
{
x264_log( h, X264_LOG_INFO,
- "slice %s:%-5d Avg QP:%5.2f size:%6.0f PSNR Mean Y:%5.2f U:%5.2f V:%5.2f Avg:%5.2f Global:%5.2f\n",
+ "frame %s:%-5d Avg QP:%5.2f size:%6.0f PSNR Mean Y:%5.2f U:%5.2f V:%5.2f Avg:%5.2f Global:%5.2f\n",
slice_name[i_slice],
i_count,
- h->stat.f_slice_qp[i_slice] / i_count,
- (double)h->stat.i_slice_size[i_slice] / i_count,
+ h->stat.f_frame_qp[i_slice] / i_count,
+ (double)h->stat.i_frame_size[i_slice] / i_count,
h->stat.f_psnr_mean_y[i_slice] / i_count, h->stat.f_psnr_mean_u[i_slice] / i_count, h->stat.f_psnr_mean_v[i_slice] / i_count,
h->stat.f_psnr_average[i_slice] / i_count,
x264_psnr( h->stat.i_ssd_global[i_slice], i_count * i_yuv_size ) );
else
{
x264_log( h, X264_LOG_INFO,
- "slice %s:%-5d Avg QP:%5.2f size:%6.0f\n",
+ "frame %s:%-5d Avg QP:%5.2f size:%6.0f\n",
slice_name[i_slice],
i_count,
- h->stat.f_slice_qp[i_slice] / i_count,
- (double)h->stat.i_slice_size[i_slice] / i_count );
+ h->stat.f_frame_qp[i_slice] / i_count,
+ (double)h->stat.i_frame_size[i_slice] / i_count );
}
}
}
- if( h->param.i_bframe && h->stat.i_slice_count[SLICE_TYPE_P] )
+ if( h->param.i_bframe && h->stat.i_frame_count[SLICE_TYPE_P] )
{
char *p = buf;
int den = 0;
}
/* MB types used */
- if( h->stat.i_slice_count[SLICE_TYPE_I] > 0 )
+ if( h->stat.i_frame_count[SLICE_TYPE_I] > 0 )
{
int64_t *i_mb_count = h->stat.i_mb_count[SLICE_TYPE_I];
- double i_count = h->stat.i_slice_count[SLICE_TYPE_I] * h->mb.i_mb_count / 100.0;
+ double i_count = h->stat.i_frame_count[SLICE_TYPE_I] * h->mb.i_mb_count / 100.0;
x264_print_intra( i_mb_count, i_count, b_print_pcm, buf );
x264_log( h, X264_LOG_INFO, "mb I %s\n", buf );
}
- if( h->stat.i_slice_count[SLICE_TYPE_P] > 0 )
+ if( h->stat.i_frame_count[SLICE_TYPE_P] > 0 )
{
int64_t *i_mb_count = h->stat.i_mb_count[SLICE_TYPE_P];
- double i_count = h->stat.i_slice_count[SLICE_TYPE_P] * h->mb.i_mb_count / 100.0;
+ double i_count = h->stat.i_frame_count[SLICE_TYPE_P] * h->mb.i_mb_count / 100.0;
int64_t *i_mb_size = i_mb_count_size[SLICE_TYPE_P];
x264_print_intra( i_mb_count, i_count, b_print_pcm, buf );
x264_log( h, X264_LOG_INFO,
i_mb_size[PIXEL_4x4] / (i_count*4),
i_mb_count[P_SKIP] / i_count );
}
- if( h->stat.i_slice_count[SLICE_TYPE_B] > 0 )
+ if( h->stat.i_frame_count[SLICE_TYPE_B] > 0 )
{
int64_t *i_mb_count = h->stat.i_mb_count[SLICE_TYPE_B];
- double i_count = h->stat.i_slice_count[SLICE_TYPE_B] * h->mb.i_mb_count / 100.0;
+ double i_count = h->stat.i_frame_count[SLICE_TYPE_B] * h->mb.i_mb_count / 100.0;
double i_mb_list_count;
int64_t *i_mb_size = i_mb_count_size[SLICE_TYPE_B];
int64_t list_count[3] = {0}; /* 0 == L0, 1 == L1, 2 == BI */
for( i = 0; i < X264_PARTTYPE_MAX; i++ )
for( j = 0; j < 2; j++ )
{
- int l0 = x264_mb_type_list0_table[i][j];
- int l1 = x264_mb_type_list1_table[i][j];
+ int l0 = x264_mb_type_list_table[i][0][j];
+ int l1 = x264_mb_type_list_table[i][1][j];
if( l0 || l1 )
list_count[l1+l0*l1] += h->stat.i_mb_count[SLICE_TYPE_B][i] * 2;
}
x264_ratecontrol_summary( h );
- if( h->stat.i_slice_count[SLICE_TYPE_I] + h->stat.i_slice_count[SLICE_TYPE_P] + h->stat.i_slice_count[SLICE_TYPE_B] > 0 )
+ if( h->stat.i_frame_count[SLICE_TYPE_I] + h->stat.i_frame_count[SLICE_TYPE_P] + h->stat.i_frame_count[SLICE_TYPE_B] > 0 )
{
- const int i_count = h->stat.i_slice_count[SLICE_TYPE_I] +
- h->stat.i_slice_count[SLICE_TYPE_P] +
- h->stat.i_slice_count[SLICE_TYPE_B];
- float fps = (float) h->param.i_fps_num / h->param.i_fps_den;
#define SUM3(p) (p[SLICE_TYPE_I] + p[SLICE_TYPE_P] + p[SLICE_TYPE_B])
#define SUM3b(p,o) (p[SLICE_TYPE_I][o] + p[SLICE_TYPE_P][o] + p[SLICE_TYPE_B][o])
- float f_bitrate = fps * SUM3(h->stat.i_slice_size) / i_count / 125;
+ int64_t i_i8x8 = SUM3b( h->stat.i_mb_count, I_8x8 );
+ int64_t i_intra = i_i8x8 + SUM3b( h->stat.i_mb_count, I_4x4 )
+ + SUM3b( h->stat.i_mb_count, I_16x16 );
+ int64_t i_all_intra = i_intra + SUM3b( h->stat.i_mb_count, I_PCM);
+ const int i_count = h->stat.i_frame_count[SLICE_TYPE_I] +
+ h->stat.i_frame_count[SLICE_TYPE_P] +
+ h->stat.i_frame_count[SLICE_TYPE_B];
+ int64_t i_mb_count = i_count * h->mb.i_mb_count;
+ float fps = (float) h->param.i_fps_num / h->param.i_fps_den;
+ float f_bitrate = fps * SUM3(h->stat.i_frame_size) / i_count / 125;
if( h->pps->b_transform_8x8_mode )
{
- int64_t i_i8x8 = SUM3b( h->stat.i_mb_count, I_8x8 );
- int64_t i_intra = i_i8x8 + SUM3b( h->stat.i_mb_count, I_4x4 )
- + SUM3b( h->stat.i_mb_count, I_16x16 );
- x264_log( h, X264_LOG_INFO, "8x8 transform intra:%.1f%% inter:%.1f%%\n",
- 100. * i_i8x8 / i_intra,
- 100. * h->stat.i_mb_count_8x8dct[1] / h->stat.i_mb_count_8x8dct[0] );
+ buf[0] = 0;
+ if( h->stat.i_mb_count_8x8dct[0] )
+ sprintf( buf, " inter:%.1f%%", 100. * h->stat.i_mb_count_8x8dct[1] / h->stat.i_mb_count_8x8dct[0] );
+ x264_log( h, X264_LOG_INFO, "8x8 transform intra:%.1f%%%s\n", 100. * i_i8x8 / i_intra, buf );
+ }
+
+ if( (h->param.analyse.i_direct_mv_pred == X264_DIRECT_PRED_AUTO ||
+ (h->stat.i_direct_frames[0] && h->stat.i_direct_frames[1]))
+ && h->stat.i_frame_count[SLICE_TYPE_B] )
+ {
+ x264_log( h, X264_LOG_INFO, "direct mvs spatial:%.1f%% temporal:%.1f%%\n",
+ h->stat.i_direct_frames[1] * 100. / h->stat.i_frame_count[SLICE_TYPE_B],
+ h->stat.i_direct_frames[0] * 100. / h->stat.i_frame_count[SLICE_TYPE_B] );
}
- if( h->param.analyse.i_direct_mv_pred == X264_DIRECT_PRED_AUTO
- && h->stat.i_slice_count[SLICE_TYPE_B] )
+ buf[0] = 0;
+ if( i_mb_count != i_all_intra )
+ sprintf( buf, " inter: %.1f%% %.1f%% %.1f%%",
+ h->stat.i_mb_cbp[1] * 100.0 / ((i_mb_count - i_all_intra)*4),
+ h->stat.i_mb_cbp[3] * 100.0 / ((i_mb_count - i_all_intra) ),
+ h->stat.i_mb_cbp[5] * 100.0 / ((i_mb_count - i_all_intra)) );
+ x264_log( h, X264_LOG_INFO, "coded y,uvDC,uvAC intra: %.1f%% %.1f%% %.1f%%%s\n",
+ h->stat.i_mb_cbp[0] * 100.0 / (i_all_intra*4),
+ h->stat.i_mb_cbp[2] * 100.0 / (i_all_intra ),
+ h->stat.i_mb_cbp[4] * 100.0 / (i_all_intra ), buf );
+
+ int64_t fixed_pred_modes[3][9] = {{0}};
+ int64_t sum_pred_modes[3] = {0};
+ for( i = 0; i <= I_PRED_16x16_DC_128; i++ )
{
- x264_log( h, X264_LOG_INFO, "direct mvs spatial:%.1f%% temporal:%.1f%%\n",
- h->stat.i_direct_frames[1] * 100. / h->stat.i_slice_count[SLICE_TYPE_B],
- h->stat.i_direct_frames[0] * 100. / h->stat.i_slice_count[SLICE_TYPE_B] );
+ fixed_pred_modes[0][x264_mb_pred_mode16x16_fix[i]] += h->stat.i_mb_pred_mode[0][i];
+ sum_pred_modes[0] += h->stat.i_mb_pred_mode[0][i];
+ }
+ if( sum_pred_modes[0] )
+ x264_log( h, X264_LOG_INFO, "i16 v,h,dc,p: %2.0f%% %2.0f%% %2.0f%% %2.0f%%\n",
+ fixed_pred_modes[0][0] * 100.0 / sum_pred_modes[0],
+ fixed_pred_modes[0][1] * 100.0 / sum_pred_modes[0],
+ fixed_pred_modes[0][2] * 100.0 / sum_pred_modes[0],
+ fixed_pred_modes[0][3] * 100.0 / sum_pred_modes[0] );
+ for( i = 1; i <= 2; i++ )
+ {
+ for( j = 0; j <= I_PRED_8x8_DC_128; j++ )
+ {
+ fixed_pred_modes[i][x264_mb_pred_mode4x4_fix(j)] += h->stat.i_mb_pred_mode[i][j];
+ sum_pred_modes[i] += h->stat.i_mb_pred_mode[i][j];
+ }
+ if( sum_pred_modes[i] )
+ x264_log( h, X264_LOG_INFO, "i%d v,h,dc,ddl,ddr,vr,hd,vl,hu: %2.0f%% %2.0f%% %2.0f%% %2.0f%% %2.0f%% %2.0f%% %2.0f%% %2.0f%% %2.0f%%\n", (3-i)*4,
+ fixed_pred_modes[i][0] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][1] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][2] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][3] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][4] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][5] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][6] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][7] * 100.0 / sum_pred_modes[i],
+ fixed_pred_modes[i][8] * 100.0 / sum_pred_modes[i] );
}
+ if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART && h->stat.i_frame_count[SLICE_TYPE_P] > 0 )
+ x264_log( h, X264_LOG_INFO, "Weighted P-Frames: Y:%.1f%%\n",
+ h->stat.i_wpred[0] * 100.0 / h->stat.i_frame_count[SLICE_TYPE_P] );
+
for( i_list = 0; i_list < 2; i_list++ )
{
int i_slice;
continue;
for( i = 0; i <= i_max; i++ )
p += sprintf( p, " %4.1f%%", 100. * h->stat.i_mb_count_ref[i_slice][i_list][i] / i_den );
- x264_log( h, X264_LOG_INFO, "ref %c L%d %s\n", "PB"[i_slice], i_list, buf );
+ x264_log( h, X264_LOG_INFO, "ref %c L%d:%s\n", "PB"[i_slice], i_list, buf );
}
}
f_bitrate );
}
else
- x264_log( h, X264_LOG_INFO, "kb/s:%.1f\n", f_bitrate );
+ x264_log( h, X264_LOG_INFO, "kb/s:%.2f\n", f_bitrate );
}
/* rc */
free( h->param.rc.psz_stat_in );
x264_cqm_delete( h );
+ x264_free( h->nal_buffer );
+ x264_analyse_free_costs( h );
- if( h->param.i_threads > 1)
- h = h->thread[ h->i_thread_phase % h->param.i_threads ];
+ if( h->i_thread_frames > 1)
+ h = h->thread[h->i_thread_phase];
/* frames */
- for( i = 0; h->frames.current[i]; i++ )
- {
- assert( h->frames.current[i]->i_reference_count == 1 );
- x264_frame_delete( h->frames.current[i] );
- }
- for( i = 0; h->frames.next[i]; i++ )
- {
- assert( h->frames.next[i]->i_reference_count == 1 );
- x264_frame_delete( h->frames.next[i] );
- }
- for( i = 0; h->frames.unused[i]; i++ )
- {
- assert( h->frames.unused[i]->i_reference_count == 0 );
- x264_frame_delete( h->frames.unused[i] );
- }
+ x264_frame_delete_list( h->frames.unused[0] );
+ x264_frame_delete_list( h->frames.unused[1] );
+ x264_frame_delete_list( h->frames.current );
+ x264_frame_delete_list( h->frames.blank_unused );
h = h->thread[0];
{
x264_frame_t **frame;
- for( frame = h->thread[i]->frames.reference; *frame; frame++ )
+ if( !h->param.b_sliced_threads || i == 0 )
{
+ for( frame = h->thread[i]->frames.reference; *frame; frame++ )
+ {
+ assert( (*frame)->i_reference_count > 0 );
+ (*frame)->i_reference_count--;
+ if( (*frame)->i_reference_count == 0 )
+ x264_frame_delete( *frame );
+ }
+ frame = &h->thread[i]->fdec;
assert( (*frame)->i_reference_count > 0 );
(*frame)->i_reference_count--;
if( (*frame)->i_reference_count == 0 )
x264_frame_delete( *frame );
+ x264_macroblock_cache_end( h->thread[i] );
}
- frame = &h->thread[i]->fdec;
- assert( (*frame)->i_reference_count > 0 );
- (*frame)->i_reference_count--;
- if( (*frame)->i_reference_count == 0 )
- x264_frame_delete( *frame );
-
- x264_macroblock_cache_end( h->thread[i] );
+ x264_free( h->thread[i]->scratch_buffer );
x264_free( h->thread[i]->out.p_bitstream );
+ x264_free( h->thread[i]->out.nal);
x264_free( h->thread[i] );
}
}
+
+/****************************************************************************
+ * x264_encoder_delayed_frames:
+ ****************************************************************************/
+int x264_encoder_delayed_frames( x264_t *h )
+{
+ int delayed_frames = 0;
+ int i;
+ if( h->i_thread_frames > 1 )
+ {
+ for( i=0; i<h->i_thread_frames; i++ )
+ delayed_frames += h->thread[i]->b_thread_active;
+ h = h->thread[h->i_thread_phase];
+ }
+ for( i=0; h->frames.current[i]; i++ )
+ delayed_frames++;
+ x264_pthread_mutex_lock( &h->lookahead->ofbuf.mutex );
+ x264_pthread_mutex_lock( &h->lookahead->ifbuf.mutex );
+ x264_pthread_mutex_lock( &h->lookahead->next.mutex );
+ delayed_frames += h->lookahead->ifbuf.i_size + h->lookahead->next.i_size + h->lookahead->ofbuf.i_size;
+ x264_pthread_mutex_unlock( &h->lookahead->next.mutex );
+ x264_pthread_mutex_unlock( &h->lookahead->ifbuf.mutex );
+ x264_pthread_mutex_unlock( &h->lookahead->ofbuf.mutex );
+ return delayed_frames;
+}
projects / x264 / blobdiff