Skip to content

Commit 2c778f4

Browse files
jzernjzern
committed
remove vp9_{highbd_,}resize_frame*()
and examples/resize_util.c. These functions were added in: 3cd37df Adds a non-normative resize library to vp9 encoder but never used meaningfully in the library. This mirrors the change in libaom: d10029bb4b Restore function prototype of av1_resize_frame420 except that vp9_resize_frame420() was never exported in the shared library, so can be deleted along with the rest. The reasoning for removing examples/resize_util.c is the same: it is not useful and examples should use the public functions of the libvpx library. Change-Id: I386080d3f1a3ef81dfc87fcdf5bbdf459d996f03
1 parent 312a900 commit 2c778f4

File tree

5 files changed

+0
-317
lines changed

5 files changed

+0
-317
lines changed

‎examples.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ vp9_spatial_svc_encoder.SRCS += examples/svc_context.h
122122
vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D
123123
vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder
124124

125-
ifneq ($(CONFIG_SHARED),yes)
126-
EXAMPLES-$(CONFIG_VP9_ENCODER) += resize_util.c
127-
endif
128-
129125
EXAMPLES-$(CONFIG_ENCODERS) += vpx_temporal_svc_encoder.c
130126
vpx_temporal_svc_encoder.SRCS += ivfenc.c ivfenc.h
131127
vpx_temporal_svc_encoder.SRCS += y4minput.c y4minput.h

‎examples/resize_util.c

Lines changed: 0 additions & 131 deletions
This file was deleted.

‎test/resize_util.sh

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎vp9/encoder/vp9_resize.c

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -750,83 +750,3 @@ void vp9_highbd_resize_plane(const uint8_t *const input, int height, int width,
750750
free(arrbuf2);
751751
}
752752
#endif // CONFIG_VP9_HIGHBITDEPTH
753-
754-
void vp9_resize_frame420(const uint8_t *const y, int y_stride,
755-
const uint8_t *const u, const uint8_t *const v,
756-
int uv_stride, int height, int width, uint8_t *oy,
757-
int oy_stride, uint8_t *ou, uint8_t *ov,
758-
int ouv_stride, int oheight, int owidth) {
759-
vp9_resize_plane(y, height, width, y_stride, oy, oheight, owidth, oy_stride);
760-
vp9_resize_plane(u, height / 2, width / 2, uv_stride, ou, oheight / 2,
761-
owidth / 2, ouv_stride);
762-
vp9_resize_plane(v, height / 2, width / 2, uv_stride, ov, oheight / 2,
763-
owidth / 2, ouv_stride);
764-
}
765-
766-
void vp9_resize_frame422(const uint8_t *const y, int y_stride,
767-
const uint8_t *const u, const uint8_t *const v,
768-
int uv_stride, int height, int width, uint8_t *oy,
769-
int oy_stride, uint8_t *ou, uint8_t *ov,
770-
int ouv_stride, int oheight, int owidth) {
771-
vp9_resize_plane(y, height, width, y_stride, oy, oheight, owidth, oy_stride);
772-
vp9_resize_plane(u, height, width / 2, uv_stride, ou, oheight, owidth / 2,
773-
ouv_stride);
774-
vp9_resize_plane(v, height, width / 2, uv_stride, ov, oheight, owidth / 2,
775-
ouv_stride);
776-
}
777-
778-
void vp9_resize_frame444(const uint8_t *const y, int y_stride,
779-
const uint8_t *const u, const uint8_t *const v,
780-
int uv_stride, int height, int width, uint8_t *oy,
781-
int oy_stride, uint8_t *ou, uint8_t *ov,
782-
int ouv_stride, int oheight, int owidth) {
783-
vp9_resize_plane(y, height, width, y_stride, oy, oheight, owidth, oy_stride);
784-
vp9_resize_plane(u, height, width, uv_stride, ou, oheight, owidth,
785-
ouv_stride);
786-
vp9_resize_plane(v, height, width, uv_stride, ov, oheight, owidth,
787-
ouv_stride);
788-
}
789-
790-
#if CONFIG_VP9_HIGHBITDEPTH
791-
void vp9_highbd_resize_frame420(const uint8_t *const y, int y_stride,
792-
const uint8_t *const u, const uint8_t *const v,
793-
int uv_stride, int height, int width,
794-
uint8_t *oy, int oy_stride, uint8_t *ou,
795-
uint8_t *ov, int ouv_stride, int oheight,
796-
int owidth, int bd) {
797-
vp9_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
798-
oy_stride, bd);
799-
vp9_highbd_resize_plane(u, height / 2, width / 2, uv_stride, ou, oheight / 2,
800-
owidth / 2, ouv_stride, bd);
801-
vp9_highbd_resize_plane(v, height / 2, width / 2, uv_stride, ov, oheight / 2,
802-
owidth / 2, ouv_stride, bd);
803-
}
804-
805-
void vp9_highbd_resize_frame422(const uint8_t *const y, int y_stride,
806-
const uint8_t *const u, const uint8_t *const v,
807-
int uv_stride, int height, int width,
808-
uint8_t *oy, int oy_stride, uint8_t *ou,
809-
uint8_t *ov, int ouv_stride, int oheight,
810-
int owidth, int bd) {
811-
vp9_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
812-
oy_stride, bd);
813-
vp9_highbd_resize_plane(u, height, width / 2, uv_stride, ou, oheight,
814-
owidth / 2, ouv_stride, bd);
815-
vp9_highbd_resize_plane(v, height, width / 2, uv_stride, ov, oheight,
816-
owidth / 2, ouv_stride, bd);
817-
}
818-
819-
void vp9_highbd_resize_frame444(const uint8_t *const y, int y_stride,
820-
const uint8_t *const u, const uint8_t *const v,
821-
int uv_stride, int height, int width,
822-
uint8_t *oy, int oy_stride, uint8_t *ou,
823-
uint8_t *ov, int ouv_stride, int oheight,
824-
int owidth, int bd) {
825-
vp9_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
826-
oy_stride, bd);
827-
vp9_highbd_resize_plane(u, height, width, uv_stride, ou, oheight, owidth,
828-
ouv_stride, bd);
829-
vp9_highbd_resize_plane(v, height, width, uv_stride, ov, oheight, owidth,
830-
ouv_stride, bd);
831-
}
832-
#endif // CONFIG_VP9_HIGHBITDEPTH

‎vp9/encoder/vp9_resize.h

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,44 +21,11 @@ extern "C" {
2121
void vp9_resize_plane(const uint8_t *const input, int height, int width,
2222
int in_stride, uint8_t *output, int height2, int width2,
2323
int out_stride);
24-
void vp9_resize_frame420(const uint8_t *const y, int y_stride,
25-
const uint8_t *const u, const uint8_t *const v,
26-
int uv_stride, int height, int width, uint8_t *oy,
27-
int oy_stride, uint8_t *ou, uint8_t *ov,
28-
int ouv_stride, int oheight, int owidth);
29-
void vp9_resize_frame422(const uint8_t *const y, int y_stride,
30-
const uint8_t *const u, const uint8_t *const v,
31-
int uv_stride, int height, int width, uint8_t *oy,
32-
int oy_stride, uint8_t *ou, uint8_t *ov,
33-
int ouv_stride, int oheight, int owidth);
34-
void vp9_resize_frame444(const uint8_t *const y, int y_stride,
35-
const uint8_t *const u, const uint8_t *const v,
36-
int uv_stride, int height, int width, uint8_t *oy,
37-
int oy_stride, uint8_t *ou, uint8_t *ov,
38-
int ouv_stride, int oheight, int owidth);
3924

4025
#if CONFIG_VP9_HIGHBITDEPTH
4126
void vp9_highbd_resize_plane(const uint8_t *const input, int height, int width,
4227
int in_stride, uint8_t *output, int height2,
4328
int width2, int out_stride, int bd);
44-
void vp9_highbd_resize_frame420(const uint8_t *const y, int y_stride,
45-
const uint8_t *const u, const uint8_t *const v,
46-
int uv_stride, int height, int width,
47-
uint8_t *oy, int oy_stride, uint8_t *ou,
48-
uint8_t *ov, int ouv_stride, int oheight,
49-
int owidth, int bd);
50-
void vp9_highbd_resize_frame422(const uint8_t *const y, int y_stride,
51-
const uint8_t *const u, const uint8_t *const v,
52-
int uv_stride, int height, int width,
53-
uint8_t *oy, int oy_stride, uint8_t *ou,
54-
uint8_t *ov, int ouv_stride, int oheight,
55-
int owidth, int bd);
56-
void vp9_highbd_resize_frame444(const uint8_t *const y, int y_stride,
57-
const uint8_t *const u, const uint8_t *const v,
58-
int uv_stride, int height, int width,
59-
uint8_t *oy, int oy_stride, uint8_t *ou,
60-
uint8_t *ov, int ouv_stride, int oheight,
61-
int owidth, int bd);
6229
#endif // CONFIG_VP9_HIGHBITDEPTH
6330

6431
#ifdef __cplusplus

0 commit comments

Comments
 (0)