Commit 7a586cad authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review

Merge "Remove gf_zeromotion_pct."

parents b9016666 4328b085
...@@ -2115,8 +2115,6 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { ...@@ -2115,8 +2115,6 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
old_boost_score = boost_score; old_boost_score = boost_score;
} }
twopass->gf_zeromotion_pct = (int)(zero_motion_accumulator * 1000.0);
// Was the group length constrained by the requirement for a new KF? // Was the group length constrained by the requirement for a new KF?
rc->constrained_gf_group = (i >= rc->frames_to_key) ? 1 : 0; rc->constrained_gf_group = (i >= rc->frames_to_key) ? 1 : 0;
...@@ -2892,7 +2890,6 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) { ...@@ -2892,7 +2890,6 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) {
// If the rate control is drifting consider adjustment to min or maxq. // If the rate control is drifting consider adjustment to min or maxq.
if ((cpi->oxcf.rc_mode != VPX_Q) && if ((cpi->oxcf.rc_mode != VPX_Q) &&
(cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD) &&
!cpi->rc.is_src_frame_alt_ref) { !cpi->rc.is_src_frame_alt_ref) {
const int maxq_adj_limit = const int maxq_adj_limit =
rc->worst_quality - twopass->active_worst_quality; rc->worst_quality - twopass->active_worst_quality;
......
...@@ -39,8 +39,6 @@ typedef struct { ...@@ -39,8 +39,6 @@ typedef struct {
} FIRSTPASS_MB_STATS; } FIRSTPASS_MB_STATS;
#endif #endif
#define VLOW_MOTION_THRESHOLD 950
typedef struct { typedef struct {
double frame; double frame;
double weight; double weight;
...@@ -131,7 +129,6 @@ typedef struct { ...@@ -131,7 +129,6 @@ typedef struct {
int kf_zeromotion_pct; int kf_zeromotion_pct;
int last_kfgroup_zeromotion_pct; int last_kfgroup_zeromotion_pct;
int gf_zeromotion_pct;
int active_worst_quality; int active_worst_quality;
int baseline_active_worst_quality; int baseline_active_worst_quality;
int extend_minq; int extend_minq;
......
...@@ -1160,8 +1160,7 @@ static int rc_pick_q_and_bounds_two_pass(const VP9_COMP *cpi, ...@@ -1160,8 +1160,7 @@ static int rc_pick_q_and_bounds_two_pass(const VP9_COMP *cpi,
// Extension to max or min Q if undershoot or overshoot is outside // Extension to max or min Q if undershoot or overshoot is outside
// the permitted range. // the permitted range.
if ((cpi->oxcf.rc_mode != VPX_Q) && if (cpi->oxcf.rc_mode != VPX_Q) {
(cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD)) {
if (frame_is_intra_only(cm) || if (frame_is_intra_only(cm) ||
(!rc->is_src_frame_alt_ref && (!rc->is_src_frame_alt_ref &&
(cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame))) { (cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment