commit db860afbaab03e51645e9f226d18eeb3b3f68b29
author James Zern <jzern@google.com> Thu Apr 06 12:41:32 2023 -0700
committer James Zern <jzern@google.com> Fri Apr 07 20:45:35 2023 +0000
tree 3e89a1714abb6f3c43627b16c68d8b644f2512f7
parent f452cbcc77e25bdf39615a988ce2010642954173

rm 4x rectangular aom_dist_wtd_sad* w/CONFIG_REALTIME_ONLY

These were missed in:
c381ba8bdf Remove variance sad for 4x rectangular blocks.

Bug: aomedia:2865
Bug: aomedia:3416
Change-Id: Id3d5908f96b397f31f5d80c794621ecc9824ef31

aom_dsp/aom_dsp_rtcd_defs.pl

diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index cab94ab..99c577e 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -855,12 +855,14 @@
   specialize qw/aom_dist_wtd_sad4x8_avg     sse2/;
   specialize qw/aom_dist_wtd_sad4x4_avg     sse2/;
 
-  specialize qw/aom_dist_wtd_sad4x16_avg     sse2/;
-  specialize qw/aom_dist_wtd_sad16x4_avg     sse2/;
-  specialize qw/aom_dist_wtd_sad8x32_avg     sse2/;
-  specialize qw/aom_dist_wtd_sad32x8_avg     sse2/;
-  specialize qw/aom_dist_wtd_sad16x64_avg    sse2/;
-  specialize qw/aom_dist_wtd_sad64x16_avg    sse2/;
+  if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
+    specialize qw/aom_dist_wtd_sad4x16_avg     sse2/;
+    specialize qw/aom_dist_wtd_sad16x4_avg     sse2/;
+    specialize qw/aom_dist_wtd_sad8x32_avg     sse2/;
+    specialize qw/aom_dist_wtd_sad32x8_avg     sse2/;
+    specialize qw/aom_dist_wtd_sad16x64_avg    sse2/;
+    specialize qw/aom_dist_wtd_sad64x16_avg    sse2/;
+  }
 
   if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
     foreach (@encoder_block_sizes) {

aom_dsp/sad.c

diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c
index 3e7fbf16..723f9f3 100644
--- a/aom_dsp/sad.c
+++ b/aom_dsp/sad.c
@@ -201,6 +201,7 @@
 SAD_MXNX4D(4, 4)
 SAD_MXNX3D(4, 4)
 
+#if !CONFIG_REALTIME_ONLY
 SADMXN(4, 16)
 SAD_MXNX4D(4, 16)
 SADMXN(16, 4)
@@ -213,7 +214,6 @@
 SAD_MXNX4D(16, 64)
 SADMXN(64, 16)
 SAD_MXNX4D(64, 16)
-#if !CONFIG_REALTIME_ONLY
 SAD_MXNX3D(4, 16)
 SAD_MXNX3D(16, 4)
 SAD_MXNX3D(8, 32)

aom_dsp/x86/jnt_sad_sse2.c

diff --git a/aom_dsp/x86/jnt_sad_sse2.c b/aom_dsp/x86/jnt_sad_sse2.c
index 62818f6..16d2f4b 100644
--- a/aom_dsp/x86/jnt_sad_sse2.c
+++ b/aom_dsp/x86/jnt_sad_sse2.c
@@ -228,9 +228,11 @@
 DIST_WTD_SADMXN_SSE2(8, 4)
 DIST_WTD_SADMXN_SSE2(4, 8)
 DIST_WTD_SADMXN_SSE2(4, 4)
+#if !CONFIG_REALTIME_ONLY
 DIST_WTD_SADMXN_SSE2(4, 16)
 DIST_WTD_SADMXN_SSE2(16, 4)
 DIST_WTD_SADMXN_SSE2(8, 32)
 DIST_WTD_SADMXN_SSE2(32, 8)
 DIST_WTD_SADMXN_SSE2(16, 64)
 DIST_WTD_SADMXN_SSE2(64, 16)
+#endif