shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Adjustments for aq-mode and pickmode for speed >= 8."

--- a/vp9/encoder/vp9_aq_cyclicrefresh.c

+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c

@@ -425,9 +425,10 @@

   int target_refresh = 0;

   double weight_segment_target = 0;

   double weight_segment = 0;

+  int thresh_low_motion = (cm->width < 720) ? 55 : 20;

   cr->apply_cyclic_refresh = 1;

   if (cm->frame_type == KEY_FRAME || cpi->svc.temporal_layer_id > 0 ||

-      (!cpi->use_svc && rc->avg_frame_low_motion < 55 &&

+      (!cpi->use_svc && rc->avg_frame_low_motion < thresh_low_motion &&

        rc->frames_since_key > 40)) {

     cr->apply_cyclic_refresh = 0;

     return;

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1617,7 +1617,7 @@

   if (cpi->oxcf.speed >= 8 && !cpi->use_svc &&

       ((cpi->rc.frames_since_golden + 1) < x->last_sb_high_content ||

-       x->last_sb_high_content > 40))

+       x->last_sb_high_content > 40 || cpi->rc.frames_since_golden > 120))

     usable_ref_frame = LAST_FRAME;

   for (ref_frame = LAST_FRAME; ref_frame <= usable_ref_frame; ++ref_frame) {