| Index: source/libvpx/vp9/encoder/vp9_firstpass.c
|
| ===================================================================
|
| --- source/libvpx/vp9/encoder/vp9_firstpass.c (revision 247498)
|
| +++ source/libvpx/vp9/encoder/vp9_firstpass.c (working copy)
|
| @@ -49,17 +49,12 @@
|
|
|
| #define DOUBLE_DIVIDE_CHECK(x) ((x) < 0 ? (x) - 0.000001 : (x) + 0.000001)
|
|
|
| -#define POW1 (double)cpi->oxcf.two_pass_vbrbias/100.0
|
| -#define POW2 (double)cpi->oxcf.two_pass_vbrbias/100.0
|
| -
|
| static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) {
|
| YV12_BUFFER_CONFIG temp = *a;
|
| *a = *b;
|
| *b = temp;
|
| }
|
|
|
| -static void find_next_key_frame(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame);
|
| -
|
| static int select_cq_level(int qindex) {
|
| int ret_val = QINDEX_RANGE - 1;
|
| int i;
|
| @@ -92,30 +87,32 @@
|
|
|
| // Resets the first pass file to the given position using a relative seek from
|
| // the current position.
|
| -static void reset_fpf_position(VP9_COMP *cpi, FIRSTPASS_STATS *position) {
|
| - cpi->twopass.stats_in = position;
|
| +static void reset_fpf_position(struct twopass_rc *p,
|
| + FIRSTPASS_STATS *position) {
|
| + p->stats_in = position;
|
| }
|
|
|
| -static int lookup_next_frame_stats(VP9_COMP *cpi, FIRSTPASS_STATS *next_frame) {
|
| - if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end)
|
| +static int lookup_next_frame_stats(const struct twopass_rc *p,
|
| + FIRSTPASS_STATS *next_frame) {
|
| + if (p->stats_in >= p->stats_in_end)
|
| return EOF;
|
|
|
| - *next_frame = *cpi->twopass.stats_in;
|
| + *next_frame = *p->stats_in;
|
| return 1;
|
| }
|
|
|
| +
|
| // Read frame stats at an offset from the current position
|
| -static int read_frame_stats(VP9_COMP *cpi,
|
| - FIRSTPASS_STATS *frame_stats,
|
| - int offset) {
|
| - FIRSTPASS_STATS *fps_ptr = cpi->twopass.stats_in;
|
| +static int read_frame_stats(const struct twopass_rc *p,
|
| + FIRSTPASS_STATS *frame_stats, int offset) {
|
| + const FIRSTPASS_STATS *fps_ptr = p->stats_in;
|
|
|
| // Check legality of offset
|
| if (offset >= 0) {
|
| - if (&fps_ptr[offset] >= cpi->twopass.stats_in_end)
|
| + if (&fps_ptr[offset] >= p->stats_in_end)
|
| return EOF;
|
| } else if (offset < 0) {
|
| - if (&fps_ptr[offset] < cpi->twopass.stats_in_start)
|
| + if (&fps_ptr[offset] < p->stats_in_start)
|
| return EOF;
|
| }
|
|
|
| @@ -123,13 +120,12 @@
|
| return 1;
|
| }
|
|
|
| -static int input_stats(VP9_COMP *cpi, FIRSTPASS_STATS *fps) {
|
| - if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end)
|
| +static int input_stats(struct twopass_rc *p, FIRSTPASS_STATS *fps) {
|
| + if (p->stats_in >= p->stats_in_end)
|
| return EOF;
|
|
|
| - *fps = *cpi->twopass.stats_in;
|
| - cpi->twopass.stats_in =
|
| - (void *)((char *)cpi->twopass.stats_in + sizeof(FIRSTPASS_STATS));
|
| + *fps = *p->stats_in;
|
| + ++p->stats_in;
|
| return 1;
|
| }
|
|
|
| @@ -149,7 +145,7 @@
|
| FILE *fpfile;
|
| fpfile = fopen("firstpass.stt", "a");
|
|
|
| - fprintf(stdout, "%12.0f %12.0f %12.0f %12.0f %12.0f %12.4f %12.4f"
|
| + fprintf(fpfile, "%12.0f %12.0f %12.0f %12.0f %12.0f %12.4f %12.4f"
|
| "%12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f"
|
| "%12.0f %12.0f %12.4f %12.0f %12.0f %12.4f\n",
|
| stats->frame,
|
| @@ -268,11 +264,15 @@
|
| // harder frames.
|
| static double calculate_modified_err(VP9_COMP *cpi,
|
| FIRSTPASS_STATS *this_frame) {
|
| - const FIRSTPASS_STATS *const stats = &cpi->twopass.total_stats;
|
| + struct twopass_rc *const twopass = &cpi->twopass;
|
| + const FIRSTPASS_STATS *const stats = &twopass->total_stats;
|
| const double av_err = stats->ssim_weighted_pred_err / stats->count;
|
| - const double this_err = this_frame->ssim_weighted_pred_err;
|
| - return av_err * pow(this_err / DOUBLE_DIVIDE_CHECK(av_err),
|
| - this_err > av_err ? POW1 : POW2);
|
| + double modified_error = av_err * pow(this_frame->ssim_weighted_pred_err /
|
| + DOUBLE_DIVIDE_CHECK(av_err),
|
| + cpi->oxcf.two_pass_vbrbias / 100.0);
|
| +
|
| + return fclamp(modified_error,
|
| + twopass->modified_error_min, twopass->modified_error_max);
|
| }
|
|
|
| static const double weight_table[256] = {
|
| @@ -315,44 +315,34 @@
|
| 1.000000, 1.000000, 1.000000, 1.000000
|
| };
|
|
|
| -static double simple_weight(YV12_BUFFER_CONFIG *source) {
|
| +static double simple_weight(const YV12_BUFFER_CONFIG *buf) {
|
| int i, j;
|
| + double sum = 0.0;
|
| + const int w = buf->y_crop_width;
|
| + const int h = buf->y_crop_height;
|
| + const uint8_t *row = buf->y_buffer;
|
|
|
| - uint8_t *src = source->y_buffer;
|
| - double sum_weights = 0.0;
|
| + for (i = 0; i < h; ++i) {
|
| + const uint8_t *pixel = row;
|
| + for (j = 0; j < w; ++j)
|
| + sum += weight_table[*pixel++];
|
| + row += buf->y_stride;
|
| + }
|
|
|
| - // Loop through the Y plane examining levels and creating a weight for
|
| - // the image.
|
| - i = source->y_height;
|
| - do {
|
| - j = source->y_width;
|
| - do {
|
| - sum_weights += weight_table[ *src];
|
| - src++;
|
| - } while (--j);
|
| - src -= source->y_width;
|
| - src += source->y_stride;
|
| - } while (--i);
|
| -
|
| - sum_weights /= (source->y_height * source->y_width);
|
| -
|
| - return sum_weights;
|
| + return MAX(0.1, sum / (w * h));
|
| }
|
|
|
| -
|
| -// This function returns the current per frame maximum bitrate target.
|
| +// This function returns the maximum target rate per frame.
|
| static int frame_max_bits(VP9_COMP *cpi) {
|
| - // Max allocation for a single frame based on the max section guidelines
|
| - // passed in and how many bits are left.
|
| - // For VBR base this on the bits and frames left plus the
|
| - // two_pass_vbrmax_section rate passed in by the user.
|
| - const double max_bits = (1.0 * cpi->twopass.bits_left /
|
| - (cpi->twopass.total_stats.count - cpi->common.current_video_frame)) *
|
| - (cpi->oxcf.two_pass_vbrmax_section / 100.0);
|
| + int64_t max_bits =
|
| + ((int64_t)cpi->rc.av_per_frame_bandwidth *
|
| + (int64_t)cpi->oxcf.two_pass_vbrmax_section) / 100;
|
| +
|
| if (max_bits < 0)
|
| - return 0;
|
| - if (max_bits >= INT_MAX)
|
| - return INT_MAX;
|
| + max_bits = 0;
|
| + else if (max_bits > cpi->rc.max_frame_bandwidth)
|
| + max_bits = cpi->rc.max_frame_bandwidth;
|
| +
|
| return (int)max_bits;
|
| }
|
|
|
| @@ -377,14 +367,11 @@
|
| }
|
| }
|
|
|
| -static unsigned int zz_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
| - YV12_BUFFER_CONFIG *recon_buffer,
|
| - int recon_yoffset) {
|
| - MACROBLOCKD *const xd = &x->e_mbd;
|
| +static unsigned int zz_motion_search(const VP9_COMP *cpi, const MACROBLOCK *x) {
|
| + const MACROBLOCKD *const xd = &x->e_mbd;
|
| const uint8_t *const src = x->plane[0].src.buf;
|
| const int src_stride = x->plane[0].src.stride;
|
| - const uint8_t *const ref = xd->plane[0].pre[0].buf
|
| - = recon_buffer->y_buffer + recon_yoffset;
|
| + const uint8_t *const ref = xd->plane[0].pre[0].buf;
|
| const int ref_stride = xd->plane[0].pre[0].stride;
|
|
|
| unsigned int sse;
|
| @@ -394,42 +381,31 @@
|
| }
|
|
|
| static void first_pass_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
|
| - MV *ref_mv, MV *best_mv,
|
| - YV12_BUFFER_CONFIG *recon_buffer,
|
| - int *best_motion_err, int recon_yoffset) {
|
| + const MV *ref_mv, MV *best_mv,
|
| + int *best_motion_err) {
|
| MACROBLOCKD *const xd = &x->e_mbd;
|
| - int num00;
|
| -
|
| MV tmp_mv = {0, 0};
|
| - MV ref_mv_full;
|
| -
|
| - int tmp_err;
|
| + MV ref_mv_full = {ref_mv->row >> 3, ref_mv->col >> 3};
|
| + int num00, tmp_err, n, sr = 0;
|
| int step_param = 3;
|
| int further_steps = (MAX_MVSEARCH_STEPS - 1) - step_param;
|
| - int n;
|
| - vp9_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[xd->mi_8x8[0]->mbmi.sb_type];
|
| + const BLOCK_SIZE bsize = xd->mi_8x8[0]->mbmi.sb_type;
|
| + vp9_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[bsize];
|
| int new_mv_mode_penalty = 256;
|
| + const int quart_frm = MIN(cpi->common.width, cpi->common.height);
|
|
|
| - int sr = 0;
|
| - int quart_frm = MIN(cpi->common.width, cpi->common.height);
|
| -
|
| // refine the motion search range accroding to the frame dimension
|
| // for first pass test
|
| while ((quart_frm << sr) < MAX_FULL_PEL_VAL)
|
| sr++;
|
|
|
| - step_param += sr;
|
| + step_param += sr;
|
| further_steps -= sr;
|
|
|
| // override the default variance function to use MSE
|
| - v_fn_ptr.vf = get_block_variance_fn(xd->mi_8x8[0]->mbmi.sb_type);
|
| + v_fn_ptr.vf = get_block_variance_fn(bsize);
|
|
|
| - // Set up pointers for this macro block recon buffer
|
| - xd->plane[0].pre[0].buf = recon_buffer->y_buffer + recon_yoffset;
|
| -
|
| // Initial step/diamond search centred on best mv
|
| - ref_mv_full.col = ref_mv->col >> 3;
|
| - ref_mv_full.row = ref_mv->row >> 3;
|
| tmp_err = cpi->diamond_search_sad(x, &ref_mv_full, &tmp_mv,
|
| step_param,
|
| x->sadperbit16, &num00, &v_fn_ptr,
|
| @@ -471,6 +447,16 @@
|
| }
|
| }
|
|
|
| +static BLOCK_SIZE get_bsize(const VP9_COMMON *cm, int mb_row, int mb_col) {
|
| + if (2 * mb_col + 1 < cm->mi_cols) {
|
| + return 2 * mb_row + 1 < cm->mi_rows ? BLOCK_16X16
|
| + : BLOCK_16X8;
|
| + } else {
|
| + return 2 * mb_row + 1 < cm->mi_rows ? BLOCK_8X16
|
| + : BLOCK_8X8;
|
| + }
|
| +}
|
| +
|
| void vp9_first_pass(VP9_COMP *cpi) {
|
| int mb_row, mb_col;
|
| MACROBLOCK *const x = &cpi->mb;
|
| @@ -483,10 +469,8 @@
|
| int i;
|
|
|
| int recon_yoffset, recon_uvoffset;
|
| - const int lst_yv12_idx = cm->ref_frame_map[cpi->lst_fb_idx];
|
| - const int gld_yv12_idx = cm->ref_frame_map[cpi->gld_fb_idx];
|
| - YV12_BUFFER_CONFIG *const lst_yv12 = &cm->yv12_fb[lst_yv12_idx];
|
| - YV12_BUFFER_CONFIG *const gld_yv12 = &cm->yv12_fb[gld_yv12_idx];
|
| + YV12_BUFFER_CONFIG *const lst_yv12 = get_ref_frame_buffer(cpi, LAST_FRAME);
|
| + YV12_BUFFER_CONFIG *const gld_yv12 = get_ref_frame_buffer(cpi, GOLDEN_FRAME);
|
| YV12_BUFFER_CONFIG *const new_yv12 = get_frame_new_buffer(cm);
|
| const int recon_y_stride = lst_yv12->y_stride;
|
| const int recon_uv_stride = lst_yv12->uv_stride;
|
| @@ -497,7 +481,7 @@
|
|
|
| int sum_mvr = 0, sum_mvc = 0;
|
| int sum_mvr_abs = 0, sum_mvc_abs = 0;
|
| - int sum_mvrs = 0, sum_mvcs = 0;
|
| + int64_t sum_mvrs = 0, sum_mvcs = 0;
|
| int mvcount = 0;
|
| int intercount = 0;
|
| int second_ref_count = 0;
|
| @@ -506,6 +490,7 @@
|
| int new_mv_count = 0;
|
| int sum_in_vectors = 0;
|
| uint32_t lastmv_as_int = 0;
|
| + struct twopass_rc *const twopass = &cpi->twopass;
|
|
|
| int_mv zero_ref_mv;
|
|
|
| @@ -565,9 +550,9 @@
|
| // for each macroblock col in image
|
| for (mb_col = 0; mb_col < cm->mb_cols; mb_col++) {
|
| int this_error;
|
| - int gf_motion_error = INT_MAX;
|
| int use_dc_pred = (mb_col || mb_row) && (!mb_col || !mb_row);
|
| double error_weight = 1.0;
|
| + const BLOCK_SIZE bsize = get_bsize(cm, mb_row, mb_col);
|
|
|
| vp9_clear_system_state(); // __asm emms;
|
|
|
| @@ -575,30 +560,15 @@
|
| xd->plane[1].dst.buf = new_yv12->u_buffer + recon_uvoffset;
|
| xd->plane[2].dst.buf = new_yv12->v_buffer + recon_uvoffset;
|
| xd->left_available = (mb_col != 0);
|
| -
|
| - if (mb_col * 2 + 1 < cm->mi_cols) {
|
| - if (mb_row * 2 + 1 < cm->mi_rows) {
|
| - xd->mi_8x8[0]->mbmi.sb_type = BLOCK_16X16;
|
| - } else {
|
| - xd->mi_8x8[0]->mbmi.sb_type = BLOCK_16X8;
|
| - }
|
| - } else {
|
| - if (mb_row * 2 + 1 < cm->mi_rows) {
|
| - xd->mi_8x8[0]->mbmi.sb_type = BLOCK_8X16;
|
| - } else {
|
| - xd->mi_8x8[0]->mbmi.sb_type = BLOCK_8X8;
|
| - }
|
| - }
|
| + xd->mi_8x8[0]->mbmi.sb_type = bsize;
|
| xd->mi_8x8[0]->mbmi.ref_frame[0] = INTRA_FRAME;
|
| set_mi_row_col(xd, &tile,
|
| - mb_row << 1,
|
| - num_8x8_blocks_high_lookup[xd->mi_8x8[0]->mbmi.sb_type],
|
| - mb_col << 1,
|
| - num_8x8_blocks_wide_lookup[xd->mi_8x8[0]->mbmi.sb_type],
|
| + mb_row << 1, num_8x8_blocks_high_lookup[bsize],
|
| + mb_col << 1, num_8x8_blocks_wide_lookup[bsize],
|
| cm->mi_rows, cm->mi_cols);
|
|
|
| if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
| - int energy = vp9_block_energy(cpi, x, xd->mi_8x8[0]->mbmi.sb_type);
|
| + int energy = vp9_block_energy(cpi, x, bsize);
|
| error_weight = vp9_vaq_inv_q_ratio(energy);
|
| }
|
|
|
| @@ -629,16 +599,18 @@
|
|
|
| // Other than for the first frame do a motion search
|
| if (cm->current_video_frame > 0) {
|
| - int tmp_err;
|
| - int motion_error = zz_motion_search(cpi, x, lst_yv12, recon_yoffset);
|
| + int tmp_err, motion_error;
|
| int_mv mv, tmp_mv;
|
| +
|
| + xd->plane[0].pre[0].buf = lst_yv12->y_buffer + recon_yoffset;
|
| + motion_error = zz_motion_search(cpi, x);
|
| // Simple 0,0 motion with no mv overhead
|
| mv.as_int = tmp_mv.as_int = 0;
|
|
|
| // Test last reference frame using the previous best mv as the
|
| // starting point (best reference) for the search
|
| first_pass_motion_search(cpi, x, &best_ref_mv.as_mv, &mv.as_mv,
|
| - lst_yv12, &motion_error, recon_yoffset);
|
| + &motion_error);
|
| if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
| vp9_clear_system_state(); // __asm emms;
|
| motion_error *= error_weight;
|
| @@ -649,7 +621,7 @@
|
| if (best_ref_mv.as_int) {
|
| tmp_err = INT_MAX;
|
| first_pass_motion_search(cpi, x, &zero_ref_mv.as_mv, &tmp_mv.as_mv,
|
| - lst_yv12, &tmp_err, recon_yoffset);
|
| + &tmp_err);
|
| if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
| vp9_clear_system_state(); // __asm emms;
|
| tmp_err *= error_weight;
|
| @@ -664,10 +636,13 @@
|
| // Experimental search in an older reference frame
|
| if (cm->current_video_frame > 1) {
|
| // Simple 0,0 motion with no mv overhead
|
| - gf_motion_error = zz_motion_search(cpi, x, gld_yv12, recon_yoffset);
|
| + int gf_motion_error;
|
|
|
| + xd->plane[0].pre[0].buf = gld_yv12->y_buffer + recon_yoffset;
|
| + gf_motion_error = zz_motion_search(cpi, x);
|
| +
|
| first_pass_motion_search(cpi, x, &zero_ref_mv.as_mv, &tmp_mv.as_mv,
|
| - gld_yv12, &gf_motion_error, recon_yoffset);
|
| + &gf_motion_error);
|
| if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
| vp9_clear_system_state(); // __asm emms;
|
| gf_motion_error *= error_weight;
|
| @@ -709,13 +684,12 @@
|
| mv.as_mv.row *= 8;
|
| mv.as_mv.col *= 8;
|
| this_error = motion_error;
|
| - vp9_set_mbmode_and_mvs(x, NEWMV, &mv);
|
| + vp9_set_mbmode_and_mvs(xd, NEWMV, &mv.as_mv);
|
| xd->mi_8x8[0]->mbmi.tx_size = TX_4X4;
|
| xd->mi_8x8[0]->mbmi.ref_frame[0] = LAST_FRAME;
|
| xd->mi_8x8[0]->mbmi.ref_frame[1] = NONE;
|
| - vp9_build_inter_predictors_sby(xd, mb_row << 1, mb_col << 1,
|
| - xd->mi_8x8[0]->mbmi.sb_type);
|
| - vp9_encode_sby(x, xd->mi_8x8[0]->mbmi.sb_type);
|
| + vp9_build_inter_predictors_sby(xd, mb_row << 1, mb_col << 1, bsize);
|
| + vp9_encode_sby(x, bsize);
|
| sum_mvr += mv.as_mv.row;
|
| sum_mvr_abs += abs(mv.as_mv.row);
|
| sum_mvc += mv.as_mv.col;
|
| @@ -788,77 +762,64 @@
|
|
|
| vp9_clear_system_state(); // __asm emms;
|
| {
|
| - double weight = 0.0;
|
| -
|
| FIRSTPASS_STATS fps;
|
|
|
| - fps.frame = cm->current_video_frame;
|
| - fps.intra_error = (double)(intra_error >> 8);
|
| - fps.coded_error = (double)(coded_error >> 8);
|
| - fps.sr_coded_error = (double)(sr_coded_error >> 8);
|
| - weight = simple_weight(cpi->Source);
|
| + fps.frame = cm->current_video_frame;
|
| + fps.intra_error = intra_error >> 8;
|
| + fps.coded_error = coded_error >> 8;
|
| + fps.sr_coded_error = sr_coded_error >> 8;
|
| + fps.ssim_weighted_pred_err = fps.coded_error * simple_weight(cpi->Source);
|
| + fps.count = 1.0;
|
| + fps.pcnt_inter = (double)intercount / cm->MBs;
|
| + fps.pcnt_second_ref = (double)second_ref_count / cm->MBs;
|
| + fps.pcnt_neutral = (double)neutral_count / cm->MBs;
|
|
|
| -
|
| - if (weight < 0.1)
|
| - weight = 0.1;
|
| -
|
| - fps.ssim_weighted_pred_err = fps.coded_error * weight;
|
| -
|
| - fps.pcnt_inter = 0.0;
|
| - fps.pcnt_motion = 0.0;
|
| - fps.MVr = 0.0;
|
| - fps.mvr_abs = 0.0;
|
| - fps.MVc = 0.0;
|
| - fps.mvc_abs = 0.0;
|
| - fps.MVrv = 0.0;
|
| - fps.MVcv = 0.0;
|
| - fps.mv_in_out_count = 0.0;
|
| - fps.new_mv_count = 0.0;
|
| - fps.count = 1.0;
|
| -
|
| - fps.pcnt_inter = 1.0 * (double)intercount / cm->MBs;
|
| - fps.pcnt_second_ref = 1.0 * (double)second_ref_count / cm->MBs;
|
| - fps.pcnt_neutral = 1.0 * (double)neutral_count / cm->MBs;
|
| -
|
| if (mvcount > 0) {
|
| - fps.MVr = (double)sum_mvr / (double)mvcount;
|
| - fps.mvr_abs = (double)sum_mvr_abs / (double)mvcount;
|
| - fps.MVc = (double)sum_mvc / (double)mvcount;
|
| - fps.mvc_abs = (double)sum_mvc_abs / (double)mvcount;
|
| - fps.MVrv = ((double)sum_mvrs - (fps.MVr * fps.MVr / (double)mvcount)) /
|
| - (double)mvcount;
|
| - fps.MVcv = ((double)sum_mvcs - (fps.MVc * fps.MVc / (double)mvcount)) /
|
| - (double)mvcount;
|
| - fps.mv_in_out_count = (double)sum_in_vectors / (double)(mvcount * 2);
|
| + fps.MVr = (double)sum_mvr / mvcount;
|
| + fps.mvr_abs = (double)sum_mvr_abs / mvcount;
|
| + fps.MVc = (double)sum_mvc / mvcount;
|
| + fps.mvc_abs = (double)sum_mvc_abs / mvcount;
|
| + fps.MVrv = ((double)sum_mvrs - (fps.MVr * fps.MVr / mvcount)) /
|
| + mvcount;
|
| + fps.MVcv = ((double)sum_mvcs - (fps.MVc * fps.MVc / mvcount)) /
|
| + mvcount;
|
| + fps.mv_in_out_count = (double)sum_in_vectors / (mvcount * 2);
|
| fps.new_mv_count = new_mv_count;
|
| -
|
| - fps.pcnt_motion = 1.0 * (double)mvcount / cpi->common.MBs;
|
| + fps.pcnt_motion = (double)mvcount / cpi->common.MBs;
|
| + } else {
|
| + fps.MVr = 0.0;
|
| + fps.mvr_abs = 0.0;
|
| + fps.MVc = 0.0;
|
| + fps.mvc_abs = 0.0;
|
| + fps.MVrv = 0.0;
|
| + fps.MVcv = 0.0;
|
| + fps.mv_in_out_count = 0.0;
|
| + fps.new_mv_count = 0.0;
|
| + fps.pcnt_motion = 0.0;
|
| }
|
|
|
| // TODO(paulwilkins): Handle the case when duration is set to 0, or
|
| // something less than the full time between subsequent values of
|
| // cpi->source_time_stamp.
|
| - fps.duration = (double)(cpi->source->ts_end
|
| - - cpi->source->ts_start);
|
| + fps.duration = (double)(cpi->source->ts_end - cpi->source->ts_start);
|
|
|
| // don't want to do output stats with a stack variable!
|
| - cpi->twopass.this_frame_stats = fps;
|
| - output_stats(cpi, cpi->output_pkt_list, &cpi->twopass.this_frame_stats);
|
| - accumulate_stats(&cpi->twopass.total_stats, &fps);
|
| + twopass->this_frame_stats = fps;
|
| + output_stats(cpi, cpi->output_pkt_list, &twopass->this_frame_stats);
|
| + accumulate_stats(&twopass->total_stats, &fps);
|
| }
|
|
|
| // Copy the previous Last Frame back into gf and and arf buffers if
|
| // the prediction is good enough... but also dont allow it to lag too far
|
| - if ((cpi->twopass.sr_update_lag > 3) ||
|
| + if ((twopass->sr_update_lag > 3) ||
|
| ((cm->current_video_frame > 0) &&
|
| - (cpi->twopass.this_frame_stats.pcnt_inter > 0.20) &&
|
| - ((cpi->twopass.this_frame_stats.intra_error /
|
| - DOUBLE_DIVIDE_CHECK(cpi->twopass.this_frame_stats.coded_error)) >
|
| - 2.0))) {
|
| + (twopass->this_frame_stats.pcnt_inter > 0.20) &&
|
| + ((twopass->this_frame_stats.intra_error /
|
| + DOUBLE_DIVIDE_CHECK(twopass->this_frame_stats.coded_error)) > 2.0))) {
|
| vp8_yv12_copy_frame(lst_yv12, gld_yv12);
|
| - cpi->twopass.sr_update_lag = 1;
|
| + twopass->sr_update_lag = 1;
|
| } else {
|
| - cpi->twopass.sr_update_lag++;
|
| + twopass->sr_update_lag++;
|
| }
|
| // swap frame pointers so last frame refers to the frame we just compressed
|
| swap_yv12(lst_yv12, new_yv12);
|
| @@ -952,69 +913,38 @@
|
| return fclamp(pow(error_term, power_term), 0.05, 5.0);
|
| }
|
|
|
| -// Given a current maxQ value sets a range for future values.
|
| -// PGW TODO..
|
| -// This code removes direct dependency on QIndex to determine the range
|
| -// (now uses the actual quantizer) but has not been tuned.
|
| -static void adjust_maxq_qrange(VP9_COMP *cpi) {
|
| - int i;
|
| - // Set the max corresponding to cpi->rc.avg_q * 2.0
|
| - double q = cpi->rc.avg_q * 2.0;
|
| - cpi->twopass.maxq_max_limit = cpi->rc.worst_quality;
|
| - for (i = cpi->rc.best_quality; i <= cpi->rc.worst_quality; i++) {
|
| - cpi->twopass.maxq_max_limit = i;
|
| - if (vp9_convert_qindex_to_q(i) >= q)
|
| - break;
|
| - }
|
| -
|
| - // Set the min corresponding to cpi->rc.avg_q * 0.5
|
| - q = cpi->rc.avg_q * 0.5;
|
| - cpi->twopass.maxq_min_limit = cpi->rc.best_quality;
|
| - for (i = cpi->rc.worst_quality; i >= cpi->rc.best_quality; i--) {
|
| - cpi->twopass.maxq_min_limit = i;
|
| - if (vp9_convert_qindex_to_q(i) <= q)
|
| - break;
|
| - }
|
| -}
|
| -
|
| static int estimate_max_q(VP9_COMP *cpi,
|
| FIRSTPASS_STATS *fpstats,
|
| int section_target_bandwitdh) {
|
| int q;
|
| - int num_mbs = cpi->common.MBs;
|
| + const int num_mbs = cpi->common.MBs;
|
| int target_norm_bits_per_mb;
|
| + RATE_CONTROL *const rc = &cpi->rc;
|
|
|
| - double section_err = fpstats->coded_error / fpstats->count;
|
| - double err_per_mb = section_err / num_mbs;
|
| - double err_correction_factor;
|
| + const double section_err = fpstats->coded_error / fpstats->count;
|
| + const double err_per_mb = section_err / num_mbs;
|
|
|
| if (section_target_bandwitdh <= 0)
|
| - return cpi->twopass.maxq_max_limit; // Highest value allowed
|
| + return rc->worst_quality; // Highest value allowed
|
|
|
| target_norm_bits_per_mb = section_target_bandwitdh < (1 << 20)
|
| ? (512 * section_target_bandwitdh) / num_mbs
|
| : 512 * (section_target_bandwitdh / num_mbs);
|
|
|
| -
|
| // Try and pick a max Q that will be high enough to encode the
|
| // content at the given rate.
|
| - for (q = cpi->twopass.maxq_min_limit; q < cpi->twopass.maxq_max_limit; q++) {
|
| - int bits_per_mb_at_this_q;
|
| -
|
| - err_correction_factor = calc_correction_factor(err_per_mb,
|
| - ERR_DIVISOR, 0.5, 0.90, q);
|
| -
|
| - bits_per_mb_at_this_q = vp9_rc_bits_per_mb(INTER_FRAME, q,
|
| - err_correction_factor);
|
| -
|
| + for (q = rc->best_quality; q < rc->worst_quality; q++) {
|
| + const double err_correction_factor = calc_correction_factor(err_per_mb,
|
| + ERR_DIVISOR, 0.5, 0.90, q);
|
| + const int bits_per_mb_at_this_q = vp9_rc_bits_per_mb(INTER_FRAME, q,
|
| + err_correction_factor);
|
| if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
|
| break;
|
| }
|
|
|
| // Restriction on active max q for constrained quality mode.
|
| - if (cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY &&
|
| - q < cpi->cq_target_quality)
|
| - q = cpi->cq_target_quality;
|
| + if (cpi->oxcf.end_usage == USAGE_CONSTRAINED_QUALITY)
|
| + q = MAX(q, cpi->cq_target_quality);
|
|
|
| return q;
|
| }
|
| @@ -1076,83 +1006,80 @@
|
| void vp9_init_second_pass(VP9_COMP *cpi) {
|
| FIRSTPASS_STATS this_frame;
|
| FIRSTPASS_STATS *start_pos;
|
| + struct twopass_rc *const twopass = &cpi->twopass;
|
| + const VP9_CONFIG *const oxcf = &cpi->oxcf;
|
|
|
| - double lower_bounds_min_rate = FRAME_OVERHEAD_BITS * cpi->oxcf.framerate;
|
| - double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth *
|
| - cpi->oxcf.two_pass_vbrmin_section / 100);
|
| + zero_stats(&twopass->total_stats);
|
| + zero_stats(&twopass->total_left_stats);
|
|
|
| - if (two_pass_min_rate < lower_bounds_min_rate)
|
| - two_pass_min_rate = lower_bounds_min_rate;
|
| -
|
| - zero_stats(&cpi->twopass.total_stats);
|
| - zero_stats(&cpi->twopass.total_left_stats);
|
| -
|
| - if (!cpi->twopass.stats_in_end)
|
| + if (!twopass->stats_in_end)
|
| return;
|
|
|
| - cpi->twopass.total_stats = *cpi->twopass.stats_in_end;
|
| - cpi->twopass.total_left_stats = cpi->twopass.total_stats;
|
| + twopass->total_stats = *twopass->stats_in_end;
|
| + twopass->total_left_stats = twopass->total_stats;
|
|
|
| // each frame can have a different duration, as the frame rate in the source
|
| // isn't guaranteed to be constant. The frame rate prior to the first frame
|
| // encoded in the second pass is a guess. However the sum duration is not.
|
| // Its calculated based on the actual durations of all frames from the first
|
| // pass.
|
| - vp9_new_framerate(cpi, 10000000.0 * cpi->twopass.total_stats.count /
|
| - cpi->twopass.total_stats.duration);
|
| + vp9_new_framerate(cpi, 10000000.0 * twopass->total_stats.count /
|
| + twopass->total_stats.duration);
|
|
|
| - cpi->output_framerate = cpi->oxcf.framerate;
|
| - cpi->twopass.bits_left = (int64_t)(cpi->twopass.total_stats.duration *
|
| - cpi->oxcf.target_bandwidth / 10000000.0);
|
| - cpi->twopass.bits_left -= (int64_t)(cpi->twopass.total_stats.duration *
|
| - two_pass_min_rate / 10000000.0);
|
| + cpi->output_framerate = oxcf->framerate;
|
| + twopass->bits_left = (int64_t)(twopass->total_stats.duration *
|
| + oxcf->target_bandwidth / 10000000.0);
|
|
|
| // Calculate a minimum intra value to be used in determining the IIratio
|
| // scores used in the second pass. We have this minimum to make sure
|
| // that clips that are static but "low complexity" in the intra domain
|
| // are still boosted appropriately for KF/GF/ARF
|
| - cpi->twopass.kf_intra_err_min = KF_MB_INTRA_MIN * cpi->common.MBs;
|
| - cpi->twopass.gf_intra_err_min = GF_MB_INTRA_MIN * cpi->common.MBs;
|
| + twopass->kf_intra_err_min = KF_MB_INTRA_MIN * cpi->common.MBs;
|
| + twopass->gf_intra_err_min = GF_MB_INTRA_MIN * cpi->common.MBs;
|
|
|
| // This variable monitors how far behind the second ref update is lagging
|
| - cpi->twopass.sr_update_lag = 1;
|
| + twopass->sr_update_lag = 1;
|
|
|
| // Scan the first pass file and calculate an average Intra / Inter error score
|
| // ratio for the sequence.
|
| {
|
| double sum_iiratio = 0.0;
|
| - double IIRatio;
|
| + start_pos = twopass->stats_in; // Note the starting "file" position.
|
|
|
| - start_pos = cpi->twopass.stats_in; // Note the starting "file" position.
|
| -
|
| - while (input_stats(cpi, &this_frame) != EOF) {
|
| - IIRatio = this_frame.intra_error
|
| - / DOUBLE_DIVIDE_CHECK(this_frame.coded_error);
|
| - IIRatio = (IIRatio < 1.0) ? 1.0 : (IIRatio > 20.0) ? 20.0 : IIRatio;
|
| - sum_iiratio += IIRatio;
|
| + while (input_stats(twopass, &this_frame) != EOF) {
|
| + const double iiratio = this_frame.intra_error /
|
| + DOUBLE_DIVIDE_CHECK(this_frame.coded_error);
|
| + sum_iiratio += fclamp(iiratio, 1.0, 20.0);
|
| }
|
|
|
| - cpi->twopass.avg_iiratio = sum_iiratio /
|
| - DOUBLE_DIVIDE_CHECK((double)cpi->twopass.total_stats.count);
|
| + twopass->avg_iiratio = sum_iiratio /
|
| + DOUBLE_DIVIDE_CHECK((double)twopass->total_stats.count);
|
|
|
| // Reset file position
|
| - reset_fpf_position(cpi, start_pos);
|
| + reset_fpf_position(twopass, start_pos);
|
| }
|
|
|
| // Scan the first pass file and calculate a modified total error based upon
|
| // the bias/power function used to allocate bits.
|
| {
|
| - start_pos = cpi->twopass.stats_in; // Note starting "file" position
|
| + double av_error = twopass->total_stats.ssim_weighted_pred_err /
|
| + DOUBLE_DIVIDE_CHECK(twopass->total_stats.count);
|
|
|
| - cpi->twopass.modified_error_total = 0.0;
|
| + start_pos = twopass->stats_in; // Note starting "file" position
|
|
|
| - while (input_stats(cpi, &this_frame) != EOF) {
|
| - cpi->twopass.modified_error_total +=
|
| + twopass->modified_error_total = 0.0;
|
| + twopass->modified_error_min =
|
| + (av_error * oxcf->two_pass_vbrmin_section) / 100;
|
| + twopass->modified_error_max =
|
| + (av_error * oxcf->two_pass_vbrmax_section) / 100;
|
| +
|
| + while (input_stats(twopass, &this_frame) != EOF) {
|
| + twopass->modified_error_total +=
|
| calculate_modified_err(cpi, &this_frame);
|
| }
|
| - cpi->twopass.modified_error_left = cpi->twopass.modified_error_total;
|
| + twopass->modified_error_left = twopass->modified_error_total;
|
|
|
| - reset_fpf_position(cpi, start_pos); // Reset file position
|
| + reset_fpf_position(twopass, start_pos);
|
| }
|
| }
|
|
|
| @@ -1163,32 +1090,15 @@
|
| // the prediction quality is decaying from frame to frame.
|
| static double get_prediction_decay_rate(VP9_COMP *cpi,
|
| FIRSTPASS_STATS *next_frame) {
|
| - double prediction_decay_rate;
|
| - double second_ref_decay;
|
| - double mb_sr_err_diff;
|
| -
|
| - // Initial basis is the % mbs inter coded
|
| - prediction_decay_rate = next_frame->pcnt_inter;
|
| -
|
| // Look at the observed drop in prediction quality between the last frame
|
| // and the GF buffer (which contains an older frame).
|
| - mb_sr_err_diff = (next_frame->sr_coded_error - next_frame->coded_error) /
|
| - cpi->common.MBs;
|
| - if (mb_sr_err_diff <= 512.0) {
|
| - second_ref_decay = 1.0 - (mb_sr_err_diff / 512.0);
|
| - second_ref_decay = pow(second_ref_decay, 0.5);
|
| - if (second_ref_decay < 0.85)
|
| - second_ref_decay = 0.85;
|
| - else if (second_ref_decay > 1.0)
|
| - second_ref_decay = 1.0;
|
| - } else {
|
| - second_ref_decay = 0.85;
|
| - }
|
| + const double mb_sr_err_diff = (next_frame->sr_coded_error -
|
| + next_frame->coded_error) / cpi->common.MBs;
|
| + const double second_ref_decay = mb_sr_err_diff <= 512.0
|
| + ? fclamp(pow(1.0 - (mb_sr_err_diff / 512.0), 0.5), 0.85, 1.0)
|
| + : 0.85;
|
|
|
| - if (second_ref_decay < prediction_decay_rate)
|
| - prediction_decay_rate = second_ref_decay;
|
| -
|
| - return prediction_decay_rate;
|
| + return MIN(second_ref_decay, next_frame->pcnt_inter);
|
| }
|
|
|
| // Function to test for a condition where a complex transition is followed
|
| @@ -1216,16 +1126,15 @@
|
| // Look ahead a few frames to see if static condition
|
| // persists...
|
| for (j = 0; j < still_interval; j++) {
|
| - if (EOF == input_stats(cpi, &tmp_next_frame))
|
| + if (EOF == input_stats(&cpi->twopass, &tmp_next_frame))
|
| break;
|
|
|
| - zz_inter =
|
| - (tmp_next_frame.pcnt_inter - tmp_next_frame.pcnt_motion);
|
| + zz_inter = (tmp_next_frame.pcnt_inter - tmp_next_frame.pcnt_motion);
|
| if (zz_inter < 0.999)
|
| break;
|
| }
|
| // Reset file position
|
| - reset_fpf_position(cpi, position);
|
| + reset_fpf_position(&cpi->twopass, position);
|
|
|
| // Only if it does do we signal a transition to still
|
| if (j == still_interval)
|
| @@ -1245,7 +1154,7 @@
|
|
|
| // Read the frame data.
|
| // The return is FALSE (no flash detected) if not a valid frame
|
| - if (read_frame_stats(cpi, &next_frame, offset) != EOF) {
|
| + if (read_frame_stats(&cpi->twopass, &next_frame, offset) != EOF) {
|
| // What we are looking for here is a situation where there is a
|
| // brief break in prediction (such as a flash) but subsequent frames
|
| // are reasonably well predicted by an earlier (pre flash) frame.
|
| @@ -1266,9 +1175,6 @@
|
| double *mv_in_out_accumulator,
|
| double *abs_mv_in_out_accumulator,
|
| double *mv_ratio_accumulator) {
|
| - // double this_frame_mv_in_out;
|
| - double this_frame_mvr_ratio;
|
| - double this_frame_mvc_ratio;
|
| double motion_pct;
|
|
|
| // Accumulate motion stats.
|
| @@ -1283,29 +1189,25 @@
|
| // Accumulate a measure of how uniform (or conversely how random)
|
| // the motion field is. (A ratio of absmv / mv)
|
| if (motion_pct > 0.05) {
|
| - this_frame_mvr_ratio = fabs(this_frame->mvr_abs) /
|
| + double this_frame_mvr_ratio = fabs(this_frame->mvr_abs) /
|
| DOUBLE_DIVIDE_CHECK(fabs(this_frame->MVr));
|
|
|
| - this_frame_mvc_ratio = fabs(this_frame->mvc_abs) /
|
| + double this_frame_mvc_ratio = fabs(this_frame->mvc_abs) /
|
| DOUBLE_DIVIDE_CHECK(fabs(this_frame->MVc));
|
|
|
| - *mv_ratio_accumulator +=
|
| - (this_frame_mvr_ratio < this_frame->mvr_abs)
|
| + *mv_ratio_accumulator += (this_frame_mvr_ratio < this_frame->mvr_abs)
|
| ? (this_frame_mvr_ratio * motion_pct)
|
| : this_frame->mvr_abs * motion_pct;
|
|
|
| - *mv_ratio_accumulator +=
|
| - (this_frame_mvc_ratio < this_frame->mvc_abs)
|
| + *mv_ratio_accumulator += (this_frame_mvc_ratio < this_frame->mvc_abs)
|
| ? (this_frame_mvc_ratio * motion_pct)
|
| : this_frame->mvc_abs * motion_pct;
|
| }
|
| }
|
|
|
| // Calculate a baseline boost number for the current frame.
|
| -static double calc_frame_boost(
|
| - VP9_COMP *cpi,
|
| - FIRSTPASS_STATS *this_frame,
|
| - double this_frame_mv_in_out) {
|
| +static double calc_frame_boost(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame,
|
| + double this_frame_mv_in_out) {
|
| double frame_boost;
|
|
|
| // Underlying boost factor is based on inter intra error ratio
|
| @@ -1326,11 +1228,7 @@
|
| else
|
| frame_boost += frame_boost * (this_frame_mv_in_out / 2.0);
|
|
|
| - // Clip to maximum
|
| - if (frame_boost > GF_RMAX)
|
| - frame_boost = GF_RMAX;
|
| -
|
| - return frame_boost;
|
| + return MIN(frame_boost, GF_RMAX);
|
| }
|
|
|
| static int calc_arf_boost(VP9_COMP *cpi, int offset,
|
| @@ -1350,7 +1248,7 @@
|
|
|
| // Search forward from the proposed arf/next gf position
|
| for (i = 0; i < f_frames; i++) {
|
| - if (read_frame_stats(cpi, &this_frame, (i + offset)) == EOF)
|
| + if (read_frame_stats(&cpi->twopass, &this_frame, (i + offset)) == EOF)
|
| break;
|
|
|
| // Update the motion related elements to the boost calculation
|
| @@ -1387,7 +1285,7 @@
|
|
|
| // Search backward towards last gf position
|
| for (i = -1; i >= -b_frames; i--) {
|
| - if (read_frame_stats(cpi, &this_frame, (i + offset)) == EOF)
|
| + if (read_frame_stats(&cpi->twopass, &this_frame, (i + offset)) == EOF)
|
| break;
|
|
|
| // Update the motion related elements to the boost calculation
|
| @@ -1590,6 +1488,7 @@
|
| int b_boost = 0;
|
| int flash_detected;
|
| int active_max_gf_interval;
|
| + RATE_CONTROL *const rc = &cpi->rc;
|
|
|
| cpi->twopass.gf_group_bits = 0;
|
|
|
| @@ -1604,10 +1503,9 @@
|
| // the GF frame error if we code a normal gf
|
| gf_first_frame_err = mod_frame_err;
|
|
|
| - // Special treatment if the current frame is a key frame (which is also
|
| - // a gf). If it is then its error score (and hence bit allocation) need
|
| - // to be subtracted out from the calculation for the GF group
|
| - if (cpi->common.frame_type == KEY_FRAME)
|
| + // If this is a key frame or the overlay from a previous arf then
|
| + // The error score / cost of this frame has already been accounted for.
|
| + if (cpi->common.frame_type == KEY_FRAME || rc->source_alt_ref_active)
|
| gf_group_err -= gf_first_frame_err;
|
|
|
| // Motion breakout threshold for loop below depends on image size.
|
| @@ -1621,21 +1519,21 @@
|
| // interval to spread the cost of the GF.
|
| //
|
| active_max_gf_interval =
|
| - 11 + ((int)vp9_convert_qindex_to_q(cpi->rc.last_q[INTER_FRAME]) >> 5);
|
| + 12 + ((int)vp9_convert_qindex_to_q(rc->last_q[INTER_FRAME]) >> 5);
|
|
|
| - if (active_max_gf_interval > cpi->rc.max_gf_interval)
|
| - active_max_gf_interval = cpi->rc.max_gf_interval;
|
| + if (active_max_gf_interval > rc->max_gf_interval)
|
| + active_max_gf_interval = rc->max_gf_interval;
|
|
|
| i = 0;
|
| while ((i < cpi->twopass.static_scene_max_gf_interval) &&
|
| - (i < (cpi->rc.frames_to_key - 1))) {
|
| + (i < rc->frames_to_key)) {
|
| i++; // Increment the loop counter
|
|
|
| // Accumulate error score of frames in this gf group
|
| mod_frame_err = calculate_modified_err(cpi, this_frame);
|
| gf_group_err += mod_frame_err;
|
|
|
| - if (EOF == input_stats(cpi, &next_frame))
|
| + if (EOF == input_stats(&cpi->twopass, &next_frame))
|
| break;
|
|
|
| // Test for the case where there is a brief flash but the prediction
|
| @@ -1671,8 +1569,7 @@
|
| }
|
|
|
| // Calculate a boost number for this frame
|
| - boost_score +=
|
| - (decay_accumulator *
|
| + boost_score += (decay_accumulator *
|
| calc_frame_boost(cpi, &next_frame, this_frame_mv_in_out));
|
|
|
| // Break out conditions.
|
| @@ -1700,23 +1597,20 @@
|
| cpi->twopass.gf_zeromotion_pct = (int)(zero_motion_accumulator * 1000.0);
|
|
|
| // Don't allow a gf too near the next kf
|
| - if ((cpi->rc.frames_to_key - i) < MIN_GF_INTERVAL) {
|
| - while (i < (cpi->rc.frames_to_key - 1)) {
|
| + if ((rc->frames_to_key - i) < MIN_GF_INTERVAL) {
|
| + while (i < (rc->frames_to_key + !rc->next_key_frame_forced)) {
|
| i++;
|
|
|
| - if (EOF == input_stats(cpi, this_frame))
|
| + if (EOF == input_stats(&cpi->twopass, this_frame))
|
| break;
|
|
|
| - if (i < cpi->rc.frames_to_key) {
|
| + if (i < rc->frames_to_key) {
|
| mod_frame_err = calculate_modified_err(cpi, this_frame);
|
| gf_group_err += mod_frame_err;
|
| }
|
| }
|
| }
|
|
|
| - // Set the interval until the next gf or arf.
|
| - cpi->rc.baseline_gf_interval = i;
|
| -
|
| #if CONFIG_MULTIPLE_ARF
|
| if (cpi->multi_arf_enabled) {
|
| // Initialize frame coding order variables.
|
| @@ -1729,35 +1623,45 @@
|
| }
|
| #endif
|
|
|
| + // Set the interval until the next gf.
|
| + if (cpi->common.frame_type == KEY_FRAME || rc->source_alt_ref_active)
|
| + rc->baseline_gf_interval = i - 1;
|
| + else
|
| + rc->baseline_gf_interval = i;
|
| +
|
| // Should we use the alternate reference frame
|
| if (allow_alt_ref &&
|
| (i < cpi->oxcf.lag_in_frames) &&
|
| (i >= MIN_GF_INTERVAL) &&
|
| + // for real scene cuts (not forced kfs) dont allow arf very near kf.
|
| + (rc->next_key_frame_forced ||
|
| + (i <= (rc->frames_to_key - MIN_GF_INTERVAL))) &&
|
| ((next_frame.pcnt_inter > 0.75) ||
|
| (next_frame.pcnt_second_ref > 0.5)) &&
|
| ((mv_in_out_accumulator / (double)i > -0.2) ||
|
| (mv_in_out_accumulator > -2.0)) &&
|
| (boost_score > 100)) {
|
| +
|
| // Alternative boost calculation for alt ref
|
| - cpi->rc.gfu_boost = calc_arf_boost(cpi, 0, (i - 1), (i - 1), &f_boost,
|
| - &b_boost);
|
| - cpi->rc.source_alt_ref_pending = 1;
|
| + rc->gfu_boost = calc_arf_boost(cpi, 0, (i - 1), (i - 1), &f_boost,
|
| + &b_boost);
|
| + rc->source_alt_ref_pending = 1;
|
|
|
| #if CONFIG_MULTIPLE_ARF
|
| // Set the ARF schedule.
|
| if (cpi->multi_arf_enabled) {
|
| - schedule_frames(cpi, 0, -(cpi->rc.baseline_gf_interval - 1), 2, 1, 0);
|
| + schedule_frames(cpi, 0, -(rc->baseline_gf_interval - 1), 2, 1, 0);
|
| }
|
| #endif
|
| } else {
|
| - cpi->rc.gfu_boost = (int)boost_score;
|
| - cpi->rc.source_alt_ref_pending = 0;
|
| + rc->gfu_boost = (int)boost_score;
|
| + rc->source_alt_ref_pending = 0;
|
| #if CONFIG_MULTIPLE_ARF
|
| // Set the GF schedule.
|
| if (cpi->multi_arf_enabled) {
|
| - schedule_frames(cpi, 0, cpi->rc.baseline_gf_interval - 1, 2, 0, 0);
|
| + schedule_frames(cpi, 0, rc->baseline_gf_interval - 1, 2, 0, 0);
|
| assert(cpi->new_frame_coding_order_period ==
|
| - cpi->rc.baseline_gf_interval);
|
| + rc->baseline_gf_interval);
|
| }
|
| #endif
|
| }
|
| @@ -1800,18 +1704,6 @@
|
| #endif
|
| #endif
|
|
|
| - // Now decide how many bits should be allocated to the GF group as a
|
| - // proportion of those remaining in the kf group.
|
| - // The final key frame group in the clip is treated as a special case
|
| - // where cpi->twopass.kf_group_bits is tied to cpi->twopass.bits_left.
|
| - // This is also important for short clips where there may only be one
|
| - // key frame.
|
| - if (cpi->rc.frames_to_key >= (int)(cpi->twopass.total_stats.count -
|
| - cpi->common.current_video_frame)) {
|
| - cpi->twopass.kf_group_bits =
|
| - (cpi->twopass.bits_left > 0) ? cpi->twopass.bits_left : 0;
|
| - }
|
| -
|
| // Calculate the bits to be allocated to the group as a whole
|
| if ((cpi->twopass.kf_group_bits > 0) &&
|
| (cpi->twopass.kf_group_error_left > 0)) {
|
| @@ -1829,32 +1721,28 @@
|
|
|
| // Clip cpi->twopass.gf_group_bits based on user supplied data rate
|
| // variability limit (cpi->oxcf.two_pass_vbrmax_section)
|
| - if (cpi->twopass.gf_group_bits >
|
| - (int64_t)max_bits * cpi->rc.baseline_gf_interval)
|
| - cpi->twopass.gf_group_bits =
|
| - (int64_t)max_bits * cpi->rc.baseline_gf_interval;
|
| + if (cpi->twopass.gf_group_bits > (int64_t)max_bits * rc->baseline_gf_interval)
|
| + cpi->twopass.gf_group_bits = (int64_t)max_bits * rc->baseline_gf_interval;
|
|
|
| // Reset the file position
|
| - reset_fpf_position(cpi, start_pos);
|
| + reset_fpf_position(&cpi->twopass, start_pos);
|
|
|
| // Assign bits to the arf or gf.
|
| - for (i = 0;
|
| - i <= (cpi->rc.source_alt_ref_pending &&
|
| - cpi->common.frame_type != KEY_FRAME);
|
| - ++i) {
|
| + for (i = 0; i <= (rc->source_alt_ref_pending &&
|
| + cpi->common.frame_type != KEY_FRAME); ++i) {
|
| int allocation_chunks;
|
| - int q = cpi->rc.last_q[INTER_FRAME];
|
| + int q = rc->last_q[INTER_FRAME];
|
| int gf_bits;
|
|
|
| - int boost = (cpi->rc.gfu_boost * gfboost_qadjust(q)) / 100;
|
| + int boost = (rc->gfu_boost * gfboost_qadjust(q)) / 100;
|
|
|
| // Set max and minimum boost and hence minimum allocation
|
| - boost = clamp(boost, 125, (cpi->rc.baseline_gf_interval + 1) * 200);
|
| + boost = clamp(boost, 125, (rc->baseline_gf_interval + 1) * 200);
|
|
|
| - if (cpi->rc.source_alt_ref_pending && i == 0)
|
| - allocation_chunks = ((cpi->rc.baseline_gf_interval + 1) * 100) + boost;
|
| + if (rc->source_alt_ref_pending && i == 0)
|
| + allocation_chunks = ((rc->baseline_gf_interval + 1) * 100) + boost;
|
| else
|
| - allocation_chunks = (cpi->rc.baseline_gf_interval * 100) + (boost - 100);
|
| + allocation_chunks = (rc->baseline_gf_interval * 100) + (boost - 100);
|
|
|
| // Prevent overflow
|
| if (boost > 1023) {
|
| @@ -1871,10 +1759,10 @@
|
| // If the frame that is to be boosted is simpler than the average for
|
| // the gf/arf group then use an alternative calculation
|
| // based on the error score of the frame itself
|
| - if (mod_frame_err < gf_group_err / (double)cpi->rc.baseline_gf_interval) {
|
| - double alt_gf_grp_bits =
|
| - (double)cpi->twopass.kf_group_bits *
|
| - (mod_frame_err * (double)cpi->rc.baseline_gf_interval) /
|
| + if (rc->baseline_gf_interval < 1 ||
|
| + mod_frame_err < gf_group_err / (double)rc->baseline_gf_interval) {
|
| + double alt_gf_grp_bits = (double)cpi->twopass.kf_group_bits *
|
| + (mod_frame_err * (double)rc->baseline_gf_interval) /
|
| DOUBLE_DIVIDE_CHECK(cpi->twopass.kf_group_error_left);
|
|
|
| int alt_gf_bits = (int)((double)boost * (alt_gf_grp_bits /
|
| @@ -1898,16 +1786,14 @@
|
| if (gf_bits < 0)
|
| gf_bits = 0;
|
|
|
| - // Add in minimum for a frame
|
| - gf_bits += cpi->rc.min_frame_bandwidth;
|
| -
|
| if (i == 0) {
|
| cpi->twopass.gf_bits = gf_bits;
|
| }
|
| - if (i == 1 || (!cpi->rc.source_alt_ref_pending
|
| - && (cpi->common.frame_type != KEY_FRAME))) {
|
| + if (i == 1 ||
|
| + (!rc->source_alt_ref_pending &&
|
| + (cpi->common.frame_type != KEY_FRAME))) {
|
| // Per frame bit target for this frame
|
| - cpi->rc.per_frame_bandwidth = gf_bits;
|
| + rc->per_frame_bandwidth = gf_bits;
|
| }
|
| }
|
|
|
| @@ -1921,9 +1807,11 @@
|
|
|
| // If this is an arf update we want to remove the score for the
|
| // overlay frame at the end which will usually be very cheap to code.
|
| + // The overlay frame has already in effect been coded so we want to spread
|
| + // the remaining bits amoung the other frames/
|
| // For normal GFs remove the score for the GF itself unless this is
|
| // also a key frame in which case it has already been accounted for.
|
| - if (cpi->rc.source_alt_ref_pending) {
|
| + if (rc->source_alt_ref_pending) {
|
| cpi->twopass.gf_group_error_left = (int64_t)gf_group_err - mod_frame_err;
|
| } else if (cpi->common.frame_type != KEY_FRAME) {
|
| cpi->twopass.gf_group_error_left = (int64_t)(gf_group_err
|
| @@ -1932,8 +1820,7 @@
|
| cpi->twopass.gf_group_error_left = (int64_t)gf_group_err;
|
| }
|
|
|
| - cpi->twopass.gf_group_bits -= cpi->twopass.gf_bits
|
| - - cpi->rc.min_frame_bandwidth;
|
| + cpi->twopass.gf_group_bits -= cpi->twopass.gf_bits;
|
|
|
| if (cpi->twopass.gf_group_bits < 0)
|
| cpi->twopass.gf_group_bits = 0;
|
| @@ -1941,9 +1828,8 @@
|
| // This condition could fail if there are two kfs very close together
|
| // despite (MIN_GF_INTERVAL) and would cause a divide by 0 in the
|
| // calculation of alt_extra_bits.
|
| - if (cpi->rc.baseline_gf_interval >= 3) {
|
| - const int boost = cpi->rc.source_alt_ref_pending ?
|
| - b_boost : cpi->rc.gfu_boost;
|
| + if (rc->baseline_gf_interval >= 3) {
|
| + const int boost = rc->source_alt_ref_pending ? b_boost : rc->gfu_boost;
|
|
|
| if (boost >= 150) {
|
| int alt_extra_bits;
|
| @@ -1960,10 +1846,10 @@
|
| FIRSTPASS_STATS sectionstats;
|
|
|
| zero_stats(§ionstats);
|
| - reset_fpf_position(cpi, start_pos);
|
| + reset_fpf_position(&cpi->twopass, start_pos);
|
|
|
| - for (i = 0; i < cpi->rc.baseline_gf_interval; i++) {
|
| - input_stats(cpi, &next_frame);
|
| + for (i = 0; i < rc->baseline_gf_interval; i++) {
|
| + input_stats(&cpi->twopass, &next_frame);
|
| accumulate_stats(§ionstats, &next_frame);
|
| }
|
|
|
| @@ -1973,20 +1859,17 @@
|
| (sectionstats.intra_error /
|
| DOUBLE_DIVIDE_CHECK(sectionstats.coded_error));
|
|
|
| - reset_fpf_position(cpi, start_pos);
|
| + reset_fpf_position(&cpi->twopass, start_pos);
|
| }
|
| }
|
|
|
| // Allocate bits to a normal frame that is neither a gf an arf or a key frame.
|
| static void assign_std_frame_bits(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
|
| int target_frame_size;
|
| -
|
| double modified_err;
|
| double err_fraction;
|
| + const int max_bits = frame_max_bits(cpi); // Max for a single frame.
|
|
|
| - // Max for a single frame.
|
| - int max_bits = frame_max_bits(cpi);
|
| -
|
| // Calculate modified prediction error used in bit allocation.
|
| modified_err = calculate_modified_err(cpi, this_frame);
|
|
|
| @@ -2001,16 +1884,9 @@
|
|
|
| // Clip target size to 0 - max_bits (or cpi->twopass.gf_group_bits) at
|
| // the top end.
|
| - if (target_frame_size < 0) {
|
| - target_frame_size = 0;
|
| - } else {
|
| - if (target_frame_size > max_bits)
|
| - target_frame_size = max_bits;
|
| + target_frame_size = clamp(target_frame_size, 0,
|
| + MIN(max_bits, (int)cpi->twopass.gf_group_bits));
|
|
|
| - if (target_frame_size > cpi->twopass.gf_group_bits)
|
| - target_frame_size = (int)cpi->twopass.gf_group_bits;
|
| - }
|
| -
|
| // Adjust error and bits remaining.
|
| cpi->twopass.gf_group_error_left -= (int64_t)modified_err;
|
| cpi->twopass.gf_group_bits -= target_frame_size;
|
| @@ -2018,185 +1894,15 @@
|
| if (cpi->twopass.gf_group_bits < 0)
|
| cpi->twopass.gf_group_bits = 0;
|
|
|
| - // Add in the minimum number of bits that is set aside for every frame.
|
| - target_frame_size += cpi->rc.min_frame_bandwidth;
|
| -
|
| // Per frame bit target for this frame.
|
| cpi->rc.per_frame_bandwidth = target_frame_size;
|
| }
|
|
|
| -void vp9_get_svc_params(VP9_COMP *cpi) {
|
| - VP9_COMMON *const cm = &cpi->common;
|
| - if ((cm->current_video_frame == 0) ||
|
| - (cm->frame_flags & FRAMEFLAGS_KEY) ||
|
| - (cpi->oxcf.auto_key && (cpi->rc.frames_since_key %
|
| - cpi->key_frame_frequency == 0))) {
|
| - cm->frame_type = KEY_FRAME;
|
| - } else {
|
| - cm->frame_type = INTER_FRAME;
|
| - }
|
| - cpi->rc.frames_till_gf_update_due = INT_MAX;
|
| - cpi->rc.baseline_gf_interval = INT_MAX;
|
| +static int test_for_kf_one_pass(VP9_COMP *cpi) {
|
| + // Placeholder function for auto key frame
|
| + return 0;
|
| }
|
|
|
| -void vp9_get_one_pass_params(VP9_COMP *cpi) {
|
| - VP9_COMMON *const cm = &cpi->common;
|
| - if (!cpi->refresh_alt_ref_frame &&
|
| - (cm->current_video_frame == 0 ||
|
| - cm->frame_flags & FRAMEFLAGS_KEY ||
|
| - (cpi->oxcf.auto_key && (cpi->rc.frames_since_key %
|
| - cpi->key_frame_frequency == 0)))) {
|
| - cm->frame_type = KEY_FRAME;
|
| - } else {
|
| - cm->frame_type = INTER_FRAME;
|
| - }
|
| - if (cpi->rc.frames_till_gf_update_due == 0) {
|
| - cpi->rc.frames_till_gf_update_due = cpi->rc.baseline_gf_interval;
|
| - cpi->refresh_golden_frame = 1;
|
| - }
|
| -}
|
| -
|
| -void vp9_get_first_pass_params(VP9_COMP *cpi) {
|
| - VP9_COMMON *const cm = &cpi->common;
|
| - if (!cpi->refresh_alt_ref_frame &&
|
| - (cm->current_video_frame == 0 ||
|
| - cm->frame_flags & FRAMEFLAGS_KEY)) {
|
| - cm->frame_type = KEY_FRAME;
|
| - } else {
|
| - cm->frame_type = INTER_FRAME;
|
| - }
|
| -}
|
| -
|
| -void vp9_get_second_pass_params(VP9_COMP *cpi) {
|
| - int tmp_q;
|
| - int frames_left = (int)(cpi->twopass.total_stats.count -
|
| - cpi->common.current_video_frame);
|
| -
|
| - FIRSTPASS_STATS this_frame;
|
| - FIRSTPASS_STATS this_frame_copy;
|
| -
|
| - double this_frame_intra_error;
|
| - double this_frame_coded_error;
|
| -
|
| - if (cpi->refresh_alt_ref_frame) {
|
| - cpi->common.frame_type = INTER_FRAME;
|
| - return;
|
| - }
|
| - if (!cpi->twopass.stats_in)
|
| - return;
|
| -
|
| - vp9_clear_system_state();
|
| -
|
| - if (cpi->oxcf.end_usage == USAGE_CONSTANT_QUALITY) {
|
| - cpi->rc.active_worst_quality = cpi->oxcf.cq_level;
|
| - } else if (cpi->common.current_video_frame == 0) {
|
| - // Special case code for first frame.
|
| - int section_target_bandwidth =
|
| - (int)(cpi->twopass.bits_left / frames_left);
|
| -
|
| - // guess at maxq needed in 2nd pass
|
| - cpi->twopass.maxq_max_limit = cpi->rc.worst_quality;
|
| - cpi->twopass.maxq_min_limit = cpi->rc.best_quality;
|
| -
|
| - tmp_q = estimate_max_q(cpi, &cpi->twopass.total_left_stats,
|
| - section_target_bandwidth);
|
| -
|
| - cpi->rc.active_worst_quality = tmp_q;
|
| - cpi->rc.ni_av_qi = tmp_q;
|
| - cpi->rc.avg_q = vp9_convert_qindex_to_q(tmp_q);
|
| -
|
| - // Limit the maxq value returned subsequently.
|
| - // This increases the risk of overspend or underspend if the initial
|
| - // estimate for the clip is bad, but helps prevent excessive
|
| - // variation in Q, especially near the end of a clip
|
| - // where for example a small overspend may cause Q to crash
|
| - // adjust_maxq_qrange(cpi);
|
| - }
|
| - vp9_zero(this_frame);
|
| - if (EOF == input_stats(cpi, &this_frame))
|
| - return;
|
| -
|
| - this_frame_intra_error = this_frame.intra_error;
|
| - this_frame_coded_error = this_frame.coded_error;
|
| -
|
| - // keyframe and section processing !
|
| - if (cpi->rc.frames_to_key == 0) {
|
| - // Define next KF group and assign bits to it
|
| - this_frame_copy = this_frame;
|
| - find_next_key_frame(cpi, &this_frame_copy);
|
| - }
|
| -
|
| - // Is this a GF / ARF (Note that a KF is always also a GF)
|
| - if (cpi->rc.frames_till_gf_update_due == 0) {
|
| - // Define next gf group and assign bits to it
|
| - this_frame_copy = this_frame;
|
| -
|
| -#if CONFIG_MULTIPLE_ARF
|
| - if (cpi->multi_arf_enabled) {
|
| - define_fixed_arf_period(cpi);
|
| - } else {
|
| -#endif
|
| - define_gf_group(cpi, &this_frame_copy);
|
| -#if CONFIG_MULTIPLE_ARF
|
| - }
|
| -#endif
|
| -
|
| - if (cpi->twopass.gf_zeromotion_pct > 995) {
|
| - // As long as max_thresh for encode breakout is small enough, it is ok
|
| - // to enable it for no-show frame, i.e. set enable_encode_breakout to 2.
|
| - if (!cpi->common.show_frame)
|
| - cpi->enable_encode_breakout = 0;
|
| - else
|
| - cpi->enable_encode_breakout = 2;
|
| - }
|
| -
|
| - // If we are going to code an altref frame at the end of the group
|
| - // and the current frame is not a key frame....
|
| - // If the previous group used an arf this frame has already benefited
|
| - // from that arf boost and it should not be given extra bits
|
| - // If the previous group was NOT coded using arf we may want to apply
|
| - // some boost to this GF as well
|
| - if (cpi->rc.source_alt_ref_pending &&
|
| - cpi->common.frame_type != KEY_FRAME) {
|
| - // Assign a standard frames worth of bits from those allocated
|
| - // to the GF group
|
| - int bak = cpi->rc.per_frame_bandwidth;
|
| - this_frame_copy = this_frame;
|
| - assign_std_frame_bits(cpi, &this_frame_copy);
|
| - cpi->rc.per_frame_bandwidth = bak;
|
| - }
|
| - cpi->rc.frames_till_gf_update_due = cpi->rc.baseline_gf_interval;
|
| - cpi->refresh_golden_frame = 1;
|
| - } else {
|
| - // Otherwise this is an ordinary frame
|
| - // Assign bits from those allocated to the GF group
|
| - this_frame_copy = this_frame;
|
| - assign_std_frame_bits(cpi, &this_frame_copy);
|
| - }
|
| -
|
| - // Keep a globally available copy of this and the next frame's iiratio.
|
| - cpi->twopass.this_iiratio = (int)(this_frame_intra_error /
|
| - DOUBLE_DIVIDE_CHECK(this_frame_coded_error));
|
| - {
|
| - FIRSTPASS_STATS next_frame;
|
| - if (lookup_next_frame_stats(cpi, &next_frame) != EOF) {
|
| - cpi->twopass.next_iiratio = (int)(next_frame.intra_error /
|
| - DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
|
| - }
|
| - }
|
| -
|
| - // Set nominal per second bandwidth for this frame
|
| - cpi->target_bandwidth = (int)(cpi->rc.per_frame_bandwidth
|
| - * cpi->output_framerate);
|
| - if (cpi->target_bandwidth < 0)
|
| - cpi->target_bandwidth = 0;
|
| -
|
| - cpi->rc.frames_to_key--;
|
| -
|
| - // Update the total stats remaining structure
|
| - subtract_stats(&cpi->twopass.total_left_stats, &this_frame);
|
| -}
|
| -
|
| static int test_candidate_kf(VP9_COMP *cpi,
|
| FIRSTPASS_STATS *last_frame,
|
| FIRSTPASS_STATS *this_frame,
|
| @@ -2227,7 +1933,6 @@
|
| double boost_score = 0.0;
|
| double old_boost_score = 0.0;
|
| double decay_accumulator = 1.0;
|
| - double next_iiratio;
|
|
|
| local_next_frame = *next_frame;
|
|
|
| @@ -2236,18 +1941,17 @@
|
|
|
| // Examine how well the key frame predicts subsequent frames
|
| for (i = 0; i < 16; i++) {
|
| - next_iiratio = (IIKFACTOR1 * local_next_frame.intra_error /
|
| - DOUBLE_DIVIDE_CHECK(local_next_frame.coded_error));
|
| + double next_iiratio = (IIKFACTOR1 * local_next_frame.intra_error /
|
| + DOUBLE_DIVIDE_CHECK(local_next_frame.coded_error));
|
|
|
| if (next_iiratio > RMAX)
|
| next_iiratio = RMAX;
|
|
|
| // Cumulative effect of decay in prediction quality
|
| if (local_next_frame.pcnt_inter > 0.85)
|
| - decay_accumulator = decay_accumulator * local_next_frame.pcnt_inter;
|
| + decay_accumulator *= local_next_frame.pcnt_inter;
|
| else
|
| - decay_accumulator =
|
| - decay_accumulator * ((0.85 + local_next_frame.pcnt_inter) / 2.0);
|
| + decay_accumulator *= (0.85 + local_next_frame.pcnt_inter) / 2.0;
|
|
|
| // decay_accumulator = decay_accumulator * local_next_frame.pcnt_inter;
|
|
|
| @@ -2269,7 +1973,7 @@
|
| old_boost_score = boost_score;
|
|
|
| // Get the next frame details
|
| - if (EOF == input_stats(cpi, &local_next_frame))
|
| + if (EOF == input_stats(&cpi->twopass, &local_next_frame))
|
| break;
|
| }
|
|
|
| @@ -2279,7 +1983,7 @@
|
| is_viable_kf = 1;
|
| } else {
|
| // Reset the file position
|
| - reset_fpf_position(cpi, start_pos);
|
| + reset_fpf_position(&cpi->twopass, start_pos);
|
|
|
| is_viable_kf = 0;
|
| }
|
| @@ -2306,35 +2010,38 @@
|
| double kf_group_coded_err = 0.0;
|
| double recent_loop_decay[8] = {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0};
|
|
|
| + RATE_CONTROL *const rc = &cpi->rc;
|
| + struct twopass_rc *const twopass = &cpi->twopass;
|
| +
|
| vp9_zero(next_frame);
|
|
|
| vp9_clear_system_state(); // __asm emms;
|
| - start_position = cpi->twopass.stats_in;
|
|
|
| + start_position = twopass->stats_in;
|
| cpi->common.frame_type = KEY_FRAME;
|
|
|
| // is this a forced key frame by interval
|
| - cpi->rc.this_key_frame_forced = cpi->rc.next_key_frame_forced;
|
| + rc->this_key_frame_forced = rc->next_key_frame_forced;
|
|
|
| // Clear the alt ref active flag as this can never be active on a key frame
|
| - cpi->rc.source_alt_ref_active = 0;
|
| + rc->source_alt_ref_active = 0;
|
|
|
| // Kf is always a gf so clear frames till next gf counter
|
| - cpi->rc.frames_till_gf_update_due = 0;
|
| + rc->frames_till_gf_update_due = 0;
|
|
|
| - cpi->rc.frames_to_key = 1;
|
| + rc->frames_to_key = 1;
|
|
|
| // Take a copy of the initial frame details
|
| first_frame = *this_frame;
|
|
|
| - cpi->twopass.kf_group_bits = 0; // Total bits available to kf group
|
| - cpi->twopass.kf_group_error_left = 0; // Group modified error score.
|
| + twopass->kf_group_bits = 0; // Total bits available to kf group
|
| + twopass->kf_group_error_left = 0; // Group modified error score.
|
|
|
| kf_mod_err = calculate_modified_err(cpi, this_frame);
|
|
|
| // find the next keyframe
|
| i = 0;
|
| - while (cpi->twopass.stats_in < cpi->twopass.stats_in_end) {
|
| + while (twopass->stats_in < twopass->stats_in_end) {
|
| // Accumulate kf group error
|
| kf_group_err += calculate_modified_err(cpi, this_frame);
|
|
|
| @@ -2346,11 +2053,11 @@
|
|
|
| // load a the next frame's stats
|
| last_frame = *this_frame;
|
| - input_stats(cpi, this_frame);
|
| + input_stats(twopass, this_frame);
|
|
|
| // Provided that we are not at the end of the file...
|
| - if (cpi->oxcf.auto_key
|
| - && lookup_next_frame_stats(cpi, &next_frame) != EOF) {
|
| + if (cpi->oxcf.auto_key &&
|
| + lookup_next_frame_stats(twopass, &next_frame) != EOF) {
|
| // Normal scene cut check
|
| if (test_candidate_kf(cpi, &last_frame, this_frame, &next_frame))
|
| break;
|
| @@ -2374,14 +2081,14 @@
|
| break;
|
|
|
| // Step on to the next frame
|
| - cpi->rc.frames_to_key++;
|
| + rc->frames_to_key++;
|
|
|
| // If we don't have a real key frame within the next two
|
| // forcekeyframeevery intervals then break out of the loop.
|
| - if (cpi->rc.frames_to_key >= 2 * (int)cpi->key_frame_frequency)
|
| + if (rc->frames_to_key >= 2 * (int)cpi->key_frame_frequency)
|
| break;
|
| } else {
|
| - cpi->rc.frames_to_key++;
|
| + rc->frames_to_key++;
|
| }
|
| i++;
|
| }
|
| @@ -2390,43 +2097,41 @@
|
| // We already breakout of the loop above at 2x max.
|
| // This code centers the extra kf if the actual natural
|
| // interval is between 1x and 2x
|
| - if (cpi->oxcf.auto_key
|
| - && cpi->rc.frames_to_key > (int)cpi->key_frame_frequency) {
|
| - FIRSTPASS_STATS *current_pos = cpi->twopass.stats_in;
|
| + if (cpi->oxcf.auto_key &&
|
| + rc->frames_to_key > (int)cpi->key_frame_frequency) {
|
| FIRSTPASS_STATS tmp_frame;
|
|
|
| - cpi->rc.frames_to_key /= 2;
|
| + rc->frames_to_key /= 2;
|
|
|
| // Copy first frame details
|
| tmp_frame = first_frame;
|
|
|
| // Reset to the start of the group
|
| - reset_fpf_position(cpi, start_position);
|
| + reset_fpf_position(twopass, start_position);
|
|
|
| kf_group_err = 0;
|
| kf_group_intra_err = 0;
|
| kf_group_coded_err = 0;
|
|
|
| // Rescan to get the correct error data for the forced kf group
|
| - for (i = 0; i < cpi->rc.frames_to_key; i++) {
|
| + for (i = 0; i < rc->frames_to_key; i++) {
|
| // Accumulate kf group errors
|
| kf_group_err += calculate_modified_err(cpi, &tmp_frame);
|
| kf_group_intra_err += tmp_frame.intra_error;
|
| kf_group_coded_err += tmp_frame.coded_error;
|
|
|
| // Load a the next frame's stats
|
| - input_stats(cpi, &tmp_frame);
|
| + input_stats(twopass, &tmp_frame);
|
| }
|
| -
|
| - // Reset to the start of the group
|
| - reset_fpf_position(cpi, current_pos);
|
| -
|
| - cpi->rc.next_key_frame_forced = 1;
|
| + rc->next_key_frame_forced = 1;
|
| + } else if (twopass->stats_in == twopass->stats_in_end) {
|
| + rc->next_key_frame_forced = 1;
|
| } else {
|
| - cpi->rc.next_key_frame_forced = 0;
|
| + rc->next_key_frame_forced = 0;
|
| }
|
| - // Special case for the last frame of the file
|
| - if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end) {
|
| +
|
| + // Special case for the last key frame of the file
|
| + if (twopass->stats_in >= twopass->stats_in_end) {
|
| // Accumulate kf group error
|
| kf_group_err += calculate_modified_err(cpi, this_frame);
|
|
|
| @@ -2438,8 +2143,7 @@
|
| }
|
|
|
| // Calculate the number of bits that should be assigned to the kf group.
|
| - if ((cpi->twopass.bits_left > 0) &&
|
| - (cpi->twopass.modified_error_left > 0.0)) {
|
| + if (twopass->bits_left > 0 && twopass->modified_error_left > 0.0) {
|
| // Max for a single normal frame (not key frame)
|
| int max_bits = frame_max_bits(cpi);
|
|
|
| @@ -2448,19 +2152,18 @@
|
|
|
| // Default allocation based on bits left and relative
|
| // complexity of the section
|
| - cpi->twopass.kf_group_bits = (int64_t)(cpi->twopass.bits_left *
|
| - (kf_group_err /
|
| - cpi->twopass.modified_error_left));
|
| + twopass->kf_group_bits = (int64_t)(twopass->bits_left *
|
| + (kf_group_err / twopass->modified_error_left));
|
|
|
| // Clip based on maximum per frame rate defined by the user.
|
| - max_grp_bits = (int64_t)max_bits * (int64_t)cpi->rc.frames_to_key;
|
| - if (cpi->twopass.kf_group_bits > max_grp_bits)
|
| - cpi->twopass.kf_group_bits = max_grp_bits;
|
| + max_grp_bits = (int64_t)max_bits * (int64_t)rc->frames_to_key;
|
| + if (twopass->kf_group_bits > max_grp_bits)
|
| + twopass->kf_group_bits = max_grp_bits;
|
| } else {
|
| - cpi->twopass.kf_group_bits = 0;
|
| + twopass->kf_group_bits = 0;
|
| }
|
| // Reset the first pass file position
|
| - reset_fpf_position(cpi, start_position);
|
| + reset_fpf_position(twopass, start_position);
|
|
|
| // Determine how big to make this keyframe based on how well the subsequent
|
| // frames use inter blocks.
|
| @@ -2469,10 +2172,10 @@
|
| loop_decay_rate = 1.00; // Starting decay rate
|
|
|
| // Scan through the kf group collating various stats.
|
| - for (i = 0; i < cpi->rc.frames_to_key; i++) {
|
| + for (i = 0; i < rc->frames_to_key; i++) {
|
| double r;
|
|
|
| - if (EOF == input_stats(cpi, &next_frame))
|
| + if (EOF == input_stats(twopass, &next_frame))
|
| break;
|
|
|
| // Monitor for static sections.
|
| @@ -2483,12 +2186,12 @@
|
| }
|
|
|
| // For the first few frames collect data to decide kf boost.
|
| - if (i <= (cpi->rc.max_gf_interval * 2)) {
|
| - if (next_frame.intra_error > cpi->twopass.kf_intra_err_min)
|
| + if (i <= (rc->max_gf_interval * 2)) {
|
| + if (next_frame.intra_error > twopass->kf_intra_err_min)
|
| r = (IIKFACTOR2 * next_frame.intra_error /
|
| DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
|
| else
|
| - r = (IIKFACTOR2 * cpi->twopass.kf_intra_err_min /
|
| + r = (IIKFACTOR2 * twopass->kf_intra_err_min /
|
| DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
|
|
|
| if (r > RMAX)
|
| @@ -2497,7 +2200,7 @@
|
| // How fast is prediction quality decaying
|
| if (!detect_flash(cpi, 0)) {
|
| loop_decay_rate = get_prediction_decay_rate(cpi, &next_frame);
|
| - decay_accumulator = decay_accumulator * loop_decay_rate;
|
| + decay_accumulator *= loop_decay_rate;
|
| decay_accumulator = decay_accumulator < MIN_DECAY_FACTOR
|
| ? MIN_DECAY_FACTOR : decay_accumulator;
|
| }
|
| @@ -2510,22 +2213,21 @@
|
| FIRSTPASS_STATS sectionstats;
|
|
|
| zero_stats(§ionstats);
|
| - reset_fpf_position(cpi, start_position);
|
| + reset_fpf_position(twopass, start_position);
|
|
|
| - for (i = 0; i < cpi->rc.frames_to_key; i++) {
|
| - input_stats(cpi, &next_frame);
|
| + for (i = 0; i < rc->frames_to_key; i++) {
|
| + input_stats(twopass, &next_frame);
|
| accumulate_stats(§ionstats, &next_frame);
|
| }
|
|
|
| avg_stats(§ionstats);
|
|
|
| - cpi->twopass.section_intra_rating = (int)
|
| - (sectionstats.intra_error
|
| - / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error));
|
| + twopass->section_intra_rating = (int) (sectionstats.intra_error /
|
| + DOUBLE_DIVIDE_CHECK(sectionstats.coded_error));
|
| }
|
|
|
| // Reset the first pass file position
|
| - reset_fpf_position(cpi, start_position);
|
| + reset_fpf_position(twopass, start_position);
|
|
|
| // Work out how many bits to allocate for the key frame itself
|
| if (1) {
|
| @@ -2533,16 +2235,16 @@
|
| int allocation_chunks;
|
| int alt_kf_bits;
|
|
|
| - if (kf_boost < (cpi->rc.frames_to_key * 3))
|
| - kf_boost = (cpi->rc.frames_to_key * 3);
|
| + if (kf_boost < (rc->frames_to_key * 3))
|
| + kf_boost = (rc->frames_to_key * 3);
|
|
|
| if (kf_boost < 300) // Min KF boost
|
| kf_boost = 300;
|
|
|
| // Make a note of baseline boost and the zero motion
|
| // accumulator value for use elsewhere.
|
| - cpi->rc.kf_boost = kf_boost;
|
| - cpi->twopass.kf_zeromotion_pct = (int)(zero_motion_accumulator * 100.0);
|
| + rc->kf_boost = kf_boost;
|
| + twopass->kf_zeromotion_pct = (int)(zero_motion_accumulator * 100.0);
|
|
|
| // We do three calculations for kf size.
|
| // The first is based on the error score for the whole kf group.
|
| @@ -2557,11 +2259,9 @@
|
| // cpi->rc.frames_to_key-1 because key frame itself is taken
|
| // care of by kf_boost.
|
| if (zero_motion_accumulator >= 0.99) {
|
| - allocation_chunks =
|
| - ((cpi->rc.frames_to_key - 1) * 10) + kf_boost;
|
| + allocation_chunks = ((rc->frames_to_key - 1) * 10) + kf_boost;
|
| } else {
|
| - allocation_chunks =
|
| - ((cpi->rc.frames_to_key - 1) * 100) + kf_boost;
|
| + allocation_chunks = ((rc->frames_to_key - 1) * 100) + kf_boost;
|
| }
|
|
|
| // Prevent overflow
|
| @@ -2571,78 +2271,240 @@
|
| allocation_chunks /= divisor;
|
| }
|
|
|
| - cpi->twopass.kf_group_bits =
|
| - (cpi->twopass.kf_group_bits < 0) ? 0 : cpi->twopass.kf_group_bits;
|
| + twopass->kf_group_bits = (twopass->kf_group_bits < 0) ? 0
|
| + : twopass->kf_group_bits;
|
|
|
| // Calculate the number of bits to be spent on the key frame
|
| - cpi->twopass.kf_bits =
|
| - (int)((double)kf_boost *
|
| - ((double)cpi->twopass.kf_group_bits / (double)allocation_chunks));
|
| + twopass->kf_bits = (int)((double)kf_boost *
|
| + ((double)twopass->kf_group_bits / allocation_chunks));
|
|
|
| // If the key frame is actually easier than the average for the
|
| // kf group (which does sometimes happen... eg a blank intro frame)
|
| // Then use an alternate calculation based on the kf error score
|
| // which should give a smaller key frame.
|
| - if (kf_mod_err < kf_group_err / cpi->rc.frames_to_key) {
|
| - double alt_kf_grp_bits =
|
| - ((double)cpi->twopass.bits_left *
|
| - (kf_mod_err * (double)cpi->rc.frames_to_key) /
|
| - DOUBLE_DIVIDE_CHECK(cpi->twopass.modified_error_left));
|
| + if (kf_mod_err < kf_group_err / rc->frames_to_key) {
|
| + double alt_kf_grp_bits = ((double)twopass->bits_left *
|
| + (kf_mod_err * (double)rc->frames_to_key) /
|
| + DOUBLE_DIVIDE_CHECK(twopass->modified_error_left));
|
|
|
| alt_kf_bits = (int)((double)kf_boost *
|
| (alt_kf_grp_bits / (double)allocation_chunks));
|
|
|
| - if (cpi->twopass.kf_bits > alt_kf_bits) {
|
| - cpi->twopass.kf_bits = alt_kf_bits;
|
| - }
|
| + if (twopass->kf_bits > alt_kf_bits)
|
| + twopass->kf_bits = alt_kf_bits;
|
| } else {
|
| // Else if it is much harder than other frames in the group make sure
|
| // it at least receives an allocation in keeping with its relative
|
| // error score
|
| - alt_kf_bits =
|
| - (int)((double)cpi->twopass.bits_left *
|
| - (kf_mod_err /
|
| - DOUBLE_DIVIDE_CHECK(cpi->twopass.modified_error_left)));
|
| + alt_kf_bits = (int)((double)twopass->bits_left * (kf_mod_err /
|
| + DOUBLE_DIVIDE_CHECK(twopass->modified_error_left)));
|
|
|
| - if (alt_kf_bits > cpi->twopass.kf_bits) {
|
| - cpi->twopass.kf_bits = alt_kf_bits;
|
| + if (alt_kf_bits > twopass->kf_bits) {
|
| + twopass->kf_bits = alt_kf_bits;
|
| }
|
| }
|
|
|
| - cpi->twopass.kf_group_bits -= cpi->twopass.kf_bits;
|
| - // Add in the minimum frame allowance
|
| - cpi->twopass.kf_bits += cpi->rc.min_frame_bandwidth;
|
| + twopass->kf_group_bits -= twopass->kf_bits;
|
|
|
| // Peer frame bit target for this frame
|
| - cpi->rc.per_frame_bandwidth = cpi->twopass.kf_bits;
|
| + rc->per_frame_bandwidth = twopass->kf_bits;
|
| // Convert to a per second bitrate
|
| - cpi->target_bandwidth = (int)(cpi->twopass.kf_bits *
|
| - cpi->output_framerate);
|
| + cpi->target_bandwidth = (int)(twopass->kf_bits * cpi->output_framerate);
|
| }
|
|
|
| // Note the total error score of the kf group minus the key frame itself
|
| - cpi->twopass.kf_group_error_left = (int)(kf_group_err - kf_mod_err);
|
| + twopass->kf_group_error_left = (int)(kf_group_err - kf_mod_err);
|
|
|
| // Adjust the count of total modified error left.
|
| // The count of bits left is adjusted elsewhere based on real coded frame
|
| // sizes.
|
| - cpi->twopass.modified_error_left -= kf_group_err;
|
| + twopass->modified_error_left -= kf_group_err;
|
| }
|
|
|
| +void vp9_get_svc_params(VP9_COMP *cpi) {
|
| + VP9_COMMON *const cm = &cpi->common;
|
| + if ((cm->current_video_frame == 0) ||
|
| + (cm->frame_flags & FRAMEFLAGS_KEY) ||
|
| + (cpi->oxcf.auto_key && (cpi->rc.frames_since_key %
|
| + cpi->key_frame_frequency == 0))) {
|
| + cm->frame_type = KEY_FRAME;
|
| + } else {
|
| + cm->frame_type = INTER_FRAME;
|
| + }
|
| + cpi->rc.frames_till_gf_update_due = INT_MAX;
|
| + cpi->rc.baseline_gf_interval = INT_MAX;
|
| +}
|
| +
|
| +void vp9_get_one_pass_params(VP9_COMP *cpi) {
|
| + VP9_COMMON *const cm = &cpi->common;
|
| + if (!cpi->refresh_alt_ref_frame &&
|
| + (cm->current_video_frame == 0 ||
|
| + cm->frame_flags & FRAMEFLAGS_KEY ||
|
| + cpi->rc.frames_to_key == 0 ||
|
| + (cpi->oxcf.auto_key && test_for_kf_one_pass(cpi)))) {
|
| + cm->frame_type = KEY_FRAME;
|
| + cpi->rc.this_key_frame_forced = cm->current_video_frame != 0 &&
|
| + cpi->rc.frames_to_key == 0;
|
| + cpi->rc.frames_to_key = cpi->key_frame_frequency;
|
| + cpi->rc.kf_boost = 300;
|
| + } else {
|
| + cm->frame_type = INTER_FRAME;
|
| + }
|
| + if (cpi->rc.frames_till_gf_update_due == 0) {
|
| + cpi->rc.frames_till_gf_update_due = cpi->rc.baseline_gf_interval;
|
| + cpi->refresh_golden_frame = 1;
|
| + }
|
| +}
|
| +
|
| +void vp9_get_one_pass_cbr_params(VP9_COMP *cpi) {
|
| + VP9_COMMON *const cm = &cpi->common;
|
| + if ((cm->current_video_frame == 0 ||
|
| + cm->frame_flags & FRAMEFLAGS_KEY ||
|
| + cpi->rc.frames_to_key == 0 ||
|
| + (cpi->oxcf.auto_key && test_for_kf_one_pass(cpi)))) {
|
| + cm->frame_type = KEY_FRAME;
|
| + cpi->rc.this_key_frame_forced = cm->current_video_frame != 0 &&
|
| + cpi->rc.frames_to_key == 0;
|
| + cpi->rc.frames_to_key = cpi->key_frame_frequency;
|
| + cpi->rc.kf_boost = 300;
|
| + } else {
|
| + cm->frame_type = INTER_FRAME;
|
| + }
|
| + // Don't use gf_update by default in CBR mode.
|
| + cpi->rc.frames_till_gf_update_due = INT_MAX;
|
| + cpi->rc.baseline_gf_interval = INT_MAX;
|
| +}
|
| +
|
| +void vp9_get_first_pass_params(VP9_COMP *cpi) {
|
| + VP9_COMMON *const cm = &cpi->common;
|
| + if (!cpi->refresh_alt_ref_frame &&
|
| + (cm->current_video_frame == 0 ||
|
| + cm->frame_flags & FRAMEFLAGS_KEY)) {
|
| + cm->frame_type = KEY_FRAME;
|
| + } else {
|
| + cm->frame_type = INTER_FRAME;
|
| + }
|
| + // Do not use periodic key frames
|
| + cpi->rc.frames_to_key = INT_MAX;
|
| +}
|
| +
|
| +void vp9_get_second_pass_params(VP9_COMP *cpi) {
|
| + int tmp_q;
|
| + int frames_left = (int)(cpi->twopass.total_stats.count -
|
| + cpi->common.current_video_frame);
|
| +
|
| + FIRSTPASS_STATS this_frame;
|
| + FIRSTPASS_STATS this_frame_copy;
|
| + RATE_CONTROL *rc = &cpi->rc;
|
| +
|
| + double this_frame_intra_error;
|
| + double this_frame_coded_error;
|
| +
|
| + if (cpi->refresh_alt_ref_frame) {
|
| + cpi->common.frame_type = INTER_FRAME;
|
| + return;
|
| + }
|
| + if (!cpi->twopass.stats_in)
|
| + return;
|
| +
|
| + vp9_clear_system_state();
|
| +
|
| + if (cpi->oxcf.end_usage == USAGE_CONSTANT_QUALITY) {
|
| + rc->active_worst_quality = cpi->oxcf.cq_level;
|
| + } else if (cpi->common.current_video_frame == 0) {
|
| + // Special case code for first frame.
|
| + int section_target_bandwidth =
|
| + (int)(cpi->twopass.bits_left / frames_left);
|
| +
|
| + tmp_q = estimate_max_q(cpi, &cpi->twopass.total_left_stats,
|
| + section_target_bandwidth);
|
| +
|
| + rc->active_worst_quality = tmp_q;
|
| + rc->ni_av_qi = tmp_q;
|
| + rc->avg_q = vp9_convert_qindex_to_q(tmp_q);
|
| +
|
| + // Limit the maxq value returned subsequently.
|
| + // This increases the risk of overspend or underspend if the initial
|
| + // estimate for the clip is bad, but helps prevent excessive
|
| + // variation in Q, especially near the end of a clip
|
| + // where for example a small overspend may cause Q to crash
|
| + // adjust_maxq_qrange(cpi);
|
| + }
|
| + vp9_zero(this_frame);
|
| + if (EOF == input_stats(&cpi->twopass, &this_frame))
|
| + return;
|
| +
|
| + this_frame_intra_error = this_frame.intra_error;
|
| + this_frame_coded_error = this_frame.coded_error;
|
| +
|
| + // keyframe and section processing !
|
| + if (rc->frames_to_key == 0 ||
|
| + (cpi->common.frame_flags & FRAMEFLAGS_KEY)) {
|
| + // Define next KF group and assign bits to it
|
| + this_frame_copy = this_frame;
|
| + find_next_key_frame(cpi, &this_frame_copy);
|
| + } else {
|
| + cpi->common.frame_type = INTER_FRAME;
|
| + }
|
| +
|
| + // Is this a GF / ARF (Note that a KF is always also a GF)
|
| + if (rc->frames_till_gf_update_due == 0) {
|
| + // Define next gf group and assign bits to it
|
| + this_frame_copy = this_frame;
|
| +
|
| +#if CONFIG_MULTIPLE_ARF
|
| + if (cpi->multi_arf_enabled) {
|
| + define_fixed_arf_period(cpi);
|
| + } else {
|
| +#endif
|
| + define_gf_group(cpi, &this_frame_copy);
|
| +#if CONFIG_MULTIPLE_ARF
|
| + }
|
| +#endif
|
| +
|
| + if (cpi->twopass.gf_zeromotion_pct > 995) {
|
| + // As long as max_thresh for encode breakout is small enough, it is ok
|
| + // to enable it for no-show frame, i.e. set enable_encode_breakout to 2.
|
| + if (!cpi->common.show_frame)
|
| + cpi->enable_encode_breakout = 0;
|
| + else
|
| + cpi->enable_encode_breakout = 2;
|
| + }
|
| +
|
| + rc->frames_till_gf_update_due = rc->baseline_gf_interval;
|
| + cpi->refresh_golden_frame = 1;
|
| + } else {
|
| + // Otherwise this is an ordinary frame
|
| + // Assign bits from those allocated to the GF group
|
| + this_frame_copy = this_frame;
|
| + assign_std_frame_bits(cpi, &this_frame_copy);
|
| + }
|
| +
|
| + // Keep a globally available copy of this and the next frame's iiratio.
|
| + cpi->twopass.this_iiratio = (int)(this_frame_intra_error /
|
| + DOUBLE_DIVIDE_CHECK(this_frame_coded_error));
|
| + {
|
| + FIRSTPASS_STATS next_frame;
|
| + if (lookup_next_frame_stats(&cpi->twopass, &next_frame) != EOF) {
|
| + cpi->twopass.next_iiratio = (int)(next_frame.intra_error /
|
| + DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
|
| + }
|
| + }
|
| +
|
| + // Set nominal per second bandwidth for this frame
|
| + cpi->target_bandwidth = (int)(rc->per_frame_bandwidth *
|
| + cpi->output_framerate);
|
| + if (cpi->target_bandwidth < 0)
|
| + cpi->target_bandwidth = 0;
|
| +
|
| + // Update the total stats remaining structure
|
| + subtract_stats(&cpi->twopass.total_left_stats, &this_frame);
|
| +}
|
| +
|
| void vp9_twopass_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) {
|
| #ifdef DISABLE_RC_LONG_TERM_MEM
|
| cpi->twopass.bits_left -= cpi->rc.this_frame_target;
|
| #else
|
| cpi->twopass.bits_left -= 8 * bytes_used;
|
| #endif
|
| - if (!cpi->refresh_alt_ref_frame) {
|
| - double lower_bounds_min_rate = FRAME_OVERHEAD_BITS * cpi->oxcf.framerate;
|
| - double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth *
|
| - cpi->oxcf.two_pass_vbrmin_section
|
| - / 100);
|
| - if (two_pass_min_rate < lower_bounds_min_rate)
|
| - two_pass_min_rate = lower_bounds_min_rate;
|
| - cpi->twopass.bits_left += (int64_t)(two_pass_min_rate /
|
| - cpi->oxcf.framerate);
|
| - }
|
| }
|
|
|
Chromium Code Reviews
Issue 148913004:
libvpx: Pull from upstream (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/