frame-superres: Move resize from encoder to common
The resizing functions in resize.h and resize.c are useful for the
frame super-res experiment. These functions will be needed in both the
encoder and decoder, so the files have been moved into av1/common.
Change-Id: I66154b7ec0eade0df460c4f4cf8eaa5f663c8904
diff --git a/av1/av1.cmake b/av1/av1.cmake
index a5f9ec7..cff4a68 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -58,6 +58,8 @@
"${AOM_ROOT}/av1/common/reconinter.h"
"${AOM_ROOT}/av1/common/reconintra.c"
"${AOM_ROOT}/av1/common/reconintra.h"
+ "${AOM_ROOT}/av1/common/resize.c"
+ "${AOM_ROOT}/av1/common/resize.h"
"${AOM_ROOT}/av1/common/restoration.h"
"${AOM_ROOT}/av1/common/scale.c"
"${AOM_ROOT}/av1/common/scale.h"
@@ -133,8 +135,6 @@
"${AOM_ROOT}/av1/encoder/rd.h"
"${AOM_ROOT}/av1/encoder/rdopt.c"
"${AOM_ROOT}/av1/encoder/rdopt.h"
- "${AOM_ROOT}/av1/encoder/resize.c"
- "${AOM_ROOT}/av1/encoder/resize.h"
"${AOM_ROOT}/av1/encoder/segmentation.c"
"${AOM_ROOT}/av1/encoder/segmentation.h"
"${AOM_ROOT}/av1/encoder/speed_features.c"
diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index 1640bfa..0ed4e35 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -56,6 +56,8 @@
AV1_COMMON_SRCS-yes += common/quant_common.c
AV1_COMMON_SRCS-yes += common/reconinter.c
AV1_COMMON_SRCS-yes += common/reconintra.c
+AV1_COMMON_SRCS-yes += common/resize.c
+AV1_COMMON_SRCS-yes += common/resize.h
AV1_COMMON_SRCS-yes += common/restoration.h
AV1_COMMON_SRCS-yes += common/common_data.h
AV1_COMMON_SRCS-yes += common/scan.c
diff --git a/av1/av1_cx.mk b/av1/av1_cx.mk
index 15b2581..d612a8d 100644
--- a/av1/av1_cx.mk
+++ b/av1/av1_cx.mk
@@ -92,8 +92,6 @@
AV1_CX_SRCS-yes += encoder/speed_features.h
AV1_CX_SRCS-yes += encoder/subexp.c
AV1_CX_SRCS-yes += encoder/subexp.h
-AV1_CX_SRCS-yes += encoder/resize.c
-AV1_CX_SRCS-yes += encoder/resize.h
AV1_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/blockiness.c
AV1_CX_SRCS-yes += encoder/tokenize.c
diff --git a/av1/encoder/resize.c b/av1/common/resize.c
similarity index 99%
rename from av1/encoder/resize.c
rename to av1/common/resize.c
index 3bb9f60..d3eb2ae 100644
--- a/av1/encoder/resize.c
+++ b/av1/common/resize.c
@@ -22,7 +22,7 @@
#endif // CONFIG_AOM_HIGHBITDEPTH
#include "aom_ports/mem.h"
#include "av1/common/common.h"
-#include "av1/encoder/resize.h"
+#include "av1/common/resize.h"
#define FILTER_BITS 7
diff --git a/av1/encoder/resize.h b/av1/common/resize.h
similarity index 100%
rename from av1/encoder/resize.h
rename to av1/common/resize.h
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 304b09e..80ee328 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -24,6 +24,7 @@
#include "av1/common/idct.h"
#include "av1/common/reconinter.h"
#include "av1/common/reconintra.h"
+#include "av1/common/resize.h"
#include "av1/common/tile_common.h"
#include "av1/encoder/aq_complexity.h"
@@ -49,7 +50,6 @@
#endif // CONFIG_LOOP_RESTORATION
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/rd.h"
-#include "av1/encoder/resize.h"
#include "av1/encoder/segmentation.h"
#include "av1/encoder/speed_features.h"
#include "av1/encoder/temporal_filter.h"
