commit ee4f0d9599d0e5762636be0ab93287dc5ce5e6f1
author Yunqing Wang <yunqingwang@google.com> Tue Aug 30 11:15:56 2022 -0700
committer Yunqing Wang <yunqingwang@google.com> Tue Aug 30 20:47:39 2022 +0000
tree 23b7c8238f5ae6616af20b2ec984e6a12614e5dc
parent 047f3a6ec7c1c166190e9e91fe5bdfb823935941

Explicitly set source_sad_nonrd

No stats change.

Change-Id: I354bd78e6c74e2975fdf8aba9b63bceb4e746ad6

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 5d99847..f8e0d33 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -759,8 +759,9 @@
  * \callgraph
  * \callergraph
  */
-static AOM_INLINE bool is_calc_src_content_needed(AV1_COMP *cpi, int mi_row,
-                                                  int mi_col) {
+static AOM_INLINE bool is_calc_src_content_needed(AV1_COMP *cpi,
+                                                  MACROBLOCK *const x,
+                                                  int mi_row, int mi_col) {
   AV1_COMMON *const cm = &cpi->common;
   bool do_calc_src_content = true;
 
@@ -785,6 +786,9 @@
 
     if (blk_sad > thresh_low && blk_sad < thresh_high) {
       do_calc_src_content = false;
+      // Note: set x->content_state_sb.source_sad_rd as well if this is extended
+      // to RTC rd path.
+      x->content_state_sb.source_sad_nonrd = kMedSad;
     }
   }
 
@@ -808,7 +812,7 @@
       cpi->svc.number_spatial_layers <= 1 &&
       cm->current_frame.frame_type != KEY_FRAME) {
     if (!cpi->sf.rt_sf.check_scene_detection || cpi->rc.frame_source_sad > 0) {
-      calc_src_content = is_calc_src_content_needed(cpi, mi_row, mi_col);
+      calc_src_content = is_calc_src_content_needed(cpi, x, mi_row, mi_col);
     } else {
       x->content_state_sb.source_sad_nonrd = kZeroSad;
     }