shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9-rtc: Fixes for low-resoln"

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

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

@@ -530,9 +530,9 @@

     cr->rate_boost_fac = 10;

   }

   // Adjust some parameters for low resolutions.

-  if (cm->width <= 352 && cm->height <= 288) {

+  if (cm->width * cm->height <= 352 * 288) {

     if (rc->avg_frame_bandwidth < 3000) {

-      cr->motion_thresh = 16;

+      cr->motion_thresh = 64;

       cr->rate_boost_fac = 13;

     } else {

       cr->max_qdelta_perc = 70;

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

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

@@ -1700,11 +1700,10 @@

   int no_scaling = 0;

   unsigned int thresh_svc_skip_golden = 500;

   unsigned int thresh_skip_golden = 500;

-  int force_smooth_filter =

-      (cpi->oxcf.speed >= 8 && cm->width * cm->height <= 320 * 240 &&

-       cm->base_qindex >= 200)

-          ? 1

-          : 0;

+  // TODO(marpan/jianj): forcing smooth_interpol is visually better for noisy

+  // content, at low resolns. Look into adding this conditon. For now keep

+  // it off.

+  int force_smooth_filter = 0;

   int scene_change_detected =

       cpi->rc.high_source_sad ||

       (cpi->use_svc && cpi->svc.high_source_sad_superframe);