From dc6229a0db08e8e6a22f59335db1d1ba2802ec8d Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Wed, 21 Aug 2024 12:40:11 -0700
Subject: [PATCH] resize.c: remove most av1_{highbd,}_resize_frame*()
av1_resize_frame{422,444} and av1_highbd_resize_frame{420,422,444} are
unused. av1_resize_frame420() is exposed in exports_com and set to be
removed in 4.0.0 (https://crbug.com/aomedia/3228).
Bug: aomedia:3416
Change-Id: Ided5b3d2d9a79eec28fc788ff0c165ba7c36bf15
---
av1/common/resize.c | 76 ---------------------------------------------
av1/common/resize.h | 26 ----------------
2 files changed, 102 deletions(-)
diff --git a/av1/common/resize.c b/av1/common/resize.c
index 839a7e3ea..c74136b49 100644
--- a/av1/common/resize.c
+++ b/av1/common/resize.c
@@ -1046,82 +1046,6 @@ void av1_resize_frame420(const uint8_t *y, int y_stride, const uint8_t *u,
abort();
}
-bool av1_resize_frame422(const uint8_t *y, int y_stride, const uint8_t *u,
- const uint8_t *v, int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou, uint8_t *ov,
- int ouv_stride, int oheight, int owidth) {
- if (!av1_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
- oy_stride))
- return false;
- if (!av1_resize_plane(u, height, width / 2, uv_stride, ou, oheight,
- owidth / 2, ouv_stride))
- return false;
- if (!av1_resize_plane(v, height, width / 2, uv_stride, ov, oheight,
- owidth / 2, ouv_stride))
- return false;
- return true;
-}
-
-bool av1_resize_frame444(const uint8_t *y, int y_stride, const uint8_t *u,
- const uint8_t *v, int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou, uint8_t *ov,
- int ouv_stride, int oheight, int owidth) {
- if (!av1_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
- oy_stride))
- return false;
- if (!av1_resize_plane(u, height, width, uv_stride, ou, oheight, owidth,
- ouv_stride))
- return false;
- if (!av1_resize_plane(v, height, width, uv_stride, ov, oheight, owidth,
- ouv_stride))
- return false;
- return true;
-}
-
-#if CONFIG_AV1_HIGHBITDEPTH
-void av1_highbd_resize_frame420(const uint8_t *y, int y_stride,
- const uint8_t *u, const uint8_t *v,
- int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou,
- uint8_t *ov, int ouv_stride, int oheight,
- int owidth, int bd) {
- av1_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
- oy_stride, bd);
- av1_highbd_resize_plane(u, height / 2, width / 2, uv_stride, ou, oheight / 2,
- owidth / 2, ouv_stride, bd);
- av1_highbd_resize_plane(v, height / 2, width / 2, uv_stride, ov, oheight / 2,
- owidth / 2, ouv_stride, bd);
-}
-
-void av1_highbd_resize_frame422(const uint8_t *y, int y_stride,
- const uint8_t *u, const uint8_t *v,
- int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou,
- uint8_t *ov, int ouv_stride, int oheight,
- int owidth, int bd) {
- av1_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
- oy_stride, bd);
- av1_highbd_resize_plane(u, height, width / 2, uv_stride, ou, oheight,
- owidth / 2, ouv_stride, bd);
- av1_highbd_resize_plane(v, height, width / 2, uv_stride, ov, oheight,
- owidth / 2, ouv_stride, bd);
-}
-
-void av1_highbd_resize_frame444(const uint8_t *y, int y_stride,
- const uint8_t *u, const uint8_t *v,
- int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou,
- uint8_t *ov, int ouv_stride, int oheight,
- int owidth, int bd) {
- av1_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
- oy_stride, bd);
- av1_highbd_resize_plane(u, height, width, uv_stride, ou, oheight, owidth,
- ouv_stride, bd);
- av1_highbd_resize_plane(v, height, width, uv_stride, ov, oheight, owidth,
- ouv_stride, bd);
-}
-#endif // CONFIG_AV1_HIGHBITDEPTH
-
void av1_resize_and_extend_frame_c(const YV12_BUFFER_CONFIG *src,
YV12_BUFFER_CONFIG *dst,
const InterpFilter filter,
diff --git a/av1/common/resize.h b/av1/common/resize.h
index 489ad81f5..c68e4ac26 100644
--- a/av1/common/resize.h
+++ b/av1/common/resize.h
@@ -33,36 +33,10 @@ void av1_resize_frame420(const uint8_t *y, int y_stride, const uint8_t *u,
const uint8_t *v, int uv_stride, int height, int width,
uint8_t *oy, int oy_stride, uint8_t *ou, uint8_t *ov,
int ouv_stride, int oheight, int owidth);
-bool av1_resize_frame422(const uint8_t *y, int y_stride, const uint8_t *u,
- const uint8_t *v, int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou, uint8_t *ov,
- int ouv_stride, int oheight, int owidth);
-bool av1_resize_frame444(const uint8_t *y, int y_stride, const uint8_t *u,
- const uint8_t *v, int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou, uint8_t *ov,
- int ouv_stride, int oheight, int owidth);
void av1_highbd_resize_plane(const uint8_t *input, int height, int width,
int in_stride, uint8_t *output, int height2,
int width2, int out_stride, int bd);
-void av1_highbd_resize_frame420(const uint8_t *y, int y_stride,
- const uint8_t *u, const uint8_t *v,
- int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou,
- uint8_t *ov, int ouv_stride, int oheight,
- int owidth, int bd);
-void av1_highbd_resize_frame422(const uint8_t *y, int y_stride,
- const uint8_t *u, const uint8_t *v,
- int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou,
- uint8_t *ov, int ouv_stride, int oheight,
- int owidth, int bd);
-void av1_highbd_resize_frame444(const uint8_t *y, int y_stride,
- const uint8_t *u, const uint8_t *v,
- int uv_stride, int height, int width,
- uint8_t *oy, int oy_stride, uint8_t *ou,
- uint8_t *ov, int ouv_stride, int oheight,
- int owidth, int bd);
void av1_upscale_normative_rows(const AV1_COMMON *cm, const uint8_t *src,
int src_stride, uint8_t *dst, int dst_stride,