frame_superres: Make frame_superres independent of loop_restoration
The frame superresolution experiment currently makes no use of the
features of the loop restoration experiment. While this is planned for
the future, there is no reason to continue having frame superresolution
depend on loop restoration for now.
Frame superresolution was made dependent by having every preproccesor if
containing its config flag also depend on the loop restoration config
flag. Those if's are modified to only check the frame superresolution
flag by this patch.
Change-Id: Ieef47de29125af8d080739ffeac5c55a1fa99e23
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index dbc047d..bdb0667 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -163,6 +163,12 @@
int last_width;
int last_height;
+#if CONFIG_FRAME_SUPERRES
+ // The numerator of the superres scale, the denominator is fixed
+ uint8_t superres_scale_numerator;
+ int superres_width, superres_height;
+#endif // CONFIG_FRAME_SUPERRES
+
// TODO(jkoleszar): this implies chroma ss right now, but could vary per
// plane. Revisit as part of the future change to YV12_BUFFER_CONFIG to
// support additional planes.
@@ -296,11 +302,6 @@
#if CONFIG_LOOP_RESTORATION
RestorationInfo rst_info[MAX_MB_PLANE];
RestorationInternal rst_internal;
-#if CONFIG_FRAME_SUPERRES
- // The numerator of the superres scale, the denominator is fixed
- uint8_t superres_scale_numerator;
- int superres_width, superres_height;
-#endif // CONFIG_FRAME_SUPERRES
#endif // CONFIG_LOOP_RESTORATION
// Flag signaling how frame contexts should be updated at the end of
