ref: 28d1c0535d21e13754ff1b259ab7caf113cf8e12
parent: 175b36cb6d2811c721d63277ba953ea817f32361
parent: a673b4f4afb6591d48ffc5c74b539771e28e0f69
author: Marco Paniconi <[email protected]>
date: Thu Oct 12 15:36:33 EDT 2017
Merge "Adjust to scene detection for 1 pass vbr."
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -2280,8 +2280,10 @@
uint64_t avg_sad_current = 0;
uint32_t min_thresh = 4000;
float thresh = 8.0f;
+ uint32_t thresh_key = 140000;
+ if (cpi->oxcf.speed <= 5) thresh_key = 240000;
if (cpi->oxcf.rc_mode == VPX_VBR) {- min_thresh = 70000;
+ min_thresh = 65000;
thresh = 2.1f;
}
if (cpi->oxcf.lag_in_frames > 0) {@@ -2307,7 +2309,7 @@
rc->high_source_sad = 1;
else
rc->high_source_sad = 0;
- if (rc->high_source_sad && avg_sad_current > min_thresh << 1)
+ if (rc->high_source_sad && avg_sad_current > thresh_key)
scene_cut_force_key_frame = 1;
// Update recursive average for current frame.
if (avg_sad_current > 0)
@@ -2369,7 +2371,7 @@
rc->high_source_sad = 1;
else
rc->high_source_sad = 0;
- if (rc->high_source_sad && avg_sad > min_thresh << 1)
+ if (rc->high_source_sad && avg_sad > thresh_key)
scene_cut_force_key_frame = 1;
if (avg_sad > 0 || cpi->oxcf.rc_mode == VPX_CBR)
rc->avg_source_sad[0] = (3 * rc->avg_source_sad[0] + avg_sad) >> 2;
@@ -2402,8 +2404,7 @@
cpi->ext_refresh_frame_flags_pending == 0) {int target;
cpi->refresh_golden_frame = 1;
- if (cpi->oxcf.speed >= 6 && scene_cut_force_key_frame)
- cm->frame_type = KEY_FRAME;
+ if (scene_cut_force_key_frame) cm->frame_type = KEY_FRAME;
rc->source_alt_ref_pending = 0;
if (cpi->sf.use_altref_onepass && cpi->oxcf.enable_auto_arf)
rc->source_alt_ref_pending = 1;