shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix section intra rating for first ARF interval"

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -2733,10 +2733,8 @@

   reset_fpf_position(twopass, start_pos);

   // Calculate a section intra ratio used in setting max loop filter.

-  if (cpi->common.frame_type != KEY_FRAME) {

-    twopass->section_intra_rating = calculate_section_intra_ratio(

-        start_pos, twopass->stats_in_end, rc->baseline_gf_interval);

-  }

+  twopass->section_intra_rating = calculate_section_intra_ratio(

+      start_pos, twopass->stats_in_end, rc->baseline_gf_interval);

   if (oxcf->resize_mode == RESIZE_DYNAMIC) {

     // Default to starting GF groups at normal frame size.

@@ -3164,7 +3162,7 @@

   twopass->kf_zeromotion_pct = (int)(zero_motion_accumulator * 100.0);

   // Calculate a section intra ratio used in setting max loop filter.

-  twopass->section_intra_rating = calculate_section_intra_ratio(

+  twopass->key_frame_section_intra_rating = calculate_section_intra_ratio(

       start_position, twopass->stats_in_end, rc->frames_to_key);

   // Special case for static / slide show content but dont apply

--- a/vp9/encoder/vp9_firstpass.h

+++ b/vp9/encoder/vp9_firstpass.h

@@ -148,6 +148,7 @@

 typedef struct {

   unsigned int section_intra_rating;

+  unsigned int key_frame_section_intra_rating;

   FIRSTPASS_STATS total_stats;

   FIRSTPASS_STATS this_frame_stats;

   const FIRSTPASS_STATS *stats_in;

--- a/vp9/encoder/vp9_picklpf.c

+++ b/vp9/encoder/vp9_picklpf.c

@@ -24,10 +24,20 @@

 #include "vp9/encoder/vp9_picklpf.h"

 #include "vp9/encoder/vp9_quantize.h"

+static unsigned int get_section_intra_rating(const VP9_COMP *cpi) {

+  unsigned int section_intra_rating;

+

+  section_intra_rating = (cpi->common.frame_type == KEY_FRAME)

+                             ? cpi->twopass.key_frame_section_intra_rating

+                             : cpi->twopass.section_intra_rating;

+

+  return section_intra_rating;

+}

+

 static int get_max_filter_level(const VP9_COMP *cpi) {

   if (cpi->oxcf.pass == 2) {

-    return cpi->twopass.section_intra_rating > 8 ? MAX_LOOP_FILTER * 3 / 4

-                                                 : MAX_LOOP_FILTER;

+    unsigned int section_intra_rating = get_section_intra_rating(cpi);

+    return section_intra_rating > 8 ? MAX_LOOP_FILTER * 3 / 4 : MAX_LOOP_FILTER;

   } else {

     return MAX_LOOP_FILTER;

   }

@@ -81,6 +91,7 @@

   int filter_step = filt_mid < 16 ? 4 : filt_mid / 4;

   // Sum squared error at each filter level

   int64_t ss_err[MAX_LOOP_FILTER + 1];

+  unsigned int section_intra_rating = get_section_intra_rating(cpi);

   // Set each entry to -1

   memset(ss_err, 0xFF, sizeof(ss_err));

@@ -99,8 +110,8 @@

     // Bias against raising loop filter in favor of lowering it.

     int64_t bias = (best_err >> (15 - (filt_mid / 8))) * filter_step;

-    if ((cpi->oxcf.pass == 2) && (cpi->twopass.section_intra_rating < 20))

-      bias = (bias * cpi->twopass.section_intra_rating) / 20;

+    if ((cpi->oxcf.pass == 2) && (section_intra_rating < 20))

+      bias = (bias * section_intra_rating) / 20;

     // yx, bias less for large block size

     if (cm->tx_mode != ONLY_4X4) bias >>= 1;