******************************* x264 libs **********************************
*
****************************************************************************/
-static int64_t x264_sqe( uint8_t *pix1, int i_pix_stride, uint8_t *pix2, int i_pix2_stride, int i_width, int i_height )
+static int64_t x264_sqe( x264_t *h, uint8_t *pix1, int i_pix_stride, uint8_t *pix2, int i_pix2_stride, int i_width, int i_height )
{
int64_t i_sqe = 0;
-
int x, y;
- for( y = 0; y < i_height; y++ )
+#define SSD(size) i_sqe += h->pixf.ssd[size]( pix1+y*i_pix_stride+x, i_pix_stride, \
+ pix2+y*i_pix2_stride+x, i_pix2_stride );
+ for( y = 0; y < i_height-15; y += 16 )
{
- for( x = 0; x < i_width; x++ )
- {
- int tmp;
-
- tmp = pix1[y*i_pix_stride+x] - pix2[y*i_pix2_stride+x];
-
- i_sqe += tmp * tmp;
- }
+ for( x = 0; x < i_width-15; x += 16 )
+ SSD(PIXEL_16x16);
+ if( x < i_width-7 )
+ SSD(PIXEL_8x16);
}
+ if( y < i_height-7 )
+ for( x = 0; x < i_width-7; x += 8 )
+ SSD(PIXEL_8x8);
+#undef SSD
+ x264_cpu_restore( h->param.cpu );
+
return i_sqe;
}
/* Fill "default" values */
-static void x264_slice_header_init( x264_slice_header_t *sh, x264_param_t *param,
+static void x264_slice_header_init( x264_t *h, x264_slice_header_t *sh,
x264_sps_t *sps, x264_pps_t *pps,
- int i_type, int i_idr_pic_id, int i_frame )
+ int i_type, int i_idr_pic_id, int i_frame, int i_qp )
{
+ x264_param_t *param = &h->param;
+ int i;
+
/* First we fill all field */
sh->sps = sps;
sh->pps = pps;
sh->i_num_ref_idx_l0_active = 1;
sh->i_num_ref_idx_l1_active = 1;
+ sh->b_ref_pic_list_reordering_l0 = h->b_ref_reorder[0];
+ sh->b_ref_pic_list_reordering_l1 = h->b_ref_reorder[1];
+
+ /* If the ref list isn't in the default order, construct reordering header */
+ /* List1 reordering isn't needed yet */
+ if( sh->b_ref_pic_list_reordering_l0 )
+ {
+ int pred_frame_num = i_frame;
+ for( i = 0; i < h->i_ref0; i++ )
+ {
+ int diff = h->fref0[i]->i_frame_num - pred_frame_num;
+ if( diff == 0 )
+ x264_log( h, X264_LOG_ERROR, "diff frame num == 0\n" );
+ sh->ref_pic_list_order[0][i].idc = ( diff > 0 );
+ sh->ref_pic_list_order[0][i].arg = abs( diff ) - 1;
+ pred_frame_num = h->fref0[i]->i_frame_num;
+ }
+ }
+
sh->i_cabac_init_idc = param->i_cabac_init_idc;
- sh->i_qp_delta = 0;
+ sh->i_qp_delta = i_qp - pps->i_pic_init_qp;
sh->b_sp_for_swidth = 0;
sh->i_qs_delta = 0;
- if( param->b_deblocking_filter )
+ /* If effective qp <= 15, deblocking would have no effect anyway */
+ if( param->b_deblocking_filter
+ && ( h->mb.b_variable_qp
+ || 15 < i_qp + X264_MAX(param->i_deblocking_filter_alphac0, param->i_deblocking_filter_beta) ) )
{
sh->i_disable_deblocking_filter_idc = 0;
}
static void x264_slice_header_write( bs_t *s, x264_slice_header_t *sh, int i_nal_ref_idc )
{
+ int i;
+
bs_write_ue( s, sh->i_first_mb );
bs_write_ue( s, sh->i_type + 5 ); /* same type things */
bs_write_ue( s, sh->i_pps_id );
/* ref pic list reordering */
if( sh->i_type != SLICE_TYPE_I )
{
- int b_ref_pic_list_reordering_l0 = 0;
- bs_write1( s, b_ref_pic_list_reordering_l0 );
- if( b_ref_pic_list_reordering_l0 )
+ bs_write1( s, sh->b_ref_pic_list_reordering_l0 );
+ if( sh->b_ref_pic_list_reordering_l0 )
{
- /* FIXME */
+ for( i = 0; i < sh->i_num_ref_idx_l0_active; i++ )
+ {
+ bs_write_ue( s, sh->ref_pic_list_order[0][i].idc );
+ bs_write_ue( s, sh->ref_pic_list_order[0][i].arg );
+
+ }
+ bs_write_ue( s, 3 );
}
}
if( sh->i_type == SLICE_TYPE_B )
{
- int b_ref_pic_list_reordering_l1 = 0;
- bs_write1( s, b_ref_pic_list_reordering_l1 );
- if( b_ref_pic_list_reordering_l1 )
+ bs_write1( s, sh->b_ref_pic_list_reordering_l1 );
+ if( sh->b_ref_pic_list_reordering_l1 )
{
- /* FIXME */
+ for( i = 0; i < sh->i_num_ref_idx_l1_active; i++ )
+ {
+ bs_write_ue( s, sh->ref_pic_list_order[1][i].idc );
+ bs_write_ue( s, sh->ref_pic_list_order[1][i].arg );
+ }
+ bs_write_ue( s, 3 );
}
}
{
x264_log( h, X264_LOG_ERROR, "invalid width x height (%dx%d)\n",
param->i_width, param->i_height );
- free( h );
+ x264_free( h );
return NULL;
}
{
x264_log( h, X264_LOG_ERROR, "width %% 16 != 0 or height %% 16 != 0 (%dx%d)\n",
param->i_width, param->i_height );
- free( h );
+ x264_free( h );
return NULL;
}
if( param->i_csp != X264_CSP_I420 )
{
x264_log( h, X264_LOG_ERROR, "invalid CSP (only I420 supported)\n" );
- free( h );
+ x264_free( h );
return NULL;
}
/* Fix parameters values */
- h->param.i_frame_reference = x264_clip3( h->param.i_frame_reference, 1, 15 );
+ 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 );
h->param.i_bframe = x264_clip3( h->param.i_bframe, 0, X264_BFRAME_MAX );
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;
h->frames.i_delay = h->param.i_bframe;
+ h->frames.i_max_ref0 = h->param.i_frame_reference;
+ h->frames.i_max_ref1 = h->param.b_bframe_pyramid ? 2
+ : h->param.i_bframe ? 1 : 0;
+ h->frames.i_max_dpb = h->frames.i_max_ref0 + h->frames.i_max_ref1 + 1;
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 );
h->param.analyse.i_subpel_refine = x264_clip3( h->param.analyse.i_subpel_refine, 1, 5 );
if( h->param.analyse.inter & X264_ANALYSE_PSUB8x8 )
h->param.analyse.inter |= X264_ANALYSE_PSUB16x16;
+ h->param.analyse.i_chroma_qp_offset = x264_clip3(h->param.analyse.i_chroma_qp_offset, -12, 12);
+ h->param.analyse.i_mv_range = x264_clip3(h->param.analyse.i_mv_range, 32, 2048);
if( h->param.rc.f_qblur < 0 )
h->param.rc.f_qblur = 0;
if( h->param.rc.f_complexity_blur < 0 )
h->param.rc.f_complexity_blur = 0;
+ h->param.rc.i_qp_constant = x264_clip3(h->param.rc.i_qp_constant, 0, 51);
/* VUI */
if( h->param.vui.i_sar_width > 0 && h->param.vui.i_sar_height > 0 )
h->i_frame = 0;
h->i_frame_num = 0;
- h->i_poc = 0;
h->i_idr_pic_id = 0;
h->sps = &h->sps_array[0];
h->mb.i_mb_count = h->sps->i_mb_width * h->sps->i_mb_height;
/* Init frames. */
- for( i = 0; i < X264_BFRAME_MAX + 1; i++ )
+ for( i = 0; i < X264_BFRAME_MAX + 3; i++ )
{
h->frames.current[i] = NULL;
h->frames.next[i] = NULL;
{
h->frames.unused[i] = x264_frame_new( h );
}
- for( i = 0; i < 2 + h->param.i_frame_reference; i++ )
+ for( i = 0; i < h->frames.i_max_dpb; i++ )
{
- /* 2 = 1 backward ref + 1 fdec */
h->frames.reference[i] = x264_frame_new( h );
}
+ h->frames.reference[h->frames.i_max_dpb] = NULL;
h->frames.i_last_idr = - h->param.i_keyint_max;
h->frames.i_input = 0;
+ h->frames.last_nonb = NULL;
h->i_ref0 = 0;
h->i_ref1 = 0;
static void x264_frame_put( x264_frame_t *list[X264_BFRAME_MAX], x264_frame_t *frame )
{
int i = 0;
-
- while( list[i] != NULL ) i++;
-
+ while( list[i] ) i++;
list[i] = frame;
}
+static void x264_frame_push( x264_frame_t *list[X264_BFRAME_MAX], x264_frame_t *frame )
+{
+ int i = 0;
+ while( list[i] ) i++;
+ while( i-- )
+ list[i+1] = list[i];
+ list[0] = frame;
+}
+
static x264_frame_t *x264_frame_get( x264_frame_t *list[X264_BFRAME_MAX+1] )
{
x264_frame_t *frame = list[0];
int i;
-
- for( i = 0; i < X264_BFRAME_MAX; i++ )
- {
+ for( i = 0; list[i]; i++ )
list[i] = list[i+1];
- }
- list[X264_BFRAME_MAX] = NULL;
-
return frame;
}
-/* Sort queued frames into input order */
-static void x264_frame_sort( x264_frame_t *list[X264_BFRAME_MAX+1] )
+static void x264_frame_sort( x264_frame_t *list[X264_BFRAME_MAX+1], int b_dts )
{
int i, b_ok;
do {
b_ok = 1;
- for( i = 0; i < X264_BFRAME_MAX && list[i+1]; i++ )
+ for( i = 0; list[i+1]; i++ )
{
- if( list[i]->i_frame > list[i+1]->i_frame )
+ int dtype = list[i]->i_type - list[i+1]->i_type;
+ int dtime = list[i]->i_frame - list[i+1]->i_frame;
+ int swap = b_dts ? dtype > 0 || ( dtype == 0 && dtime > 0 )
+ : dtime > 0;
+ if( swap )
{
x264_frame_t *tmp = list[i+1];
list[i+1] = list[i];
}
} while( !b_ok );
}
+#define x264_frame_sort_dts(list) x264_frame_sort(list, 1)
+#define x264_frame_sort_pts(list) x264_frame_sort(list, 0)
-static inline void x264_reference_build_list( x264_t *h, int i_poc )
+static inline void x264_reference_build_list( x264_t *h, int i_poc, int i_slice_type )
{
int i;
int b_ok;
/* build ref list 0/1 */
h->i_ref0 = 0;
h->i_ref1 = 0;
- for( i = 1; i < h->param.i_frame_reference+2; i++ )
+ for( i = 1; i < h->frames.i_max_dpb; i++ )
{
if( h->frames.reference[i]->i_poc >= 0 )
{
}
}
}
+
/* Order ref0 from higher to lower poc */
do
{
}
} while( !b_ok );
- if( h->i_ref0 > h->param.i_frame_reference )
- {
- h->i_ref0 = h->param.i_frame_reference;
- }
- if( h->i_ref1 > 1 )
+ /* 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( i_slice_type == SLICE_TYPE_P )
{
- h->i_ref1 = 1;
+ for( i = 0; i < h->i_ref0 - 1; i++ )
+ if( h->fref0[i]->i_frame_num < h->fref0[i+1]->i_frame_num )
+ {
+ h->b_ref_reorder[0] = 1;
+ break;
+ }
}
+
+ h->i_ref0 = X264_MIN( h->i_ref0, h->frames.i_max_ref0 );
+ h->i_ref1 = X264_MIN( h->i_ref1, h->frames.i_max_ref1 );
}
static inline void x264_reference_update( x264_t *h )
int i;
/* apply deblocking filter to the current decoded picture */
- if( h->param.b_deblocking_filter )
+ if( !h->sh.i_disable_deblocking_filter_idc )
{
TIMER_START( i_mtime_filter );
x264_frame_deblocking_filter( h, h->sh.i_type );
h->frames.last_nonb = h->fdec;
/* move frame in the buffer */
- h->fdec = h->frames.reference[h->param.i_frame_reference+1];
- for( i = h->param.i_frame_reference+1; i > 0; i-- )
+ /* FIXME: override to forget earliest pts, not earliest dts */
+ h->fdec = h->frames.reference[h->frames.i_max_dpb-1];
+ for( i = h->frames.i_max_dpb-1; i > 0; i-- )
{
h->frames.reference[i] = h->frames.reference[i-1];
}
int i;
/* reset ref pictures */
- for( i = 1; i < h->param.i_frame_reference+2; i++ )
+ for( i = 1; i < h->frames.i_max_dpb; i++ )
{
h->frames.reference[i]->i_poc = -1;
}
/* ------------------------ Create slice header ----------------------- */
if( i_nal_type == NAL_SLICE_IDR )
{
- x264_slice_header_init( &h->sh, &h->param, h->sps, h->pps, i_slice_type, h->i_idr_pic_id, h->i_frame_num - 1 );
+ x264_slice_header_init( h, &h->sh, h->sps, h->pps, i_slice_type, h->i_idr_pic_id, h->i_frame_num - 1, i_global_qp );
/* increment id */
h->i_idr_pic_id = ( h->i_idr_pic_id + 1 ) % 65536;
}
else
{
- x264_slice_header_init( &h->sh, &h->param, h->sps, h->pps, i_slice_type, -1, h->i_frame_num - 1 );
+ x264_slice_header_init( h, &h->sh, h->sps, h->pps, i_slice_type, -1, h->i_frame_num - 1, i_global_qp );
/* always set the real higher num of ref frame used */
h->sh.b_num_ref_idx_override = 1;
h->sh.i_num_ref_idx_l1_active = h->i_ref1 <= 0 ? 1 : h->i_ref1;
}
+ h->fdec->i_frame_num = h->sh.i_frame_num;
+
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 );
/* Nothing to do ? */
}
- /* global qp */
- h->sh.i_qp_delta = i_global_qp - h->pps->i_pic_init_qp;
-
/* get adapative cabac model if needed */
if( h->param.b_cabac )
{
h->stat.frame.i_mb_count[h->mb.i_type]++;
- x264_ratecontrol_mb(h, bs_pos(&h->out.bs) - mb_spos);
+ if( h->mb.b_variable_qp )
+ x264_ratecontrol_mb(h, bs_pos(&h->out.bs) - mb_spos);
}
if( h->param.b_cabac )
if( h->frames.current[0] == NULL )
{
+ int bframes = 0;
/* 2: Select frame types */
- x264_frame_t *frm;
- int bframes;
-
if( h->frames.next[0] == NULL )
return 0;
- if( h->param.rc.b_stat_read )
- {
- /* Use the frame types from the first pass */
- for( i = 0; h->frames.next[i] != NULL; i++ )
- h->frames.next[i]->i_type =
- x264_ratecontrol_slice_type( h, h->frames.next[i]->i_frame );
- }
- else if( h->param.i_bframe && h->param.b_bframe_adaptive )
- x264_voptype_analyse( h );
+ x264_slicetype_decide( h );
- for( bframes = 0;; bframes++ )
+ /* 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_put( h->frames.current, x264_frame_get( &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 )
{
- frm = h->frames.next[bframes];
-
- /* Limit GOP size */
- if( frm->i_frame - h->frames.i_last_idr >= h->param.i_keyint_max )
- {
- if( frm->i_type == X264_TYPE_AUTO )
- frm->i_type = X264_TYPE_IDR;
- if( frm->i_type != X264_TYPE_IDR )
- x264_log( h, X264_LOG_ERROR, "specified frame type (%d) is not compatible with keyframe interval\n", frm->i_type );
- }
- if( frm->i_type == X264_TYPE_IDR )
- {
- h->i_poc = 0;
- h->i_frame_num = 0;
-
- /* Close GOP */
- if( bframes > 0 )
- {
- bframes--;
- h->frames.next[bframes]->i_type = X264_TYPE_P;
- }
- }
-
- if( bframes == h->param.i_bframe
- || h->frames.next[bframes+1] == NULL )
- {
- if( frm->i_type == X264_TYPE_B )
- x264_log( h, X264_LOG_ERROR, "specified frame type is not compatible with max B-frames\n" );
- if( frm->i_type == X264_TYPE_AUTO
- || frm->i_type == X264_TYPE_B )
- frm->i_type = X264_TYPE_P;
- }
-
- frm->i_poc = h->i_poc;
- h->i_poc += 2;
-
- if( frm->i_type != X264_TYPE_AUTO && frm->i_type != X264_TYPE_B )
- break;
-
- frm->i_type = X264_TYPE_B;
+ x264_frame_t *mid = x264_frame_get( &h->frames.next[bframes/2] );
+ mid->i_type = X264_TYPE_BREF;
+ x264_frame_put( h->frames.current, mid );
+ bframes--;
}
-
- /* 3: move some B-frames and 1 non-B to encode queue */
- x264_frame_put( h->frames.current, h->frames.next[bframes] );
while( bframes-- )
x264_frame_put( h->frames.current, x264_frame_get( h->frames.next ) );
- x264_frame_get( h->frames.next );
}
TIMER_STOP( i_mtime_encode_frame );
i_nal_ref_idc = NAL_PRIORITY_HIGH; /* Not completely true but for now it is (as all I/P are kept as ref)*/
i_slice_type = SLICE_TYPE_P;
}
+ 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_slice_type = SLICE_TYPE_B;
+ }
else /* B frame */
{
i_nal_type = NAL_SLICE;
i_slice_type = SLICE_TYPE_B;
}
+ h->fdec->i_poc =
+ h->fenc->i_poc = 2 * (h->fenc->i_frame - h->frames.i_last_idr);
h->fdec->i_type = h->fenc->i_type;
- h->fdec->i_poc = h->fenc->i_poc;
h->fdec->i_frame = h->fenc->i_frame;
+ h->fenc->b_kept_as_ref =
+ h->fdec->b_kept_as_ref = i_nal_ref_idc != NAL_PRIORITY_DISPOSABLE;
/* ------------------- Init ----------------------------- */
/* Init the rate control */
- x264_ratecontrol_start( h, i_slice_type );
+ x264_ratecontrol_start( h, i_slice_type, h->fenc->i_qpplus1 );
i_global_qp = x264_ratecontrol_qp( h );
+
pic_out->i_qpplus1 =
h->fdec->i_qpplus1 = i_global_qp + 1;
/* build ref list 0/1 */
- x264_reference_build_list( h, h->fdec->i_poc );
+ x264_reference_build_list( h, h->fdec->i_poc, i_slice_type );
if( i_slice_type == SLICE_TYPE_B )
x264_macroblock_bipred_init( h );
/* restore CPU state (before using float again) */
x264_cpu_restore( h->param.cpu );
- /* XXX: this scene cut won't work with B frame (it may never create IDR -> bad) */
if( i_slice_type == SLICE_TYPE_P && !h->param.rc.b_stat_read
&& h->param.i_scenecut_threshold >= 0 )
{
h->out.nal[h->out.i_nal-1].i_payload > 2 * h->i_last_inter_size &&
h->frames.i_last_i > 4)*/
{
+ int b;
x264_log( h, X264_LOG_DEBUG, "scene cut at %d size=%d Icost:%.0f Pcost:%.0f ratio:%.3f bias=%.3f lastIDR:%d (I:%d P:%d Skip:%d)\n",
h->fenc->i_frame,
/* Restore frame num */
h->i_frame_num--;
- for( i = 0; h->frames.current[i] && h->frames.current[i]->i_type == X264_TYPE_B; i++ );
- if( i > 0 )
+ 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
* we can't assign an I-frame. Instead, change the previous
* B-frame to P, and rearrange coding order. */
- x264_frame_t *tmp = h->frames.current[i-1];
- h->frames.current[i-1] = h->fenc;
- h->fenc = tmp;
+ if( h->param.b_bframe_adaptive || b > 1 )
+ h->fenc->i_type = X264_TYPE_AUTO;
+ x264_frame_sort_pts( h->frames.current );
+ x264_frame_push( 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 )
x264_frame_t *tmp;
/* Reset */
- h->i_poc = 0;
h->i_frame_num = 0;
/* Reinit field of fenc */
h->fenc->i_type = X264_TYPE_IDR;
h->fenc->i_poc = 0;
- /* Next Poc */
- h->i_poc += 2;
-
/* Put enqueued frames back in the pool */
while( (tmp = x264_frame_get( h->frames.current ) ) != NULL )
x264_frame_put( h->frames.next, tmp );
- x264_frame_sort( h->frames.next );
+ x264_frame_sort_pts( h->frames.next );
}
else
{
int64_t i_sqe_y, i_sqe_u, i_sqe_v;
/* PSNR */
- i_sqe_y = x264_sqe( frame_psnr->plane[0], frame_psnr->i_stride[0], h->fenc->plane[0], h->fenc->i_stride[0], h->param.i_width, h->param.i_height );
- i_sqe_u = x264_sqe( frame_psnr->plane[1], frame_psnr->i_stride[1], h->fenc->plane[1], h->fenc->i_stride[1], h->param.i_width/2, h->param.i_height/2);
- i_sqe_v = x264_sqe( frame_psnr->plane[2], frame_psnr->i_stride[2], h->fenc->plane[2], h->fenc->i_stride[2], h->param.i_width/2, h->param.i_height/2);
+ i_sqe_y = x264_sqe( h, frame_psnr->plane[0], frame_psnr->i_stride[0], h->fenc->plane[0], h->fenc->i_stride[0], h->param.i_width, h->param.i_height );
+ i_sqe_u = x264_sqe( h, frame_psnr->plane[1], frame_psnr->i_stride[1], h->fenc->plane[1], h->fenc->i_stride[1], h->param.i_width/2, h->param.i_height/2);
+ i_sqe_v = x264_sqe( h, frame_psnr->plane[2], frame_psnr->i_stride[2], h->fenc->plane[2], h->fenc->i_stride[2], h->param.i_width/2, h->param.i_height/2);
h->stat.i_sqe_global[i_slice_type] += i_sqe_y + i_sqe_u + i_sqe_v;
h->stat.f_psnr_average[i_slice_type] += x264_psnr( i_sqe_y + i_sqe_u + i_sqe_v, 3 * h->param.i_width * h->param.i_height / 2 );
}
/* frames */
- for( i = 0; i < X264_BFRAME_MAX + 1; i++ )
+ for( i = 0; i < X264_BFRAME_MAX + 3; i++ )
{
if( h->frames.current[i] ) x264_frame_delete( h->frames.current[i] );
if( h->frames.next[i] ) x264_frame_delete( h->frames.next[i] );
if( h->frames.unused[i] ) x264_frame_delete( h->frames.unused[i] );
}
/* ref frames */
- for( i = 0; i < h->param.i_frame_reference+2; i++ )
+ for( i = 0; i < h->frames.i_max_dpb; i++ )
{
x264_frame_delete( h->frames.reference[i] );
}
projects / x264 / blobdiff