shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix a bug in tune-content film mode"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3034,7 +3034,7 @@

   if (content_type == VP9E_CONTENT_FILM) {

     if (src_rec_min <= VERY_LOW_VAR_THRESH) {

       if (ref_frame == INTRA_FRAME) *this_rd *= 2;

-      if (bsize > 6) *this_rd *= 2;

+      if (bsize > BLOCK_16X16) *this_rd *= 2;

     }

   }

 }

--- a/vp9/encoder/vp9_temporal_filter.c

+++ b/vp9/encoder/vp9_temporal_filter.c

@@ -680,7 +680,9 @@

       src_variance = vp9_get_sby_perpixel_variance(cpi, &src, TF_BLOCK);

 #endif  // CONFIG_VP9_HIGHBITDEPTH

-      if (src_variance <= 2) strength = VPXMAX(0, (int)strength - 2);

+      if (src_variance <= 2) {

+        strength = VPXMAX(0, arnr_filter_data->strength - 2);

+      }

     }

     for (frame = 0; frame < frame_count; frame++) {