shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Add high source sad to content state."

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1022,6 +1022,9 @@

   if (tmp_variance < (tmp_sse >> 3) && (tmp_sse - tmp_variance) > 10000)

     x->content_state_sb = kLowVarHighSumdiff;

+  if (tmp_sad > (avg_source_sad_threshold << 1))

+    x->content_state_sb = kVeryHighSad;

+

   if (cpi->content_state_sb_fd != NULL) {

     if (tmp_sad < avg_source_sad_threshold2) {

       // Cap the increment to 255.

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -138,6 +138,7 @@

   kHighSadLowSumdiff = 3,

   kHighSadHighSumdiff = 4,

   kLowVarHighSumdiff = 5,

+  kVeryHighSad = 6,

 } CONTENT_STATE_SB;

 typedef struct VP9EncoderConfig {

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

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

@@ -1693,7 +1693,8 @@

       continue;

     }

-    if ((cpi->sf.short_circuit_low_temp_var >= 2 ||

+    if (x->content_state_sb != kVeryHighSad &&

+        (cpi->sf.short_circuit_low_temp_var >= 2 ||

          (cpi->sf.short_circuit_low_temp_var == 1 && bsize == BLOCK_64X64)) &&

         force_skip_low_temp_var && ref_frame == LAST_FRAME &&

         this_mode == NEWMV) {