X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=encoder%2Fslicetype.c;h=73c0d676f15a004251f7b8743abbcbf18a2b3059;hb=00597d74c6223f3694e2c6614ef0574d7fca6b22;hp=3dfed2a6ec92c0d4f521d97257ecd8ad36dea796;hpb=3c50b9b4cc52b91dcb71bfe2a542aee9fb9a9a97;p=x264 diff --git a/encoder/slicetype.c b/encoder/slicetype.c index 3dfed2a6..73c0d676 100644 --- a/encoder/slicetype.c +++ b/encoder/slicetype.c @@ -1,7 +1,7 @@ /***************************************************************************** * slicetype.c: lookahead analysis ***************************************************************************** - * Copyright (C) 2005-2010 x264 project + * Copyright (C) 2005-2016 x264 project * * Authors: Fiona Glaser * Loren Merritt @@ -25,8 +25,6 @@ * For more information, contact us at licensing@x264.com. *****************************************************************************/ -#include - #include "common/common.h" #include "macroblock.h" #include "me.h" @@ -35,8 +33,19 @@ static const uint8_t delta_tfi_divisor[10] = { 0, 2, 1, 1, 2, 2, 3, 3, 4, 6 }; static int x264_slicetype_frame_cost( x264_t *h, x264_mb_analysis_t *a, - x264_frame_t **frames, int p0, int p1, int b, - int b_intra_penalty ); + x264_frame_t **frames, int p0, int p1, int b ); + +void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int b_lookahead ); + +#if HAVE_OPENCL +int x264_opencl_lowres_init( x264_t *h, x264_frame_t *fenc, int lambda ); +int x264_opencl_motionsearch( x264_t *h, x264_frame_t **frames, int b, int ref, int b_islist1, int lambda, const x264_weight_t *w ); +int x264_opencl_finalize_cost( x264_t *h, int lambda, x264_frame_t **frames, int p0, int p1, int b, int dist_scale_factor ); +int x264_opencl_precalculate_frame_cost( x264_t *h, x264_frame_t **frames, int lambda, int p0, int p1, int b ); +void x264_opencl_flush( x264_t *h ); +void x264_opencl_slicetype_prep( x264_t *h, x264_frame_t **frames, int num_frames, int lambda ); +void x264_opencl_slicetype_end( x264_t *h ); +#endif static void x264_lowres_context_init( x264_t *h, x264_mb_analysis_t *a ) { @@ -62,7 +71,7 @@ static void x264_weight_get_h264( int weight_nonh264, int offset, x264_weight_t w->i_offset = offset; w->i_denom = 7; w->i_scale = weight_nonh264; - while( w->i_denom > 0 && (w->i_scale > 127 || !(w->i_scale & 1)) ) + while( w->i_denom > 0 && (w->i_scale > 127) ) { w->i_denom--; w->i_scale >>= 1; @@ -89,7 +98,7 @@ static NOINLINE pixel *x264_weight_cost_init_luma( x264_t *h, x264_frame_t *fenc int mvx = fenc->lowres_mvs[0][ref0_distance][i_mb_xy][0]; int mvy = fenc->lowres_mvs[0][ref0_distance][i_mb_xy][1]; h->mc.mc_luma( p+x, i_stride, ref->lowres, i_stride, - mvx+(x<<2), mvy+(y<<2), 8, 8, weight_none ); + mvx+(x<<2), mvy+(y<<2), 8, 8, x264_weight_none ); } x264_emms(); return dest; @@ -98,12 +107,11 @@ static NOINLINE pixel *x264_weight_cost_init_luma( x264_t *h, x264_frame_t *fenc return ref->lowres[0]; } -/* How data is organized for chroma weightp: +/* How data is organized for 4:2:0/4:2:2 chroma weightp: * [U: ref] [U: fenc] * [V: ref] [V: fenc] * fenc = ref + offset - * v = u + stride * chroma height - * We'll need more room if we do 4:2:2 or 4:4:4. */ + * v = u + stride * chroma height */ static NOINLINE void x264_weight_cost_init_chroma( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, pixel *dstu, pixel *dstv ) { @@ -112,20 +120,23 @@ static NOINLINE void x264_weight_cost_init_chroma( x264_t *h, x264_frame_t *fenc int i_offset = i_stride / 2; int i_lines = fenc->i_lines[1]; int i_width = fenc->i_width[1]; - int cw = h->mb.i_mb_width << 3; - int ch = h->mb.i_mb_height << 3; + int v_shift = CHROMA_V_SHIFT; + int cw = 8*h->mb.i_mb_width; + int ch = 16*h->mb.i_mb_height >> v_shift; + int height = 16 >> v_shift; if( fenc->lowres_mvs[0][ref0_distance][0][0] != 0x7FFF ) { - for( int y = 0, mb_xy = 0, pel_offset_y = 0; y < i_lines; y += 8, pel_offset_y = y*i_stride ) + x264_frame_expand_border_chroma( h, ref, 1 ); + for( int y = 0, mb_xy = 0, pel_offset_y = 0; y < i_lines; y += height, pel_offset_y = y*i_stride ) for( int x = 0, pel_offset_x = 0; x < i_width; x += 8, mb_xy++, pel_offset_x += 8 ) { pixel *pixu = dstu + pel_offset_y + pel_offset_x; pixel *pixv = dstv + pel_offset_y + pel_offset_x; - pixel *src1 = ref->plane[1] + pel_offset_y + pel_offset_x*2; /* NV12 */ + pixel *src1 = ref->plane[1] + pel_offset_y + pel_offset_x*2; /* NV12/NV16 */ int mvx = fenc->lowres_mvs[0][ref0_distance][mb_xy][0]; int mvy = fenc->lowres_mvs[0][ref0_distance][mb_xy][1]; - h->mc.mc_chroma( pixu, pixv, i_stride, src1, i_stride, mvx, mvy, 8, 8 ); + h->mc.mc_chroma( pixu, pixv, i_stride, src1, i_stride, mvx, 2*mvy>>v_shift, 8, height ); } } else @@ -134,10 +145,41 @@ static NOINLINE void x264_weight_cost_init_chroma( x264_t *h, x264_frame_t *fenc x264_emms(); } +static NOINLINE pixel *x264_weight_cost_init_chroma444( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, pixel *dst, int p ) +{ + int ref0_distance = fenc->i_frame - ref->i_frame - 1; + int i_stride = fenc->i_stride[p]; + int i_lines = fenc->i_lines[p]; + int i_width = fenc->i_width[p]; + + if( fenc->lowres_mvs[0][ref0_distance][0][0] != 0x7FFF ) + { + x264_frame_expand_border_chroma( h, ref, p ); + for( int y = 0, mb_xy = 0, pel_offset_y = 0; y < i_lines; y += 16, pel_offset_y = y*i_stride ) + for( int x = 0, pel_offset_x = 0; x < i_width; x += 16, mb_xy++, pel_offset_x += 16 ) + { + pixel *pix = dst + pel_offset_y + pel_offset_x; + pixel *src = ref->plane[p] + pel_offset_y + pel_offset_x; + int mvx = fenc->lowres_mvs[0][ref0_distance][mb_xy][0] / 2; + int mvy = fenc->lowres_mvs[0][ref0_distance][mb_xy][1] / 2; + /* We don't want to calculate hpels for fenc frames, so we round the motion + * vectors to fullpel here. It's not too bad, I guess? */ + h->mc.copy_16x16_unaligned( pix, i_stride, src+mvx+mvy*i_stride, i_stride, 16 ); + } + x264_emms(); + return dst; + } + x264_emms(); + return ref->plane[p]; +} + static int x264_weight_slice_header_cost( x264_t *h, x264_weight_t *w, int b_chroma ) { /* Add cost of weights in the slice header. */ int lambda = x264_lambda_tab[X264_LOOKAHEAD_QP]; + /* 4 times higher, because chroma is analyzed at full resolution. */ + if( b_chroma ) + lambda *= 4; int numslices; if( h->param.i_slice_count ) numslices = h->param.i_slice_count; @@ -169,14 +211,18 @@ static NOINLINE unsigned int x264_weight_cost_luma( x264_t *h, x264_frame_t *fen for( int x = 0; x < i_width; x += 8, i_mb++, pixoff += 8) { w->weightfn[8>>2]( buf, 8, &src[pixoff], i_stride, w, 8 ); - cost += X264_MIN( h->pixf.mbcmp[PIXEL_8x8]( buf, 8, &fenc_plane[pixoff], i_stride ), fenc->i_intra_cost[i_mb] ); + int cmp = h->pixf.mbcmp[PIXEL_8x8]( buf, 8, &fenc_plane[pixoff], i_stride ); + cost += X264_MIN( cmp, fenc->i_intra_cost[i_mb] ); } cost += x264_weight_slice_header_cost( h, w, 0 ); } else for( int y = 0; y < i_lines; y += 8, pixoff = y*i_stride ) for( int x = 0; x < i_width; x += 8, i_mb++, pixoff += 8 ) - cost += X264_MIN( h->pixf.mbcmp[PIXEL_8x8]( &src[pixoff], i_stride, &fenc_plane[pixoff], i_stride ), fenc->i_intra_cost[i_mb] ); + { + int cmp = h->pixf.mbcmp[PIXEL_8x8]( &src[pixoff], i_stride, &fenc_plane[pixoff], i_stride ); + cost += X264_MIN( cmp, fenc->i_intra_cost[i_mb] ); + } x264_emms(); return cost; } @@ -185,36 +231,58 @@ static NOINLINE unsigned int x264_weight_cost_chroma( x264_t *h, x264_frame_t *f { unsigned int cost = 0; int i_stride = fenc->i_stride[1]; - int i_offset = i_stride / 2; int i_lines = fenc->i_lines[1]; int i_width = fenc->i_width[1]; - pixel *src = ref + i_offset; - ALIGNED_ARRAY_16( pixel, buf, [8*8] ); + pixel *src = ref + (i_stride >> 1); + ALIGNED_ARRAY_16( pixel, buf, [8*16] ); int pixoff = 0; - ALIGNED_16( static pixel flat[8] ) = {0}; + int height = 16 >> CHROMA_V_SHIFT; if( w ) { - for( int y = 0; y < i_lines; y += 8, pixoff = y*i_stride ) + for( int y = 0; y < i_lines; y += height, pixoff = y*i_stride ) for( int x = 0; x < i_width; x += 8, pixoff += 8 ) { - w->weightfn[8>>2]( buf, 8, &ref[pixoff], i_stride, w, 8 ); + w->weightfn[8>>2]( buf, 8, &ref[pixoff], i_stride, w, height ); /* The naive and seemingly sensible algorithm is to use mbcmp as in luma. * But testing shows that for chroma the DC coefficient is by far the most * important part of the coding cost. Thus a more useful chroma weight is * obtained by comparing each block's DC coefficient instead of the actual - * pixels. - * - * FIXME: add a (faster) asm sum function to replace sad. */ - cost += abs( h->pixf.sad_aligned[PIXEL_8x8]( buf, 8, flat, 0 ) - - h->pixf.sad_aligned[PIXEL_8x8]( &src[pixoff], i_stride, flat, 0 ) ); + * pixels. */ + cost += h->pixf.asd8( buf, 8, &src[pixoff], i_stride, height ); } cost += x264_weight_slice_header_cost( h, w, 1 ); } else - for( int y = 0; y < i_lines; y += 8, pixoff = y*i_stride ) + for( int y = 0; y < i_lines; y += height, pixoff = y*i_stride ) for( int x = 0; x < i_width; x += 8, pixoff += 8 ) - cost += abs( h->pixf.sad_aligned[PIXEL_8x8]( &ref[pixoff], i_stride, flat, 0 ) - - h->pixf.sad_aligned[PIXEL_8x8]( &src[pixoff], i_stride, flat, 0 ) ); + cost += h->pixf.asd8( &ref[pixoff], i_stride, &src[pixoff], i_stride, height ); + x264_emms(); + return cost; +} + +static NOINLINE unsigned int x264_weight_cost_chroma444( x264_t *h, x264_frame_t *fenc, pixel *ref, x264_weight_t *w, int p ) +{ + unsigned int cost = 0; + int i_stride = fenc->i_stride[p]; + int i_lines = fenc->i_lines[p]; + int i_width = fenc->i_width[p]; + pixel *src = fenc->plane[p]; + ALIGNED_ARRAY_16( pixel, buf, [16*16] ); + int pixoff = 0; + if( w ) + { + for( int y = 0; y < i_lines; y += 16, pixoff = y*i_stride ) + for( int x = 0; x < i_width; x += 16, pixoff += 16 ) + { + w->weightfn[16>>2]( buf, 16, &ref[pixoff], i_stride, w, 16 ); + cost += h->pixf.mbcmp[PIXEL_16x16]( buf, 16, &src[pixoff], i_stride ); + } + cost += x264_weight_slice_header_cost( h, w, 1 ); + } + else + for( int y = 0; y < i_lines; y += 16, pixoff = y*i_stride ) + for( int x = 0; x < i_width; x += 16, pixoff += 16 ) + cost += h->pixf.mbcmp[PIXEL_16x16]( &ref[pixoff], i_stride, &src[pixoff], i_stride ); x264_emms(); return cost; } @@ -228,21 +296,41 @@ void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int SET_WEIGHT( weights[0], 0, 1, 0, 0 ); SET_WEIGHT( weights[1], 0, 1, 0, 0 ); SET_WEIGHT( weights[2], 0, 1, 0, 0 ); + int chroma_initted = 0; + float guess_scale[3]; + float fenc_mean[3]; + float ref_mean[3]; + for( int plane = 0; plane <= 2*!b_lookahead; plane++ ) + { + float fenc_var = fenc->i_pixel_ssd[plane] + !ref->i_pixel_ssd[plane]; + float ref_var = ref->i_pixel_ssd[plane] + !ref->i_pixel_ssd[plane]; + guess_scale[plane] = sqrtf( fenc_var / ref_var ); + fenc_mean[plane] = (float)fenc->i_pixel_sum[plane] / (fenc->i_lines[!!plane] * fenc->i_width[!!plane]) / (1 << (BIT_DEPTH - 8)); + ref_mean[plane] = (float) ref->i_pixel_sum[plane] / (fenc->i_lines[!!plane] * fenc->i_width[!!plane]) / (1 << (BIT_DEPTH - 8)); + } + + int chroma_denom = 7; + if( !b_lookahead ) + { + /* make sure both our scale factors fit */ + while( chroma_denom > 0 ) + { + float thresh = 127.f / (1<i_pixel_ssd[plane] + !ref->i_pixel_ssd[plane]; - float ref_var = ref->i_pixel_ssd[plane] + !ref->i_pixel_ssd[plane]; - float guess_scale = sqrtf( fenc_var / ref_var ); - float fenc_mean = (float)fenc->i_pixel_sum[plane] / (fenc->i_lines[!!plane] * fenc->i_width[!!plane]) / (1 << (BIT_DEPTH - 8)); - float ref_mean = (float) ref->i_pixel_sum[plane] / (fenc->i_lines[!!plane] * fenc->i_width[!!plane]) / (1 << (BIT_DEPTH - 8)); //early termination - if( fabsf( ref_mean - fenc_mean ) < 0.5f && fabsf( 1.f - guess_scale ) < epsilon ) + if( fabsf( ref_mean[plane] - fenc_mean[plane] ) < 0.5f && fabsf( 1.f - guess_scale[plane] ) < epsilon ) { SET_WEIGHT( weights[plane], 0, 1, 0, 0 ); continue; @@ -250,8 +338,8 @@ void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int if( plane ) { - weights[plane].i_denom = 6; - weights[plane].i_scale = x264_clip3( round( guess_scale * 64 ), 0, 255 ); + weights[plane].i_denom = chroma_denom; + weights[plane].i_scale = x264_clip3( round( guess_scale[plane] * (1< 127 ) { weights[1].weightfn = weights[2].weightfn = NULL; @@ -259,7 +347,7 @@ void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int } } else - x264_weight_get_h264( round( guess_scale * 128 ), 0, &weights[plane] ); + x264_weight_get_h264( round( guess_scale[plane] * 128 ), 0, &weights[plane] ); found = 0; mindenom = weights[plane].i_denom; @@ -273,41 +361,91 @@ void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int { x264_mb_analysis_t a; x264_lowres_context_init( h, &a ); - x264_slicetype_frame_cost( h, &a, &fenc, 0, 0, 0, 0 ); + x264_slicetype_frame_cost( h, &a, &fenc, 0, 0, 0 ); } mcbuf = x264_weight_cost_init_luma( h, fenc, ref, h->mb.p_weight_buf[0] ); origscore = minscore = x264_weight_cost_luma( h, fenc, mcbuf, NULL ); } else { - pixel *dstu = h->mb.p_weight_buf[0]; - pixel *dstv = h->mb.p_weight_buf[0]+fenc->i_stride[1]*fenc->i_lines[1]; - /* Only initialize chroma data once. */ - if( plane == 1 ) - x264_weight_cost_init_chroma( h, fenc, ref, dstu, dstv ); - mcbuf = plane == 1 ? dstu : dstv; - origscore = minscore = x264_weight_cost_chroma( h, fenc, mcbuf, NULL ); + if( CHROMA444 ) + { + mcbuf = x264_weight_cost_init_chroma444( h, fenc, ref, h->mb.p_weight_buf[0], plane ); + origscore = minscore = x264_weight_cost_chroma444( h, fenc, mcbuf, NULL, plane ); + } + else + { + pixel *dstu = h->mb.p_weight_buf[0]; + pixel *dstv = h->mb.p_weight_buf[0]+fenc->i_stride[1]*fenc->i_lines[1]; + if( !chroma_initted++ ) + x264_weight_cost_init_chroma( h, fenc, ref, dstu, dstv ); + mcbuf = plane == 1 ? dstu : dstv; + origscore = minscore = x264_weight_cost_chroma( h, fenc, mcbuf, NULL ); + } } if( !minscore ) continue; - // This gives a slight improvement due to rounding errors but only tests - // one offset on lookahead. - // TODO: currently searches only offset +1. try other offsets/multipliers/combinations thereof? - offset_search = x264_clip3( fenc_mean - ref_mean * minscale / (1 << mindenom) + 0.5f * b_lookahead, -128, 126 ); - for( int i_off = offset_search; i_off <= offset_search+!b_lookahead; i_off++ ) + /* Picked somewhat arbitrarily */ + static const uint8_t weight_check_distance[][2] = { - SET_WEIGHT( weights[plane], 1, minscale, mindenom, i_off ); - unsigned int s; - if( plane ) - s = x264_weight_cost_chroma( h, fenc, mcbuf, &weights[plane] ); - else - s = x264_weight_cost_luma( h, fenc, mcbuf, &weights[plane] ); - COPY3_IF_LT( minscore, s, minoff, i_off, found, 1 ); + {0,0},{0,0},{0,1},{0,1}, + {0,1},{0,1},{0,1},{1,1}, + {1,1},{2,1},{2,1},{4,2} + }; + int scale_dist = b_lookahead ? 0 : weight_check_distance[h->param.analyse.i_subpel_refine][0]; + int offset_dist = b_lookahead ? 0 : weight_check_distance[h->param.analyse.i_subpel_refine][1]; + + int start_scale = x264_clip3( minscale - scale_dist, 0, 127 ); + int end_scale = x264_clip3( minscale + scale_dist, 0, 127 ); + for( int i_scale = start_scale; i_scale <= end_scale; i_scale++ ) + { + int cur_scale = i_scale; + int cur_offset = fenc_mean[plane] - ref_mean[plane] * cur_scale / (1 << mindenom) + 0.5f * b_lookahead; + if( cur_offset < - 128 || cur_offset > 127 ) + { + /* Rescale considering the constraints on cur_offset. We do it in this order + * because scale has a much wider range than offset (because of denom), so + * it should almost never need to be clamped. */ + cur_offset = x264_clip3( cur_offset, -128, 127 ); + cur_scale = (1 << mindenom) * (fenc_mean[plane] - cur_offset) / ref_mean[plane] + 0.5f; + cur_scale = x264_clip3( cur_scale, 0, 127 ); + } + int start_offset = x264_clip3( cur_offset - offset_dist, -128, 127 ); + int end_offset = x264_clip3( cur_offset + offset_dist, -128, 127 ); + for( int i_off = start_offset; i_off <= end_offset; i_off++ ) + { + SET_WEIGHT( weights[plane], 1, cur_scale, mindenom, i_off ); + unsigned int s; + if( plane ) + { + if( CHROMA444 ) + s = x264_weight_cost_chroma444( h, fenc, mcbuf, &weights[plane], plane ); + else + s = x264_weight_cost_chroma( h, fenc, mcbuf, &weights[plane] ); + } + else + s = x264_weight_cost_luma( h, fenc, mcbuf, &weights[plane] ); + COPY4_IF_LT( minscore, s, minscale, cur_scale, minoff, i_off, found, 1 ); + + // Don't check any more offsets if the previous one had a lower cost than the current one + if( minoff == start_offset && i_off != start_offset ) + break; + } } x264_emms(); + /* Use a smaller denominator if possible */ + if( !plane ) + { + while( mindenom > 0 && !(minscale&1) ) + { + mindenom--; + minscale >>= 1; + } + } + /* FIXME: More analysis can be done here on SAD vs. SATD termination. */ /* 0.2% termination derived experimentally to avoid weird weights in frames that are mostly intra. */ if( !found || (minscale == 1 << mindenom && minoff == 0) || (float)minscore / origscore > 0.998f ) @@ -322,18 +460,29 @@ void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int fenc->f_weighted_cost_delta[i_delta_index] = (float)minscore / origscore; } - //FIXME, what is the correct way to deal with this? - if( weights[1].weightfn && weights[2].weightfn && weights[1].i_denom != weights[2].i_denom ) + /* Optimize and unify denominator */ + if( weights[1].weightfn || weights[2].weightfn ) { - int denom = X264_MIN( weights[1].i_denom, weights[2].i_denom ); - int i; - for( i = 1; i <= 2; i++ ) + int denom = weights[1].weightfn ? weights[1].i_denom : weights[2].i_denom; + int both_weighted = weights[1].weightfn && weights[2].weightfn; + /* If only one plane is weighted, the other has an implicit scale of 1< 0 && !(weights[1].weightfn && (weights[1].i_scale&1)) + && !(weights[2].weightfn && (weights[2].i_scale&1))) ) { - weights[i].i_scale = x264_clip3( weights[i].i_scale >> ( weights[i].i_denom - denom ), 0, 255 ); - weights[i].i_denom = denom; - h->mc.weight_cache( h, &weights[i] ); + denom--; + for( int i = 1; i <= 2; i++ ) + if( weights[i].weightfn ) + { + weights[i].i_scale >>= 1; + weights[i].i_denom = denom; + } } } + for( int i = 1; i <= 2; i++ ) + if( weights[i].weightfn ) + h->mc.weight_cache( h, &weights[i] ); if( weights[0].weightfn && b_lookahead ) { @@ -348,9 +497,21 @@ void x264_weights_analyse( x264_t *h, x264_frame_t *fenc, x264_frame_t *ref, int } } +/* Output buffers are separated by 128 bytes to avoid false sharing of cachelines + * in multithreaded lookahead. */ +#define PAD_SIZE 32 +/* cost_est, cost_est_aq, intra_mbs, num rows */ +#define NUM_INTS 4 +#define COST_EST 0 +#define COST_EST_AQ 1 +#define INTRA_MBS 2 +#define NUM_ROWS 3 +#define ROW_SATD (NUM_INTS + (h->mb.i_mb_y - h->i_threadslice_start)) + static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int p0, int p1, int b, - int dist_scale_factor, int do_search[2], const x264_weight_t *w ) + int dist_scale_factor, int do_search[2], const x264_weight_t *w, + int *output_inter, int *output_intra ) { x264_frame_t *fref0 = frames[p0]; x264_frame_t *fref1 = frames[p1]; @@ -363,8 +524,8 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, const int i_stride = fenc->i_stride_lowres; const int i_pel_offset = 8 * (i_mb_x + i_mb_y * i_stride); const int i_bipred_weight = h->param.analyse.b_weighted_bipred ? 64 - (dist_scale_factor>>2) : 32; - int16_t (*fenc_mvs[2])[2] = { &frames[b]->lowres_mvs[0][b-p0-1][i_mb_xy], &frames[b]->lowres_mvs[1][p1-b-1][i_mb_xy] }; - int (*fenc_costs[2]) = { &frames[b]->lowres_mv_costs[0][b-p0-1][i_mb_xy], &frames[b]->lowres_mv_costs[1][p1-b-1][i_mb_xy] }; + int16_t (*fenc_mvs[2])[2] = { &fenc->lowres_mvs[0][b-p0-1][i_mb_xy], &fenc->lowres_mvs[1][p1-b-1][i_mb_xy] }; + int (*fenc_costs[2]) = { &fenc->lowres_mv_costs[0][b-p0-1][i_mb_xy], &fenc->lowres_mv_costs[1][p1-b-1][i_mb_xy] }; int b_frame_score_mb = (i_mb_x > 0 && i_mb_x < h->mb.i_mb_width - 1 && i_mb_y > 0 && i_mb_y < h->mb.i_mb_height - 1) || h->mb.i_mb_width <= 2 || h->mb.i_mb_height <= 2; @@ -374,6 +535,8 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, x264_me_t m[2]; int i_bcost = COST_MAX; int list_used = 0; + /* A small, arbitrary bias to avoid VBV problems caused by zero-residual lookahead blocks. */ + int lowres_penalty = 4; h->mb.pic.p_fenc[0] = h->mb.pic.fenc_buf; h->mc.copy[PIXEL_8x8]( h->mb.pic.p_fenc[0], FENC_STRIDE, &fenc->lowres[0][i_pel_offset], i_stride, 8 ); @@ -382,16 +545,16 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, goto lowres_intra_mb; // no need for h->mb.mv_min[] - h->mb.mv_min_fpel[0] = -8*h->mb.i_mb_x - 4; - h->mb.mv_max_fpel[0] = 8*( h->mb.i_mb_width - h->mb.i_mb_x - 1 ) + 4; - h->mb.mv_min_spel[0] = 4*( h->mb.mv_min_fpel[0] - 8 ); - h->mb.mv_max_spel[0] = 4*( h->mb.mv_max_fpel[0] + 8 ); + h->mb.mv_limit_fpel[0][0] = -8*h->mb.i_mb_x - 4; + h->mb.mv_limit_fpel[1][0] = 8*( h->mb.i_mb_width - h->mb.i_mb_x - 1 ) + 4; + h->mb.mv_min_spel[0] = 4*( h->mb.mv_limit_fpel[0][0] - 8 ); + h->mb.mv_max_spel[0] = 4*( h->mb.mv_limit_fpel[1][0] + 8 ); if( h->mb.i_mb_x >= h->mb.i_mb_width - 2 ) { - h->mb.mv_min_fpel[1] = -8*h->mb.i_mb_y - 4; - h->mb.mv_max_fpel[1] = 8*( h->mb.i_mb_height - h->mb.i_mb_y - 1 ) + 4; - h->mb.mv_min_spel[1] = 4*( h->mb.mv_min_fpel[1] - 8 ); - h->mb.mv_max_spel[1] = 4*( h->mb.mv_max_fpel[1] + 8 ); + h->mb.mv_limit_fpel[0][1] = -8*h->mb.i_mb_y - 4; + h->mb.mv_limit_fpel[1][1] = 8*( h->mb.i_mb_height - h->mb.i_mb_y - 1 ) + 4; + h->mb.mv_min_spel[1] = 4*( h->mb.mv_limit_fpel[0][1] - 8 ); + h->mb.mv_max_spel[1] = 4*( h->mb.mv_limit_fpel[1][1] + 8 ); } #define LOAD_HPELS_LUMA(dst, src) \ @@ -422,7 +585,7 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, } \ else \ { \ - int stride1 = 16, stride2 = 16; \ + intptr_t stride1 = 16, stride2 = 16; \ pixel *src1, *src2; \ src1 = h->mc.get_ref( pix1, &stride1, m[0].p_fref, m[0].i_stride[0], \ (mv0)[0], (mv0)[1], 8, 8, w ); \ @@ -448,7 +611,6 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, if( b_bidir ) { - int16_t *mvr = fref1->lowres_mvs[0][p1-p0-1][i_mb_xy]; ALIGNED_ARRAY_8( int16_t, dmv,[2],[2] ); m[1].i_pixel = PIXEL_8x8; @@ -456,18 +618,24 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, m[1].i_stride[0] = i_stride; m[1].p_fenc[0] = h->mb.pic.p_fenc[0]; m[1].i_ref = 0; - m[1].weight = weight_none; + m[1].weight = x264_weight_none; LOAD_HPELS_LUMA( m[1].p_fref, fref1->lowres ); m[1].p_fref_w = m[1].p_fref[0]; - dmv[0][0] = ( mvr[0] * dist_scale_factor + 128 ) >> 8; - dmv[0][1] = ( mvr[1] * dist_scale_factor + 128 ) >> 8; - dmv[1][0] = dmv[0][0] - mvr[0]; - dmv[1][1] = dmv[0][1] - mvr[1]; - CLIP_MV( dmv[0] ); - CLIP_MV( dmv[1] ); - if( h->param.analyse.i_subpel_refine <= 1 ) - M64( dmv ) &= ~0x0001000100010001ULL; /* mv & ~1 */ + if( fref1->lowres_mvs[0][p1-p0-1][0][0] != 0x7FFF ) + { + int16_t *mvr = fref1->lowres_mvs[0][p1-p0-1][i_mb_xy]; + dmv[0][0] = ( mvr[0] * dist_scale_factor + 128 ) >> 8; + dmv[0][1] = ( mvr[1] * dist_scale_factor + 128 ) >> 8; + dmv[1][0] = dmv[0][0] - mvr[0]; + dmv[1][1] = dmv[0][1] - mvr[1]; + CLIP_MV( dmv[0] ); + CLIP_MV( dmv[1] ); + if( h->param.analyse.i_subpel_refine <= 1 ) + M64( dmv ) &= ~0x0001000100010001ULL; /* mv & ~1 */ + } + else + M64( dmv ) = 0; TRY_BIDIR( dmv[0], dmv[1], 0 ); if( M64( dmv ) ) @@ -493,7 +661,7 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, #define MVC(mv) { CP32( mvc[i_mvc], mv ); i_mvc++; } if( i_mb_x < h->mb.i_mb_width - 1 ) MVC( fenc_mv[1] ); - if( i_mb_y < h->mb.i_mb_height - 1 ) + if( i_mb_y < h->i_threadslice_end - 1 ) { MVC( fenc_mv[i_mb_stride] ); if( i_mb_x > 0 ) @@ -520,7 +688,7 @@ static void x264_slicetype_mb_cost( x264_t *h, x264_mb_analysis_t *a, } x264_me_search( h, &m[l], mvc, i_mvc ); - m[l].cost -= 2 * a->i_lambda; // remove mvcost from skip mbs + m[l].cost -= a->p_cost_mv[0]; // remove mvcost from skip mbs if( M32( m[l].mv ) ) m[l].cost += 5 * a->i_lambda; @@ -542,16 +710,17 @@ skip_motionest: lowres_intra_mb: if( !fenc->b_intra_calculated ) { - ALIGNED_ARRAY_16( pixel, edge,[33] ); - pixel *pix = &pix1[8+FDEC_STRIDE - 1]; - pixel *src = &fenc->lowres[0][i_pel_offset - 1]; + ALIGNED_ARRAY_16( pixel, edge,[36] ); + pixel *pix = &pix1[8+FDEC_STRIDE]; + pixel *src = &fenc->lowres[0][i_pel_offset]; const int intra_penalty = 5 * a->i_lambda; int satds[3]; + int pixoff = 4 / sizeof(pixel); - memcpy( pix-FDEC_STRIDE, src-i_stride, 17 * sizeof(pixel) ); - for( int i = 0; i < 8; i++ ) - pix[i*FDEC_STRIDE] = src[i*i_stride]; - pix++; + /* Avoid store forwarding stalls by writing larger chunks */ + memcpy( pix-FDEC_STRIDE, src-i_stride, 16 * sizeof(pixel) ); + for( int i = -1; i < 8; i++ ) + M32( &pix[i*FDEC_STRIDE-pixoff] ) = M32( &src[i*i_stride-pixoff] ); h->pixf.intra_mbcmp_x3_8x8c( h->mb.pic.p_fenc[0], pix, satds ); int i_icost = X264_MIN3( satds[0], satds[1], satds[2] ); @@ -570,19 +739,19 @@ lowres_intra_mb: } } - i_icost += intra_penalty; + i_icost = ((i_icost + intra_penalty) >> (BIT_DEPTH - 8)) + lowres_penalty; fenc->i_intra_cost[i_mb_xy] = i_icost; + int i_icost_aq = i_icost; + if( h->param.rc.i_aq_mode ) + i_icost_aq = (i_icost_aq * fenc->i_inv_qscale_factor[i_mb_xy] + 128) >> 8; + output_intra[ROW_SATD] += i_icost_aq; if( b_frame_score_mb ) { - int *row_satd_intra = frames[b]->i_row_satds[0][0]; - int i_icost_aq = i_icost; - if( h->param.rc.i_aq_mode ) - i_icost_aq = (i_icost_aq * frames[b]->i_inv_qscale_factor[i_mb_xy] + 128) >> 8; - fenc->i_cost_est[0][0] += i_icost; - fenc->i_cost_est_aq[0][0] += i_icost_aq; - row_satd_intra[h->mb.i_mb_y] += i_icost_aq; + output_intra[COST_EST] += i_icost; + output_intra[COST_EST_AQ] += i_icost_aq; } } + i_bcost = (i_bcost >> (BIT_DEPTH - 8)) + lowres_penalty; /* forbid intra-mbs in B-frames, because it's rare and not worth checking */ /* FIXME: Should we still forbid them now that we cache intra scores? */ @@ -596,7 +765,7 @@ lowres_intra_mb: list_used = 0; } if( b_frame_score_mb ) - fenc->i_intra_mbs[b-p0] += b_intra; + output_inter[INTRA_MBS] += b_intra; } /* In an I-frame, we've already added the results above in the intra section. */ @@ -604,13 +773,13 @@ lowres_intra_mb: { int i_bcost_aq = i_bcost; if( h->param.rc.i_aq_mode ) - i_bcost_aq = (i_bcost_aq * frames[b]->i_inv_qscale_factor[i_mb_xy] + 128) >> 8; - fenc->i_row_satds[b-p0][p1-b][h->mb.i_mb_y] += i_bcost_aq; + i_bcost_aq = (i_bcost_aq * fenc->i_inv_qscale_factor[i_mb_xy] + 128) >> 8; + output_inter[ROW_SATD] += i_bcost_aq; if( b_frame_score_mb ) { /* Don't use AQ-weighted costs for slicetype decision, only for ratecontrol. */ - frames[b]->i_cost_est[b-p0][p1-b] += i_bcost; - frames[b]->i_cost_est_aq[b-p0][p1-b] += i_bcost_aq; + output_inter[COST_EST] += i_bcost; + output_inter[COST_EST_AQ] += i_bcost_aq; } } @@ -623,93 +792,201 @@ lowres_intra_mb: (h->mb.i_mb_width - 2) * (h->mb.i_mb_height - 2) :\ h->mb.i_mb_width * h->mb.i_mb_height) +typedef struct +{ + x264_t *h; + x264_mb_analysis_t *a; + x264_frame_t **frames; + int p0; + int p1; + int b; + int dist_scale_factor; + int *do_search; + const x264_weight_t *w; + int *output_inter; + int *output_intra; +} x264_slicetype_slice_t; + +static void x264_slicetype_slice_cost( x264_slicetype_slice_t *s ) +{ + x264_t *h = s->h; + + /* Lowres lookahead goes backwards because the MVs are used as predictors in the main encode. + * This considerably improves MV prediction overall. */ + + /* The edge mbs seem to reduce the predictive quality of the + * whole frame's score, but are needed for a spatial distribution. */ + int do_edges = h->param.rc.b_mb_tree || h->param.rc.i_vbv_buffer_size || h->mb.i_mb_width <= 2 || h->mb.i_mb_height <= 2; + + int start_y = X264_MIN( h->i_threadslice_end - 1, h->mb.i_mb_height - 2 + do_edges ); + int end_y = X264_MAX( h->i_threadslice_start, 1 - do_edges ); + int start_x = h->mb.i_mb_width - 2 + do_edges; + int end_x = 1 - do_edges; + + for( h->mb.i_mb_y = start_y; h->mb.i_mb_y >= end_y; h->mb.i_mb_y-- ) + for( h->mb.i_mb_x = start_x; h->mb.i_mb_x >= end_x; h->mb.i_mb_x-- ) + x264_slicetype_mb_cost( h, s->a, s->frames, s->p0, s->p1, s->b, s->dist_scale_factor, + s->do_search, s->w, s->output_inter, s->output_intra ); +} + static int x264_slicetype_frame_cost( x264_t *h, x264_mb_analysis_t *a, - x264_frame_t **frames, int p0, int p1, int b, - int b_intra_penalty ) + x264_frame_t **frames, int p0, int p1, int b ) { int i_score = 0; int do_search[2]; - const x264_weight_t *w = weight_none; + const x264_weight_t *w = x264_weight_none; + x264_frame_t *fenc = frames[b]; + /* Check whether we already evaluated this frame * If we have tried this frame as P, then we have also tried * the preceding frames as B. (is this still true?) */ /* Also check that we already calculated the row SATDs for the current frame. */ - if( frames[b]->i_cost_est[b-p0][p1-b] >= 0 && (!h->param.rc.i_vbv_buffer_size || frames[b]->i_row_satds[b-p0][p1-b][0] != -1) ) - i_score = frames[b]->i_cost_est[b-p0][p1-b]; + if( fenc->i_cost_est[b-p0][p1-b] >= 0 && (!h->param.rc.i_vbv_buffer_size || fenc->i_row_satds[b-p0][p1-b][0] != -1) ) + i_score = fenc->i_cost_est[b-p0][p1-b]; else { int dist_scale_factor = 128; - int *row_satd = frames[b]->i_row_satds[b-p0][p1-b]; - int *row_satd_intra = frames[b]->i_row_satds[0][0]; /* For each list, check to see whether we have lowres motion-searched this reference frame before. */ - do_search[0] = b != p0 && frames[b]->lowres_mvs[0][b-p0-1][0][0] == 0x7FFF; - do_search[1] = b != p1 && frames[b]->lowres_mvs[1][p1-b-1][0][0] == 0x7FFF; + do_search[0] = b != p0 && fenc->lowres_mvs[0][b-p0-1][0][0] == 0x7FFF; + do_search[1] = b != p1 && fenc->lowres_mvs[1][p1-b-1][0][0] == 0x7FFF; if( do_search[0] ) { if( h->param.analyse.i_weighted_pred && b == p1 ) { x264_emms(); - x264_weights_analyse( h, frames[b], frames[p0], 1 ); - w = frames[b]->weight[0]; + x264_weights_analyse( h, fenc, frames[p0], 1 ); + w = fenc->weight[0]; } - frames[b]->lowres_mvs[0][b-p0-1][0][0] = 0; + fenc->lowres_mvs[0][b-p0-1][0][0] = 0; } - if( do_search[1] ) frames[b]->lowres_mvs[1][p1-b-1][0][0] = 0; + if( do_search[1] ) fenc->lowres_mvs[1][p1-b-1][0][0] = 0; - if( b == p1 ) - frames[b]->i_intra_mbs[b-p0] = 0; - if( !frames[b]->b_intra_calculated ) - { - frames[b]->i_cost_est[0][0] = 0; - frames[b]->i_cost_est_aq[0][0] = 0; - } if( p1 != p0 ) dist_scale_factor = ( ((b-p0) << 8) + ((p1-p0) >> 1) ) / (p1-p0); - frames[b]->i_cost_est[b-p0][p1-b] = 0; - frames[b]->i_cost_est_aq[b-p0][p1-b] = 0; - - /* Lowres lookahead goes backwards because the MVs are used as predictors in the main encode. - * This considerably improves MV prediction overall. */ + int output_buf_size = h->mb.i_mb_height + (NUM_INTS + PAD_SIZE) * h->param.i_lookahead_threads; + int *output_inter[X264_LOOKAHEAD_THREAD_MAX+1]; + int *output_intra[X264_LOOKAHEAD_THREAD_MAX+1]; + output_inter[0] = h->scratch_buffer2; + output_intra[0] = output_inter[0] + output_buf_size; - /* The edge mbs seem to reduce the predictive quality of the - * whole frame's score, but are needed for a spatial distribution. */ - if( h->param.rc.b_mb_tree || h->param.rc.i_vbv_buffer_size || - h->mb.i_mb_width <= 2 || h->mb.i_mb_height <= 2 ) +#if HAVE_OPENCL + if( h->param.b_opencl ) { - for( h->mb.i_mb_y = h->mb.i_mb_height - 1; h->mb.i_mb_y >= 0; h->mb.i_mb_y-- ) + x264_opencl_lowres_init(h, fenc, a->i_lambda ); + if( do_search[0] ) + { + x264_opencl_lowres_init( h, frames[p0], a->i_lambda ); + x264_opencl_motionsearch( h, frames, b, p0, 0, a->i_lambda, w ); + } + if( do_search[1] ) { - row_satd[h->mb.i_mb_y] = 0; - if( !frames[b]->b_intra_calculated ) - row_satd_intra[h->mb.i_mb_y] = 0; - for( h->mb.i_mb_x = h->mb.i_mb_width - 1; h->mb.i_mb_x >= 0; h->mb.i_mb_x-- ) - x264_slicetype_mb_cost( h, a, frames, p0, p1, b, dist_scale_factor, do_search, w ); + x264_opencl_lowres_init( h, frames[p1], a->i_lambda ); + x264_opencl_motionsearch( h, frames, b, p1, 1, a->i_lambda, NULL ); } + if( b != p0 ) + x264_opencl_finalize_cost( h, a->i_lambda, frames, p0, p1, b, dist_scale_factor ); + x264_opencl_flush( h ); + + i_score = fenc->i_cost_est[b-p0][p1-b]; } else +#endif { - for( h->mb.i_mb_y = h->mb.i_mb_height - 2; h->mb.i_mb_y >= 1; h->mb.i_mb_y-- ) - for( h->mb.i_mb_x = h->mb.i_mb_width - 2; h->mb.i_mb_x >= 1; h->mb.i_mb_x-- ) - x264_slicetype_mb_cost( h, a, frames, p0, p1, b, dist_scale_factor, do_search, w ); - } + if( h->param.i_lookahead_threads > 1 ) + { + x264_slicetype_slice_t s[X264_LOOKAHEAD_THREAD_MAX]; - i_score = frames[b]->i_cost_est[b-p0][p1-b]; - if( b != p1 ) - i_score = (uint64_t)i_score * 100 / (120 + h->param.i_bframe_bias); - else - frames[b]->b_intra_calculated = 1; + for( int i = 0; i < h->param.i_lookahead_threads; i++ ) + { + x264_t *t = h->lookahead_thread[i]; - frames[b]->i_cost_est[b-p0][p1-b] = i_score; - x264_emms(); - } + /* FIXME move this somewhere else */ + t->mb.i_me_method = h->mb.i_me_method; + t->mb.i_subpel_refine = h->mb.i_subpel_refine; + t->mb.b_chroma_me = h->mb.b_chroma_me; - if( b_intra_penalty ) - { - // arbitrary penalty for I-blocks after B-frames - int nmb = NUM_MBS; - i_score += i_score * frames[b]->i_intra_mbs[b-p0] / (nmb * 8); + s[i] = (x264_slicetype_slice_t){ t, a, frames, p0, p1, b, dist_scale_factor, do_search, w, + output_inter[i], output_intra[i] }; + + t->i_threadslice_start = ((h->mb.i_mb_height * i + h->param.i_lookahead_threads/2) / h->param.i_lookahead_threads); + t->i_threadslice_end = ((h->mb.i_mb_height * (i+1) + h->param.i_lookahead_threads/2) / h->param.i_lookahead_threads); + + int thread_height = t->i_threadslice_end - t->i_threadslice_start; + int thread_output_size = thread_height + NUM_INTS; + memset( output_inter[i], 0, thread_output_size * sizeof(int) ); + memset( output_intra[i], 0, thread_output_size * sizeof(int) ); + output_inter[i][NUM_ROWS] = output_intra[i][NUM_ROWS] = thread_height; + + output_inter[i+1] = output_inter[i] + thread_output_size + PAD_SIZE; + output_intra[i+1] = output_intra[i] + thread_output_size + PAD_SIZE; + + x264_threadpool_run( h->lookaheadpool, (void*)x264_slicetype_slice_cost, &s[i] ); + } + for( int i = 0; i < h->param.i_lookahead_threads; i++ ) + x264_threadpool_wait( h->lookaheadpool, &s[i] ); + } + else + { + h->i_threadslice_start = 0; + h->i_threadslice_end = h->mb.i_mb_height; + memset( output_inter[0], 0, (output_buf_size - PAD_SIZE) * sizeof(int) ); + memset( output_intra[0], 0, (output_buf_size - PAD_SIZE) * sizeof(int) ); + output_inter[0][NUM_ROWS] = output_intra[0][NUM_ROWS] = h->mb.i_mb_height; + x264_slicetype_slice_t s = (x264_slicetype_slice_t){ h, a, frames, p0, p1, b, dist_scale_factor, do_search, w, + output_inter[0], output_intra[0] }; + x264_slicetype_slice_cost( &s ); + } + + /* Sum up accumulators */ + if( b == p1 ) + fenc->i_intra_mbs[b-p0] = 0; + if( !fenc->b_intra_calculated ) + { + fenc->i_cost_est[0][0] = 0; + fenc->i_cost_est_aq[0][0] = 0; + } + fenc->i_cost_est[b-p0][p1-b] = 0; + fenc->i_cost_est_aq[b-p0][p1-b] = 0; + + int *row_satd_inter = fenc->i_row_satds[b-p0][p1-b]; + int *row_satd_intra = fenc->i_row_satds[0][0]; + for( int i = 0; i < h->param.i_lookahead_threads; i++ ) + { + if( b == p1 ) + fenc->i_intra_mbs[b-p0] += output_inter[i][INTRA_MBS]; + if( !fenc->b_intra_calculated ) + { + fenc->i_cost_est[0][0] += output_intra[i][COST_EST]; + fenc->i_cost_est_aq[0][0] += output_intra[i][COST_EST_AQ]; + } + + fenc->i_cost_est[b-p0][p1-b] += output_inter[i][COST_EST]; + fenc->i_cost_est_aq[b-p0][p1-b] += output_inter[i][COST_EST_AQ]; + + if( h->param.rc.i_vbv_buffer_size ) + { + int row_count = output_inter[i][NUM_ROWS]; + memcpy( row_satd_inter, output_inter[i] + NUM_INTS, row_count * sizeof(int) ); + if( !fenc->b_intra_calculated ) + memcpy( row_satd_intra, output_intra[i] + NUM_INTS, row_count * sizeof(int) ); + row_satd_inter += row_count; + row_satd_intra += row_count; + } + } + + i_score = fenc->i_cost_est[b-p0][p1-b]; + if( b != p1 ) + i_score = (uint64_t)i_score * 100 / (120 + h->param.i_bframe_bias); + else + fenc->b_intra_calculated = 1; + + fenc->i_cost_est[b-p0][p1-b] = i_score; + x264_emms(); + } } + return i_score; } @@ -742,9 +1019,12 @@ static int x264_slicetype_frame_cost_recalculate( x264_t *h, x264_frame_t **fram return i_score; } -static void x264_macroblock_tree_finish( x264_t *h, x264_frame_t *frame, int ref0_distance ) +/* Trade off precision in mbtree for increased range */ +#define MBTREE_PRECISION 0.5f + +static void x264_macroblock_tree_finish( x264_t *h, x264_frame_t *frame, float average_duration, int ref0_distance ) { - x264_emms(); + int fps_factor = round( CLIP_DURATION(average_duration) / CLIP_DURATION(frame->f_duration) * 256 / MBTREE_PRECISION ); float weightdelta = 0.0; if( ref0_distance && frame->f_weighted_cost_delta[ref0_distance-1] > 0 ) weightdelta = (1.0 - frame->f_weighted_cost_delta[ref0_distance-1]); @@ -754,25 +1034,29 @@ static void x264_macroblock_tree_finish( x264_t *h, x264_frame_t *frame, int ref float strength = 5.0f * (1.0f - h->param.rc.f_qcompress); for( int mb_index = 0; mb_index < h->mb.i_mb_count; mb_index++ ) { - int intra_cost = (frame->i_intra_cost[mb_index] * frame->i_inv_qscale_factor[mb_index]+128)>>8; + int intra_cost = (frame->i_intra_cost[mb_index] * frame->i_inv_qscale_factor[mb_index] + 128) >> 8; if( intra_cost ) { - int propagate_cost = frame->i_propagate_cost[mb_index]; + int propagate_cost = (frame->i_propagate_cost[mb_index] * fps_factor + 128) >> 8; float log2_ratio = x264_log2(intra_cost + propagate_cost) - x264_log2(intra_cost) + weightdelta; frame->f_qp_offset[mb_index] = frame->f_qp_offset_aq[mb_index] - strength * log2_ratio; } } } -static void x264_macroblock_tree_propagate( x264_t *h, x264_frame_t **frames, int p0, int p1, int b, int referenced ) +static void x264_macroblock_tree_propagate( x264_t *h, x264_frame_t **frames, float average_duration, int p0, int p1, int b, int referenced ) { uint16_t *ref_costs[2] = {frames[p0]->i_propagate_cost,frames[p1]->i_propagate_cost}; int dist_scale_factor = ( ((b-p0) << 8) + ((p1-p0) >> 1) ) / (p1-p0); int i_bipred_weight = h->param.analyse.b_weighted_bipred ? 64 - (dist_scale_factor>>2) : 32; int16_t (*mvs[2])[2] = { frames[b]->lowres_mvs[0][b-p0-1], frames[b]->lowres_mvs[1][p1-b-1] }; int bipred_weights[2] = {i_bipred_weight, 64 - i_bipred_weight}; - int *buf = h->scratch_buffer; + int16_t *buf = h->scratch_buffer; uint16_t *propagate_cost = frames[b]->i_propagate_cost; + uint16_t *lowres_costs = frames[b]->lowres_costs[b-p0][p1-b]; + + x264_emms(); + float fps_factor = CLIP_DURATION(frames[b]->f_duration) / (CLIP_DURATION(average_duration) * 256.0f) * MBTREE_PRECISION; /* For non-reffed frames the source costs are always zero, so just memset one row and re-use it. */ if( !referenced ) @@ -782,77 +1066,22 @@ static void x264_macroblock_tree_propagate( x264_t *h, x264_frame_t **frames, in { int mb_index = h->mb.i_mb_y*h->mb.i_mb_stride; h->mc.mbtree_propagate_cost( buf, propagate_cost, - frames[b]->i_intra_cost+mb_index, frames[b]->lowres_costs[b-p0][p1-b]+mb_index, - frames[b]->i_inv_qscale_factor+mb_index, h->mb.i_mb_width ); + frames[b]->i_intra_cost+mb_index, lowres_costs+mb_index, + frames[b]->i_inv_qscale_factor+mb_index, &fps_factor, h->mb.i_mb_width ); if( referenced ) propagate_cost += h->mb.i_mb_width; - for( h->mb.i_mb_x = 0; h->mb.i_mb_x < h->mb.i_mb_width; h->mb.i_mb_x++, mb_index++ ) + + h->mc.mbtree_propagate_list( h, ref_costs[0], &mvs[0][mb_index], buf, &lowres_costs[mb_index], + bipred_weights[0], h->mb.i_mb_y, h->mb.i_mb_width, 0 ); + if( b != p1 ) { - int propagate_amount = buf[h->mb.i_mb_x]; - /* Don't propagate for an intra block. */ - if( propagate_amount > 0 ) - { - /* Access width-2 bitfield. */ - int lists_used = frames[b]->lowres_costs[b-p0][p1-b][mb_index] >> LOWRES_COST_SHIFT; - /* Follow the MVs to the previous frame(s). */ - for( int list = 0; list < 2; list++ ) - if( (lists_used >> list)&1 ) - { -#define CLIP_ADD(s,x) (s) = X264_MIN((s)+(x),(1<<16)-1) - int listamount = propagate_amount; - /* Apply bipred weighting. */ - if( lists_used == 3 ) - listamount = (listamount * bipred_weights[list] + 32) >> 6; - - /* Early termination for simple case of mv0. */ - if( !M32( mvs[list][mb_index] ) ) - { - CLIP_ADD( ref_costs[list][mb_index], listamount ); - continue; - } - - int x = mvs[list][mb_index][0]; - int y = mvs[list][mb_index][1]; - int mbx = (x>>5)+h->mb.i_mb_x; - int mby = (y>>5)+h->mb.i_mb_y; - int idx0 = mbx + mby * h->mb.i_mb_stride; - int idx1 = idx0 + 1; - int idx2 = idx0 + h->mb.i_mb_stride; - int idx3 = idx0 + h->mb.i_mb_stride + 1; - x &= 31; - y &= 31; - int idx0weight = (32-y)*(32-x); - int idx1weight = (32-y)*x; - int idx2weight = y*(32-x); - int idx3weight = y*x; - - /* We could just clip the MVs, but pixels that lie outside the frame probably shouldn't - * be counted. */ - if( mbx < h->mb.i_mb_width-1 && mby < h->mb.i_mb_height-1 && mbx >= 0 && mby >= 0 ) - { - CLIP_ADD( ref_costs[list][idx0], (listamount*idx0weight+512)>>10 ); - CLIP_ADD( ref_costs[list][idx1], (listamount*idx1weight+512)>>10 ); - CLIP_ADD( ref_costs[list][idx2], (listamount*idx2weight+512)>>10 ); - CLIP_ADD( ref_costs[list][idx3], (listamount*idx3weight+512)>>10 ); - } - else /* Check offsets individually */ - { - if( mbx < h->mb.i_mb_width && mby < h->mb.i_mb_height && mbx >= 0 && mby >= 0 ) - CLIP_ADD( ref_costs[list][idx0], (listamount*idx0weight+512)>>10 ); - if( mbx+1 < h->mb.i_mb_width && mby < h->mb.i_mb_height && mbx+1 >= 0 && mby >= 0 ) - CLIP_ADD( ref_costs[list][idx1], (listamount*idx1weight+512)>>10 ); - if( mbx < h->mb.i_mb_width && mby+1 < h->mb.i_mb_height && mbx >= 0 && mby+1 >= 0 ) - CLIP_ADD( ref_costs[list][idx2], (listamount*idx2weight+512)>>10 ); - if( mbx+1 < h->mb.i_mb_width && mby+1 < h->mb.i_mb_height && mbx+1 >= 0 && mby+1 >= 0 ) - CLIP_ADD( ref_costs[list][idx3], (listamount*idx3weight+512)>>10 ); - } - } - } + h->mc.mbtree_propagate_list( h, ref_costs[1], &mvs[1][mb_index], buf, &lowres_costs[mb_index], + bipred_weights[1], h->mb.i_mb_y, h->mb.i_mb_width, 1 ); } } if( h->param.rc.i_vbv_buffer_size && h->param.rc.i_lookahead && referenced ) - x264_macroblock_tree_finish( h, frames[b], b == p1 ? b - p0 : 0 ); + x264_macroblock_tree_finish( h, frames[b], average_duration, b == p1 ? b - p0 : 0 ); } static void x264_macroblock_tree( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int num_frames, int b_intra ) @@ -860,12 +1089,19 @@ static void x264_macroblock_tree( x264_t *h, x264_mb_analysis_t *a, x264_frame_t int idx = !b_intra; int last_nonb, cur_nonb = 1; int bframes = 0; + + x264_emms(); + float total_duration = 0.0; + for( int j = 0; j <= num_frames; j++ ) + total_duration += frames[j]->f_duration; + float average_duration = total_duration / (num_frames + 1); + int i = num_frames; if( b_intra ) - x264_slicetype_frame_cost( h, a, frames, 0, 0, 0, 0 ); + x264_slicetype_frame_cost( h, a, frames, 0, 0, 0 ); - while( i > 0 && frames[i]->i_type == X264_TYPE_B ) + while( i > 0 && IS_X264_TYPE_B( frames[i]->i_type ) ) i--; last_nonb = i; @@ -893,17 +1129,17 @@ static void x264_macroblock_tree( x264_t *h, x264_mb_analysis_t *a, x264_frame_t while( i-- > idx ) { cur_nonb = i; - while( frames[cur_nonb]->i_type == X264_TYPE_B && cur_nonb > 0 ) + while( IS_X264_TYPE_B( frames[cur_nonb]->i_type ) && cur_nonb > 0 ) cur_nonb--; if( cur_nonb < idx ) break; - x264_slicetype_frame_cost( h, a, frames, cur_nonb, last_nonb, last_nonb, 0 ); + x264_slicetype_frame_cost( h, a, frames, cur_nonb, last_nonb, last_nonb ); memset( frames[cur_nonb]->i_propagate_cost, 0, h->mb.i_mb_count * sizeof(uint16_t) ); bframes = last_nonb - cur_nonb - 1; if( h->param.i_bframe_pyramid && bframes > 1 ) { int middle = (bframes + 1)/2 + cur_nonb; - x264_slicetype_frame_cost( h, a, frames, cur_nonb, last_nonb, middle, 0 ); + x264_slicetype_frame_cost( h, a, frames, cur_nonb, last_nonb, middle ); memset( frames[middle]->i_propagate_cost, 0, h->mb.i_mb_count * sizeof(uint16_t) ); while( i > cur_nonb ) { @@ -911,40 +1147,41 @@ static void x264_macroblock_tree( x264_t *h, x264_mb_analysis_t *a, x264_frame_t int p1 = i < middle ? middle : last_nonb; if( i != middle ) { - x264_slicetype_frame_cost( h, a, frames, p0, p1, i, 0 ); - x264_macroblock_tree_propagate( h, frames, p0, p1, i, 0 ); + x264_slicetype_frame_cost( h, a, frames, p0, p1, i ); + x264_macroblock_tree_propagate( h, frames, average_duration, p0, p1, i, 0 ); } i--; } - x264_macroblock_tree_propagate( h, frames, cur_nonb, last_nonb, middle, 1 ); + x264_macroblock_tree_propagate( h, frames, average_duration, cur_nonb, last_nonb, middle, 1 ); } else { while( i > cur_nonb ) { - x264_slicetype_frame_cost( h, a, frames, cur_nonb, last_nonb, i, 0 ); - x264_macroblock_tree_propagate( h, frames, cur_nonb, last_nonb, i, 0 ); + x264_slicetype_frame_cost( h, a, frames, cur_nonb, last_nonb, i ); + x264_macroblock_tree_propagate( h, frames, average_duration, cur_nonb, last_nonb, i, 0 ); i--; } } - x264_macroblock_tree_propagate( h, frames, cur_nonb, last_nonb, last_nonb, 1 ); + x264_macroblock_tree_propagate( h, frames, average_duration, cur_nonb, last_nonb, last_nonb, 1 ); last_nonb = cur_nonb; } if( !h->param.rc.i_lookahead ) { - x264_macroblock_tree_propagate( h, frames, 0, last_nonb, last_nonb, 1 ); + x264_slicetype_frame_cost( h, a, frames, 0, last_nonb, last_nonb ); + x264_macroblock_tree_propagate( h, frames, average_duration, 0, last_nonb, last_nonb, 1 ); XCHG( uint16_t*, frames[last_nonb]->i_propagate_cost, frames[0]->i_propagate_cost ); } - x264_macroblock_tree_finish( h, frames[last_nonb], last_nonb ); + x264_macroblock_tree_finish( h, frames[last_nonb], average_duration, last_nonb ); if( h->param.i_bframe_pyramid && bframes > 1 && !h->param.rc.i_vbv_buffer_size ) - x264_macroblock_tree_finish( h, frames[last_nonb+(bframes+1)/2], 0 ); + x264_macroblock_tree_finish( h, frames[last_nonb+(bframes+1)/2], average_duration, 0 ); } static int x264_vbv_frame_cost( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int p0, int p1, int b ) { - int cost = x264_slicetype_frame_cost( h, a, frames, p0, p1, b, 0 ); + int cost = x264_slicetype_frame_cost( h, a, frames, p0, p1, b ); if( h->param.rc.i_aq_mode ) { if( h->param.rc.b_mb_tree ) @@ -972,7 +1209,8 @@ static void x264_calculate_durations( x264_t *h, x264_frame_t *cur_frame, x264_f prev_frame->i_cpb_duration += cur_frame->i_dpb_output_delay; } - if( cur_frame->b_keyframe ) + // don't reset cpb delay for IDR frames when using intra-refresh + if( cur_frame->b_keyframe && !h->param.b_intra_refresh ) *i_cpb_delay = 0; *i_cpb_delay += cur_frame->i_duration; @@ -985,7 +1223,7 @@ static void x264_vbv_lookahead( x264_t *h, x264_mb_analysis_t *a, x264_frame_t * int last_nonb = 0, cur_nonb = 1, idx = 0; x264_frame_t *prev_frame = NULL; int prev_frame_idx = 0; - while( cur_nonb < num_frames && frames[cur_nonb]->i_type == X264_TYPE_B ) + while( cur_nonb < num_frames && IS_X264_TYPE_B( frames[cur_nonb]->i_type ) ) cur_nonb++; int next_nonb = keyframe ? last_nonb : cur_nonb; @@ -1037,7 +1275,7 @@ static void x264_vbv_lookahead( x264_t *h, x264_mb_analysis_t *a, x264_frame_t * } last_nonb = cur_nonb; cur_nonb++; - while( cur_nonb <= num_frames && frames[cur_nonb]->i_type == X264_TYPE_B ) + while( cur_nonb <= num_frames && IS_X264_TYPE_B( frames[cur_nonb]->i_type ) ) cur_nonb++; } frames[next_nonb]->i_planned_type[idx] = X264_TYPE_AUTO; @@ -1047,36 +1285,39 @@ static int x264_slicetype_path_cost( x264_t *h, x264_mb_analysis_t *a, x264_fram { int loc = 1; int cost = 0; - int cur_p = 0; + int cur_nonb = 0; path--; /* Since the 1st path element is really the second frame */ while( path[loc] ) { - int next_p = loc; - /* Find the location of the next P-frame. */ - while( path[next_p] != 'P' ) - next_p++; - - /* Add the cost of the P-frame found above */ - cost += x264_slicetype_frame_cost( h, a, frames, cur_p, next_p, next_p, 0 ); + int next_nonb = loc; + /* Find the location of the next non-B-frame. */ + while( path[next_nonb] == 'B' ) + next_nonb++; + + /* Add the cost of the non-B-frame found above */ + if( path[next_nonb] == 'P' ) + cost += x264_slicetype_frame_cost( h, a, frames, cur_nonb, next_nonb, next_nonb ); + else /* I-frame */ + cost += x264_slicetype_frame_cost( h, a, frames, next_nonb, next_nonb, next_nonb ); /* Early terminate if the cost we have found is larger than the best path cost so far */ if( cost > threshold ) break; - if( h->param.i_bframe_pyramid && next_p - cur_p > 2 ) + if( h->param.i_bframe_pyramid && next_nonb - cur_nonb > 2 ) { - int middle = cur_p + (next_p - cur_p)/2; - cost += x264_slicetype_frame_cost( h, a, frames, cur_p, next_p, middle, 0 ); + int middle = cur_nonb + (next_nonb - cur_nonb)/2; + cost += x264_slicetype_frame_cost( h, a, frames, cur_nonb, next_nonb, middle ); for( int next_b = loc; next_b < middle && cost < threshold; next_b++ ) - cost += x264_slicetype_frame_cost( h, a, frames, cur_p, middle, next_b, 0 ); - for( int next_b = middle+1; next_b < next_p && cost < threshold; next_b++ ) - cost += x264_slicetype_frame_cost( h, a, frames, middle, next_p, next_b, 0 ); + cost += x264_slicetype_frame_cost( h, a, frames, cur_nonb, middle, next_b ); + for( int next_b = middle+1; next_b < next_nonb && cost < threshold; next_b++ ) + cost += x264_slicetype_frame_cost( h, a, frames, middle, next_nonb, next_b ); } else - for( int next_b = loc; next_b < next_p && cost < threshold; next_b++ ) - cost += x264_slicetype_frame_cost( h, a, frames, cur_p, next_p, next_b, 0 ); + for( int next_b = loc; next_b < next_nonb && cost < threshold; next_b++ ) + cost += x264_slicetype_frame_cost( h, a, frames, cur_nonb, next_nonb, next_b ); - loc = next_p + 1; - cur_p = next_p; + loc = next_nonb + 1; + cur_nonb = next_nonb; } return cost; } @@ -1085,11 +1326,12 @@ static int x264_slicetype_path_cost( x264_t *h, x264_mb_analysis_t *a, x264_fram /* Uses strings due to the fact that the speed of the control functions is negligible compared to the cost of running slicetype_frame_cost, and because it makes debugging easier. */ -static void x264_slicetype_path( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int length, char (*best_paths)[X264_LOOKAHEAD_MAX] ) +static void x264_slicetype_path( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int length, char (*best_paths)[X264_LOOKAHEAD_MAX+1] ) { - char paths[2][X264_LOOKAHEAD_MAX]; + char paths[2][X264_LOOKAHEAD_MAX+1]; int num_paths = X264_MIN( h->param.i_bframe+1, length ); int best_cost = COST_MAX; + int best_possible = 0; int idx = 0; /* Iterate over all currently possible paths */ @@ -1101,12 +1343,33 @@ static void x264_slicetype_path( x264_t *h, x264_mb_analysis_t *a, x264_frame_t memset( paths[idx]+len, 'B', path ); strcpy( paths[idx]+len+path, "P" ); - /* Calculate the actual cost of the current path */ - int cost = x264_slicetype_path_cost( h, a, frames, paths[idx], best_cost ); - if( cost < best_cost ) + int possible = 1; + for( int i = 1; i <= length; i++ ) { - best_cost = cost; - idx ^= 1; + int i_type = frames[i]->i_type; + if( i_type == X264_TYPE_AUTO ) + continue; + if( IS_X264_TYPE_B( i_type ) ) + possible = possible && (i < len || i == length || paths[idx][i-1] == 'B'); + else + { + possible = possible && (i < len || paths[idx][i-1] != 'B'); + paths[idx][i-1] = IS_X264_TYPE_I( i_type ) ? 'I' : 'P'; + } + } + + if( possible || !best_possible ) + { + if( possible && !best_possible ) + best_cost = COST_MAX; + /* Calculate the actual cost of the current path */ + int cost = x264_slicetype_path_cost( h, a, frames, paths[idx], best_cost ); + if( cost < best_cost ) + { + best_cost = cost; + best_possible = possible; + idx ^= 1; + } } } @@ -1114,10 +1377,15 @@ static void x264_slicetype_path( x264_t *h, x264_mb_analysis_t *a, x264_frame_t memcpy( best_paths[length % (X264_BFRAME_MAX+1)], paths[idx^1], length ); } -static int scenecut_internal( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int p0, int p1, int print ) +static int scenecut_internal( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, int p0, int p1, int real_scenecut ) { x264_frame_t *frame = frames[p1]; - x264_slicetype_frame_cost( h, a, frames, p0, p1, p1, 0 ); + + /* Don't do scenecuts on the right view of a frame-packed video. */ + if( real_scenecut && h->param.i_frame_packing == 5 && (frame->i_frame&1) ) + return 0; + + x264_slicetype_frame_cost( h, a, frames, p0, p1, p1 ); int icost = frame->i_cost_est[0][0]; int pcost = frame->i_cost_est[p1-p0][0]; @@ -1143,7 +1411,7 @@ static int scenecut_internal( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **f } res = pcost >= (1.0 - f_bias) * icost; - if( res && print ) + if( res && real_scenecut ) { int imb = frame->i_intra_mbs[p1-p0]; int pmb = NUM_MBS - imb; @@ -1195,26 +1463,34 @@ static int scenecut( x264_t *h, x264_mb_analysis_t *a, x264_frame_t **frames, in return scenecut_internal( h, a, frames, p0, p1, real_scenecut ); } -void x264_slicetype_analyse( x264_t *h, int keyframe ) +#define IS_X264_TYPE_AUTO_OR_I(x) ((x)==X264_TYPE_AUTO || IS_X264_TYPE_I(x)) +#define IS_X264_TYPE_AUTO_OR_B(x) ((x)==X264_TYPE_AUTO || IS_X264_TYPE_B(x)) + +void x264_slicetype_analyse( x264_t *h, int intra_minigop ) { x264_mb_analysis_t a; x264_frame_t *frames[X264_LOOKAHEAD_MAX+3] = { NULL, }; int num_frames, orig_num_frames, keyint_limit, framecnt; - int i_mb_count = NUM_MBS; - int cost1p0, cost2p0, cost1b1, cost2p1; int i_max_search = X264_MIN( h->lookahead->next.i_size, X264_LOOKAHEAD_MAX ); int vbv_lookahead = h->param.rc.i_vbv_buffer_size && h->param.rc.i_lookahead; + /* For determinism we should limit the search to the number of frames lookahead has for sure + * in h->lookahead->next.list buffer, except at the end of stream. + * For normal calls with (intra_minigop == 0) that is h->lookahead->i_slicetype_length + 1 frames. + * And for I-frame calls (intra_minigop != 0) we already removed intra_minigop frames from there. */ if( h->param.b_deterministic ) - i_max_search = X264_MIN( i_max_search, h->lookahead->i_slicetype_length + !keyframe ); + i_max_search = X264_MIN( i_max_search, h->lookahead->i_slicetype_length + 1 - intra_minigop ); + int keyframe = !!intra_minigop; assert( h->frames.b_have_lowres ); if( !h->lookahead->last_nonb ) return; frames[0] = h->lookahead->last_nonb; - for( framecnt = 0; framecnt < i_max_search && h->lookahead->next.list[framecnt]->i_type == X264_TYPE_AUTO; framecnt++ ) + for( framecnt = 0; framecnt < i_max_search; framecnt++ ) frames[framecnt+1] = h->lookahead->next.list[framecnt]; + x264_lowres_context_init( h, &a ); + if( !framecnt ) { if( h->param.rc.b_mb_tree ) @@ -1225,120 +1501,171 @@ void x264_slicetype_analyse( x264_t *h, int keyframe ) keyint_limit = h->param.i_keyint_max - frames[0]->i_frame + h->lookahead->i_last_keyframe - 1; orig_num_frames = num_frames = h->param.b_intra_refresh ? framecnt : X264_MIN( framecnt, keyint_limit ); - x264_lowres_context_init( h, &a ); - /* This is important psy-wise: if we have a non-scenecut keyframe, * there will be significant visual artifacts if the frames just before * go down in quality due to being referenced less, despite it being * more RD-optimal. */ if( (h->param.analyse.b_psy && h->param.rc.b_mb_tree) || vbv_lookahead ) num_frames = framecnt; + else if( h->param.b_open_gop && num_frames < framecnt ) + num_frames++; else if( num_frames == 0 ) { frames[1]->i_type = X264_TYPE_I; return; } - int num_bframes = 0; - int num_analysed_frames = num_frames; - int reset_start; - if( h->param.i_scenecut_threshold && scenecut( h, &a, frames, 0, 1, 1, orig_num_frames, i_max_search ) ) + if( IS_X264_TYPE_AUTO_OR_I( frames[1]->i_type ) && + h->param.i_scenecut_threshold && scenecut( h, &a, frames, 0, 1, 1, orig_num_frames, i_max_search ) ) { - frames[1]->i_type = X264_TYPE_I; + if( frames[1]->i_type == X264_TYPE_AUTO ) + frames[1]->i_type = X264_TYPE_I; return; } +#if HAVE_OPENCL + x264_opencl_slicetype_prep( h, frames, num_frames, a.i_lambda ); +#endif + + /* Replace forced keyframes with I/IDR-frames */ + for( int j = 1; j <= num_frames; j++ ) + { + if( frames[j]->i_type == X264_TYPE_KEYFRAME ) + frames[j]->i_type = h->param.b_open_gop ? X264_TYPE_I : X264_TYPE_IDR; + } + + /* Close GOP at IDR-frames */ + for( int j = 2; j <= num_frames; j++ ) + { + if( frames[j]->i_type == X264_TYPE_IDR && IS_X264_TYPE_AUTO_OR_B( frames[j-1]->i_type ) ) + frames[j-1]->i_type = X264_TYPE_P; + } + + int num_analysed_frames = num_frames; + int reset_start; + if( h->param.i_bframe ) { if( h->param.i_bframe_adaptive == X264_B_ADAPT_TRELLIS ) { if( num_frames > 1 ) { - char best_paths[X264_BFRAME_MAX+1][X264_LOOKAHEAD_MAX] = {"","P"}; - int best_path_index = (num_frames-1) % (X264_BFRAME_MAX+1); + char best_paths[X264_BFRAME_MAX+1][X264_LOOKAHEAD_MAX+1] = {"","P"}; + int best_path_index = num_frames % (X264_BFRAME_MAX+1); /* Perform the frametype analysis. */ - for( int j = 2; j < num_frames; j++ ) + for( int j = 2; j <= num_frames; j++ ) x264_slicetype_path( h, &a, frames, j, best_paths ); - num_bframes = strspn( best_paths[best_path_index], "B" ); /* Load the results of the analysis into the frame types. */ for( int j = 1; j < num_frames; j++ ) - frames[j]->i_type = best_paths[best_path_index][j-1] == 'B' ? X264_TYPE_B : X264_TYPE_P; + { + if( best_paths[best_path_index][j-1] != 'B' ) + { + if( IS_X264_TYPE_AUTO_OR_B( frames[j]->i_type ) ) + frames[j]->i_type = X264_TYPE_P; + } + else + { + if( frames[j]->i_type == X264_TYPE_AUTO ) + frames[j]->i_type = X264_TYPE_B; + } + } } - frames[num_frames]->i_type = X264_TYPE_P; } else if( h->param.i_bframe_adaptive == X264_B_ADAPT_FAST ) { - for( int i = 0; i <= num_frames-2; ) + int last_nonb = 0; + int num_bframes = h->param.i_bframe; + char path[X264_LOOKAHEAD_MAX+1]; + for( int j = 1; j < num_frames; j++ ) { - cost2p1 = x264_slicetype_frame_cost( h, &a, frames, i+0, i+2, i+2, 1 ); - if( frames[i+2]->i_intra_mbs[2] > i_mb_count / 2 ) + if( j-1 > 0 && IS_X264_TYPE_B( frames[j-1]->i_type ) ) + num_bframes--; + else { - frames[i+1]->i_type = X264_TYPE_P; - frames[i+2]->i_type = X264_TYPE_P; - i += 2; + last_nonb = j-1; + num_bframes = h->param.i_bframe; + } + if( !num_bframes ) + { + if( IS_X264_TYPE_AUTO_OR_B( frames[j]->i_type ) ) + frames[j]->i_type = X264_TYPE_P; continue; } - cost1b1 = x264_slicetype_frame_cost( h, &a, frames, i+0, i+2, i+1, 0 ); - cost1p0 = x264_slicetype_frame_cost( h, &a, frames, i+0, i+1, i+1, 0 ); - cost2p0 = x264_slicetype_frame_cost( h, &a, frames, i+1, i+2, i+2, 0 ); + if( frames[j]->i_type != X264_TYPE_AUTO ) + continue; - if( cost1p0 + cost2p0 < cost1b1 + cost2p1 ) + if( IS_X264_TYPE_B( frames[j+1]->i_type ) ) { - frames[i+1]->i_type = X264_TYPE_P; - i += 1; + frames[j]->i_type = X264_TYPE_P; continue; } - // arbitrary and untuned - #define INTER_THRESH 300 - #define P_SENS_BIAS (50 - h->param.i_bframe_bias) - frames[i+1]->i_type = X264_TYPE_B; + int bframes = j - last_nonb - 1; + memset( path, 'B', bframes ); + strcpy( path+bframes, "PP" ); + int cost_p = x264_slicetype_path_cost( h, &a, frames+last_nonb, path, COST_MAX ); + strcpy( path+bframes, "BP" ); + int cost_b = x264_slicetype_path_cost( h, &a, frames+last_nonb, path, cost_p ); - int j; - for( j = i+2; j <= X264_MIN( i+h->param.i_bframe, num_frames-1 ); j++ ) - { - int pthresh = X264_MAX(INTER_THRESH - P_SENS_BIAS * (j-i-1), INTER_THRESH/10); - int pcost = x264_slicetype_frame_cost( h, &a, frames, i+0, j+1, j+1, 1 ); - if( pcost > pthresh*i_mb_count || frames[j+1]->i_intra_mbs[j-i+1] > i_mb_count/3 ) - break; + if( cost_b < cost_p ) frames[j]->i_type = X264_TYPE_B; - } - frames[j]->i_type = X264_TYPE_P; - i = j; + else + frames[j]->i_type = X264_TYPE_P; } - frames[num_frames]->i_type = X264_TYPE_P; - num_bframes = 0; - while( num_bframes < num_frames && frames[num_bframes+1]->i_type == X264_TYPE_B ) - num_bframes++; } else { - num_bframes = X264_MIN(num_frames-1, h->param.i_bframe); + int num_bframes = h->param.i_bframe; for( int j = 1; j < num_frames; j++ ) - frames[j]->i_type = (j%(num_bframes+1)) ? X264_TYPE_B : X264_TYPE_P; - frames[num_frames]->i_type = X264_TYPE_P; + { + if( !num_bframes ) + { + if( IS_X264_TYPE_AUTO_OR_B( frames[j]->i_type ) ) + frames[j]->i_type = X264_TYPE_P; + } + else if( frames[j]->i_type == X264_TYPE_AUTO ) + { + if( IS_X264_TYPE_B( frames[j+1]->i_type ) ) + frames[j]->i_type = X264_TYPE_P; + else + frames[j]->i_type = X264_TYPE_B; + } + if( IS_X264_TYPE_B( frames[j]->i_type ) ) + num_bframes--; + else + num_bframes = h->param.i_bframe; + } } + if( IS_X264_TYPE_AUTO_OR_B( frames[num_frames]->i_type ) ) + frames[num_frames]->i_type = X264_TYPE_P; + + int num_bframes = 0; + while( num_bframes < num_frames && IS_X264_TYPE_B( frames[num_bframes+1]->i_type ) ) + num_bframes++; /* Check scenecut on the first minigop. */ for( int j = 1; j < num_bframes+1; j++ ) - if( h->param.i_scenecut_threshold && scenecut( h, &a, frames, j, j+1, 0, orig_num_frames, i_max_search ) ) + { + if( frames[j]->i_forced_type == X264_TYPE_AUTO && IS_X264_TYPE_AUTO_OR_I( frames[j+1]->i_forced_type ) && + h->param.i_scenecut_threshold && scenecut( h, &a, frames, j, j+1, 0, orig_num_frames, i_max_search ) ) { frames[j]->i_type = X264_TYPE_P; num_analysed_frames = j; break; } + } reset_start = keyframe ? 1 : X264_MIN( num_bframes+2, num_analysed_frames+1 ); } else { for( int j = 1; j <= num_frames; j++ ) - frames[j]->i_type = X264_TYPE_P; + if( IS_X264_TYPE_AUTO_OR_B( frames[j]->i_type ) ) + frames[j]->i_type = X264_TYPE_P; reset_start = !keyframe + 1; - num_bframes = 0; } /* Perform the actual macroblock tree analysis. @@ -1348,21 +1675,67 @@ void x264_slicetype_analyse( x264_t *h, int keyframe ) /* Enforce keyframe limit. */ if( !h->param.b_intra_refresh ) - for( int i = keyint_limit+1; i <= num_frames; i += h->param.i_keyint_max ) + { + int last_keyframe = h->lookahead->i_last_keyframe; + int last_possible = 0; + for( int j = 1; j <= num_frames; j++ ) { - frames[i]->i_type = X264_TYPE_I; - reset_start = X264_MIN( reset_start, i+1 ); - if( h->param.i_open_gop == X264_OPEN_GOP_BLURAY ) - while( IS_X264_TYPE_B( frames[i-1]->i_type ) ) - i--; + x264_frame_t *frm = frames[j]; + int keyframe_dist = frm->i_frame - last_keyframe; + + if( IS_X264_TYPE_AUTO_OR_I( frm->i_forced_type ) ) + { + if( h->param.b_open_gop || !IS_X264_TYPE_B( frames[j-1]->i_forced_type ) ) + last_possible = j; + } + if( keyframe_dist >= h->param.i_keyint_max ) + { + if( last_possible != 0 && last_possible != j ) + { + j = last_possible; + frm = frames[j]; + keyframe_dist = frm->i_frame - last_keyframe; + } + last_possible = 0; + if( frm->i_type != X264_TYPE_IDR ) + frm->i_type = h->param.b_open_gop ? X264_TYPE_I : X264_TYPE_IDR; + } + if( frm->i_type == X264_TYPE_I && keyframe_dist >= h->param.i_keyint_min ) + { + if( h->param.b_open_gop ) + { + last_keyframe = frm->i_frame; + if( h->param.b_bluray_compat ) + { + // Use bluray order + int bframes = 0; + while( bframes < j-1 && IS_X264_TYPE_B( frames[j-1-bframes]->i_type ) ) + bframes++; + last_keyframe -= bframes; + } + } + else if( frm->i_forced_type != X264_TYPE_I ) + frm->i_type = X264_TYPE_IDR; + } + if( frm->i_type == X264_TYPE_IDR ) + { + last_keyframe = frm->i_frame; + if( j > 1 && IS_X264_TYPE_B( frames[j-1]->i_type ) ) + frames[j-1]->i_type = X264_TYPE_P; + } } + } if( vbv_lookahead ) x264_vbv_lookahead( h, &a, frames, num_frames, keyframe ); /* Restore frametypes for all frames that haven't actually been decided yet. */ for( int j = reset_start; j <= num_frames; j++ ) - frames[j]->i_type = X264_TYPE_AUTO; + frames[j]->i_type = frames[j]->i_forced_type; + +#if HAVE_OPENCL + x264_opencl_slicetype_end( h ); +#endif } void x264_slicetype_decide( x264_t *h ) @@ -1422,6 +1795,14 @@ void x264_slicetype_decide( x264_t *h ) for( bframes = 0, brefs = 0;; bframes++ ) { frm = h->lookahead->next.list[bframes]; + + if( frm->i_forced_type != X264_TYPE_AUTO && frm->i_type != frm->i_forced_type && + !(frm->i_forced_type == X264_TYPE_KEYFRAME && IS_X264_TYPE_I( frm->i_type )) ) + { + x264_log( h, X264_LOG_WARNING, "forced frame type (%d) at %d was changed to frame type (%d)\n", + frm->i_forced_type, frm->i_frame, frm->i_type ); + } + if( frm->i_type == X264_TYPE_BREF && h->param.i_bframe_pyramid < X264_B_PYRAMID_NORMAL && brefs == h->param.i_bframe_pyramid ) { @@ -1440,25 +1821,28 @@ void x264_slicetype_decide( x264_t *h ) } if( frm->i_type == X264_TYPE_KEYFRAME ) - frm->i_type = h->param.i_open_gop ? X264_TYPE_I : X264_TYPE_IDR; + frm->i_type = h->param.b_open_gop ? X264_TYPE_I : X264_TYPE_IDR; /* Limit GOP size */ if( (!h->param.b_intra_refresh || frm->i_frame == 0) && frm->i_frame - h->lookahead->i_last_keyframe >= h->param.i_keyint_max ) { if( frm->i_type == X264_TYPE_AUTO || frm->i_type == X264_TYPE_I ) - frm->i_type = h->param.i_open_gop && h->lookahead->i_last_keyframe >= 0 ? X264_TYPE_I : X264_TYPE_IDR; + frm->i_type = h->param.b_open_gop && h->lookahead->i_last_keyframe >= 0 ? X264_TYPE_I : X264_TYPE_IDR; int warn = frm->i_type != X264_TYPE_IDR; - if( warn && h->param.i_open_gop ) + if( warn && h->param.b_open_gop ) warn &= frm->i_type != X264_TYPE_I; if( warn ) + { x264_log( h, X264_LOG_WARNING, "specified frame type (%d) at %d is not compatible with keyframe interval\n", frm->i_type, frm->i_frame ); + frm->i_type = h->param.b_open_gop && h->lookahead->i_last_keyframe >= 0 ? X264_TYPE_I : X264_TYPE_IDR; + } } if( frm->i_type == X264_TYPE_I && frm->i_frame - h->lookahead->i_last_keyframe >= h->param.i_keyint_min ) { - if( h->param.i_open_gop ) + if( h->param.b_open_gop ) { h->lookahead->i_last_keyframe = frm->i_frame; // Use display order - if( h->param.i_open_gop == X264_OPEN_GOP_BLURAY ) + if( h->param.b_bluray_compat ) h->lookahead->i_last_keyframe -= bframes; // Use bluray order frm->b_keyframe = 1; } @@ -1503,7 +1887,7 @@ void x264_slicetype_decide( x264_t *h ) /* insert a bref into the sequence */ if( h->param.i_bframe_pyramid && bframes > 1 && !brefs ) { - h->lookahead->next.list[bframes/2]->i_type = X264_TYPE_BREF; + h->lookahead->next.list[(bframes-1)/2]->i_type = X264_TYPE_BREF; brefs++; } @@ -1523,12 +1907,12 @@ void x264_slicetype_decide( x264_t *h ) else // P p0 = 0; - x264_slicetype_frame_cost( h, &a, frames, p0, p1, b, 0 ); + x264_slicetype_frame_cost( h, &a, frames, p0, p1, b ); if( (p0 != p1 || bframes) && h->param.rc.i_vbv_buffer_size ) { /* We need the intra costs for row SATDs. */ - x264_slicetype_frame_cost( h, &a, frames, b, b, b, 0 ); + x264_slicetype_frame_cost( h, &a, frames, b, b, b ); /* We need B-frame costs for row SATDs. */ p0 = 0; @@ -1539,7 +1923,7 @@ void x264_slicetype_decide( x264_t *h ) p1++; else p1 = bframes + 1; - x264_slicetype_frame_cost( h, &a, frames, p0, p1, b, 0 ); + x264_slicetype_frame_cost( h, &a, frames, p0, p1, b ); if( frames[b]->i_type == X264_TYPE_BREF ) p0 = b; } @@ -1577,14 +1961,11 @@ void x264_slicetype_decide( x264_t *h ) if( i ) { x264_calculate_durations( h, h->lookahead->next.list[i], h->lookahead->next.list[i-1], &h->i_cpb_delay, &h->i_coded_fields ); - h->lookahead->next.list[0]->f_planned_cpb_duration[i-1] = (double)h->lookahead->next.list[i-1]->i_cpb_duration * + h->lookahead->next.list[0]->f_planned_cpb_duration[i-1] = (double)h->lookahead->next.list[i]->i_cpb_duration * h->sps->vui.i_num_units_in_tick / h->sps->vui.i_time_scale; } else x264_calculate_durations( h, h->lookahead->next.list[i], NULL, &h->i_cpb_delay, &h->i_coded_fields ); - - h->lookahead->next.list[0]->f_planned_cpb_duration[i] = (double)h->lookahead->next.list[i]->i_cpb_duration * - h->sps->vui.i_num_units_in_tick / h->sps->vui.i_time_scale; } } @@ -1600,8 +1981,8 @@ int x264_rc_analyse_slice( x264_t *h ) p1 = b = h->fenc->i_bframes + 1; else //B { - p1 = (h->fref1[0]->i_poc - h->fref0[0]->i_poc)/2; - b = (h->fenc->i_poc - h->fref0[0]->i_poc)/2; + p1 = (h->fref_nearest[1]->i_poc - h->fref_nearest[0]->i_poc)/2; + b = (h->fenc->i_poc - h->fref_nearest[0]->i_poc)/2; } /* We don't need to assign p0/p1 since we are not performing any real analysis here. */ x264_frame_t **frames = &h->fenc - b; @@ -1632,7 +2013,7 @@ int x264_rc_analyse_slice( x264_t *h ) int ip_factor = 256 * h->param.rc.f_ip_factor; /* fix8 */ for( int y = 0; y < h->mb.i_mb_height; y++ ) { - int mb_xy = y * h->mb.i_mb_stride; + int mb_xy = y * h->mb.i_mb_stride + h->fdec->i_pir_start_col; for( int x = h->fdec->i_pir_start_col; x <= h->fdec->i_pir_end_col; x++, mb_xy++ ) { int intra_cost = (h->fenc->i_intra_cost[mb_xy] * ip_factor + 128) >> 8; @@ -1647,9 +2028,5 @@ int x264_rc_analyse_slice( x264_t *h ) } } - if( BIT_DEPTH > 8 ) - for( int y = 0; y < h->mb.i_mb_height; y++ ) - h->fdec->i_row_satd[y] >>= (BIT_DEPTH - 8); - - return cost >> (BIT_DEPTH - 8); + return cost; }