commit e2f41e16b4c375ac4ae3ef0755fbb6bcf5fb68da
author Wan-Teh Chang <wtc@google.com> Mon Apr 25 14:28:19 2022 -0700
committer Wan-Teh Chang <wtc@google.com> Tue Apr 26 18:09:45 2022 +0000
tree fa213354cf1175fdbeb83f1d5ff8f683b248774a
parent f11bdb6702a3b500b143a68231b9ea168acbd654

Fix av1_temporal_denoiser.c compilation errors

Pass 0 as the 9th argument to aom_alloc_frame_buffer(). See
https://aomedia-review.googlesource.com/c/aom/+/156402.

Change content_state.source_sad to content_state.source_sad_nonrd. See
https://aomedia-review.googlesource.com/c/aom/+/156484.

Test:
cmake ../aom -DCONFIG_AV1_TEMPORAL_DENOISING=1
make -j
./test_libaom --gtest_filter=*AV1DenoiserTest*

Bug: b/228634712
Change-Id: I9c43ef54dc23ca66470b7928af76b3efed0b0eca

av1/encoder/av1_temporal_denoiser.c

diff --git a/av1/encoder/av1_temporal_denoiser.c b/av1/encoder/av1_temporal_denoiser.c
index 26e0eda..27a12cb 100644
--- a/av1/encoder/av1_temporal_denoiser.c
+++ b/av1/encoder/av1_temporal_denoiser.c
@@ -487,7 +487,7 @@
         &denoiser->running_avg_y[fb_idx], cm->width, cm->height,
         cm->seq_params->subsampling_x, cm->seq_params->subsampling_y,
         cm->seq_params->use_highbitdepth, AOM_BORDER_IN_PIXELS,
-        cm->features.byte_alignment);
+        cm->features.byte_alignment, 0);
     if (fail) {
       av1_denoiser_free(denoiser);
       return 1;
@@ -574,7 +574,7 @@
       fail = aom_alloc_frame_buffer(
           &denoiser->running_avg_y[i + denoiser->num_ref_frames * layer],
           denoise_width, denoise_height, ssx, ssy, use_highbitdepth, border,
-          legacy_byte_alignment);
+          legacy_byte_alignment, 0);
       if (fail) {
         av1_denoiser_free(denoiser);
         return 1;
@@ -586,7 +586,7 @@
 
     fail = aom_alloc_frame_buffer(
         &denoiser->mc_running_avg_y[layer], denoise_width, denoise_height, ssx,
-        ssy, use_highbitdepth, border, legacy_byte_alignment);
+        ssy, use_highbitdepth, border, legacy_byte_alignment, 0);
     if (fail) {
       av1_denoiser_free(denoiser);
       return 1;
@@ -595,9 +595,9 @@
 
   // denoiser->last_source only used for noise_estimation, so only for top
   // layer.
-  fail =
-      aom_alloc_frame_buffer(&denoiser->last_source, width, height, ssx, ssy,
-                             use_highbitdepth, border, legacy_byte_alignment);
+  fail = aom_alloc_frame_buffer(&denoiser->last_source, width, height, ssx, ssy,
+                                use_highbitdepth, border, legacy_byte_alignment,
+                                0);
   if (fail) {
     av1_denoiser_free(denoiser);
     return 1;
@@ -671,8 +671,10 @@
 int64_t av1_scale_part_thresh(int64_t threshold, AV1_DENOISER_LEVEL noise_level,
                               CONTENT_STATE_SB content_state,
                               int temporal_layer_id) {
-  if ((content_state.source_sad == kLowSad && content_state.low_sumdiff) ||
-      (content_state.source_sad == kHighSad && content_state.low_sumdiff) ||
+  if ((content_state.source_sad_nonrd == kLowSad &&
+       content_state.low_sumdiff) ||
+      (content_state.source_sad_nonrd == kHighSad &&
+       content_state.low_sumdiff) ||
       (content_state.lighting_change && !content_state.low_sumdiff) ||
       (noise_level == kDenHigh) || (temporal_layer_id != 0)) {
     int64_t scaled_thr =