ref: bed0be5b22ade9c0d9d64c4c27a27287582291b1
parent: cca8a54cddff214d330609077d2275926b6932a4
parent: 120f2144d2d8c64882d55dd45a5246c8a5ae7b03
author: Adrian Grange <agrange@google.com>
date: Mon Feb 17 02:27:32 EST 2014
Merge "Change post- to pre-increment."
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -65,7 +65,7 @@
double target_q = (vp9_convert_qindex_to_q(qindex) * 0.5847) + 1.0;
- for (i = 0; i < QINDEX_RANGE; i++) {+ for (i = 0; i < QINDEX_RANGE; ++i) { if (target_q <= vp9_convert_qindex_to_q(i)) {ret_val = i;
break;
@@ -399,7 +399,7 @@
// Refine the motion search range according to the frame dimension
// for first pass test.
while ((quart_frm << sr) < MAX_FULL_PEL_VAL)
- sr++;
+ ++sr;
step_param += sr;
further_steps -= sr;
@@ -427,10 +427,10 @@
num00 = 0;
while (n < further_steps) {- n++;
+ ++n;
if (num00) {- num00--;
+ --num00;
} else {tmp_err = cpi->diamond_search_sad(x, &ref_mv_full, &tmp_mv,
step_param + n, x->sadperbit16,
@@ -522,7 +522,7 @@
// Tiling is ignored in the first pass.
vp9_tile_init(&tile, cm, 0, 0);
- for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {+ for (mb_row = 0; mb_row < cm->mb_rows; ++mb_row) {int_mv best_ref_mv;
best_ref_mv.as_int = 0;
@@ -538,7 +538,7 @@
x->mv_row_max = ((cm->mb_rows - 1 - mb_row) * 16)
+ BORDER_MV_PIXELS_B16;
- for (mb_col = 0; mb_col < cm->mb_cols; mb_col++) {+ for (mb_col = 0; mb_col < cm->mb_cols; ++mb_col) {int this_error;
const int use_dc_pred = (mb_col || mb_row) && (!mb_col || !mb_row);
double error_weight = 1.0;
@@ -638,7 +638,7 @@
}
if (gf_motion_error < motion_error && gf_motion_error < this_error)
- second_ref_count++;
+ ++second_ref_count;
// Reset to last frame as reference buffer.
xd->plane[0].pre[0].buf = lst_yv12->y_buffer + recon_yoffset;
@@ -665,7 +665,7 @@
// cropped clips with black bars at the sides or top and bottom.
if (((this_error - intrapenalty) * 9 <= motion_error * 10) &&
this_error < 2 * intrapenalty)
- neutral_count++;
+ ++neutral_count;
mv.as_mv.row *= 8;
mv.as_mv.col *= 8;
@@ -682,42 +682,42 @@
sum_mvc_abs += abs(mv.as_mv.col);
sum_mvrs += mv.as_mv.row * mv.as_mv.row;
sum_mvcs += mv.as_mv.col * mv.as_mv.col;
- intercount++;
+ ++intercount;
best_ref_mv.as_int = mv.as_int;
if (mv.as_int) {- mvcount++;
+ ++mvcount;
// Non-zero vector, was it different from the last non zero vector?
if (mv.as_int != lastmv_as_int)
- new_mv_count++;
+ ++new_mv_count;
lastmv_as_int = mv.as_int;
// Does the row vector point inwards or outwards?
if (mb_row < cm->mb_rows / 2) {if (mv.as_mv.row > 0)
- sum_in_vectors--;
+ --sum_in_vectors;
else if (mv.as_mv.row < 0)
- sum_in_vectors++;
+ ++sum_in_vectors;
} else if (mb_row > cm->mb_rows / 2) {if (mv.as_mv.row > 0)
- sum_in_vectors++;
+ ++sum_in_vectors;
else if (mv.as_mv.row < 0)
- sum_in_vectors--;
+ --sum_in_vectors;
}
// Does the col vector point inwards or outwards?
if (mb_col < cm->mb_cols / 2) {if (mv.as_mv.col > 0)
- sum_in_vectors--;
+ --sum_in_vectors;
else if (mv.as_mv.col < 0)
- sum_in_vectors++;
+ ++sum_in_vectors;
} else if (mb_col > cm->mb_cols / 2) {if (mv.as_mv.col > 0)
- sum_in_vectors++;
+ ++sum_in_vectors;
else if (mv.as_mv.col < 0)
- sum_in_vectors--;
+ --sum_in_vectors;
}
}
}
@@ -802,7 +802,7 @@
vp8_yv12_copy_frame(lst_yv12, gld_yv12);
twopass->sr_update_lag = 1;
} else {- 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);
@@ -830,7 +830,7 @@
fclose(recon_file);
}
- cm->current_video_frame++;
+ ++cm->current_video_frame;
}
// Estimate a cost per mb attributable to overheads such as the coding of modes
@@ -910,7 +910,7 @@
// Try and pick a max Q that will be high enough to encode the
// content at the given rate.
- for (q = rc->best_quality; q < rc->worst_quality; q++) {+ 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,
@@ -1045,7 +1045,7 @@
FIRSTPASS_STATS tmp_next_frame;
// Look ahead a few frames to see if static condition persists...
- for (j = 0; j < still_interval; j++) {+ for (j = 0; j < still_interval; ++j) {if (EOF == input_stats(&cpi->twopass, &tmp_next_frame))
break;
@@ -1164,7 +1164,7 @@
int flash_detected = 0;
// Search forward from the proposed arf/next gf position.
- for (i = 0; i < f_frames; i++) {+ for (i = 0; i < f_frames; ++i) {if (read_frame_stats(twopass, &this_frame, (i + offset)) == EOF)
break;
@@ -1201,7 +1201,7 @@
abs_mv_in_out_accumulator = 0.0;
// Search backward towards last gf position.
- for (i = -1; i >= -b_frames; i--) {+ for (i = -1; i >= -b_frames; --i) {if (read_frame_stats(twopass, &this_frame, (i + offset)) == EOF)
break;
@@ -1443,7 +1443,7 @@
i = 0;
while (i < twopass->static_scene_max_gf_interval && i < rc->frames_to_key) {- i++;
+ ++i;
// Accumulate error score of frames in this gf group.
mod_frame_err = calculate_modified_err(cpi, this_frame);
@@ -1515,7 +1515,7 @@
// Don't allow a gf too near the next kf.
if ((rc->frames_to_key - i) < MIN_GF_INTERVAL) { while (i < (rc->frames_to_key + !rc->next_key_frame_forced)) {- i++;
+ ++i;
if (EOF == input_stats(twopass, this_frame))
break;
@@ -1752,7 +1752,7 @@
zero_stats(§ionstats);
reset_fpf_position(twopass, start_pos);
- for (i = 0; i < rc->baseline_gf_interval; i++) {+ for (i = 0; i < rc->baseline_gf_interval; ++i) {input_stats(twopass, &next_frame);
accumulate_stats(§ionstats, &next_frame);
}
@@ -1837,7 +1837,7 @@
start_pos = cpi->twopass.stats_in;
// Examine how well the key frame predicts subsequent frames.
- for (i = 0; i < 16; i++) {+ for (i = 0; i < 16; ++i) {double next_iiratio = (IIKFACTOR1 * local_next_frame.intra_error /
DOUBLE_DIVIDE_CHECK(local_next_frame.coded_error));
@@ -1956,7 +1956,7 @@
// quality since the last GF or KF.
recent_loop_decay[i % 8] = loop_decay_rate;
decay_accumulator = 1.0;
- for (j = 0; j < 8; j++)
+ for (j = 0; j < 8; ++j)
decay_accumulator *= recent_loop_decay[j];
// Special check for transition or high motion followed by a
@@ -1966,7 +1966,7 @@
break;
// Step on to the next frame.
- rc->frames_to_key++;
+ ++rc->frames_to_key;
// If we don't have a real key frame within the next two
// key_frame_frequency intervals then break out of the loop.
@@ -1975,7 +1975,7 @@
} else {++rc->frames_to_key;
}
- i++;
+ ++i;
}
// If there is a max kf interval set by the user we must obey it.
@@ -1997,7 +1997,7 @@
kf_group_err = 0;
// Rescan to get the correct error data for the forced kf group.
- for (i = 0; i < 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);
@@ -2046,7 +2046,7 @@
boost_score = 0.0;
// Scan through the kf group collating various stats.
- for (i = 0; i < rc->frames_to_key; i++) {+ for (i = 0; i < rc->frames_to_key; ++i) {double r;
if (EOF == input_stats(twopass, &next_frame))
@@ -2089,7 +2089,7 @@
zero_stats(§ionstats);
reset_fpf_position(twopass, start_position);
- for (i = 0; i < rc->frames_to_key; i++) {+ for (i = 0; i < rc->frames_to_key; ++i) {input_stats(twopass, &next_frame);
accumulate_stats(§ionstats, &next_frame);
}
--
⑨