remove single output cnn functions
av1_cnn_predict_img and av1_cnn_predict_img_highbd are unused.
Bug: aomedia:3416
Change-Id: I4ad2fdc95f04f1ab4378ca8128d34e80b7635a63
diff --git a/av1/encoder/cnn.c b/av1/encoder/cnn.c
index 639922f..28e1f71 100644
--- a/av1/encoder/cnn.c
+++ b/av1/encoder/cnn.c
@@ -1193,40 +1193,3 @@
aom_free(input_);
return success;
}
-
-// Assume output already has proper allocation
-// Assume input image buffers all have same resolution and strides
-bool av1_cnn_predict_img(uint8_t **dgd, int width, int height, int stride,
- const CNN_CONFIG *cnn_config,
- const CNN_THREAD_DATA *thread_data, float **output,
- int out_stride) {
- int out_width = 0, out_height = 0, out_channels = 0;
- av1_find_cnn_output_size(width, height, cnn_config, &out_width, &out_height,
- &out_channels);
- const int output_chs[1] = { out_channels };
- const int output_strides[1] = { out_stride };
- CNN_MULTI_OUT output_struct = { .output_channels = output_chs,
- .output_strides = output_strides,
- .output_buffer = output };
- return av1_cnn_predict_img_multi_out(dgd, width, height, stride, cnn_config,
- thread_data, &output_struct);
-}
-
-// Assume output already has proper allocation
-// Assume input image buffers all have same resolution and strides
-bool av1_cnn_predict_img_highbd(uint16_t **dgd, int width, int height,
- int stride, const CNN_CONFIG *cnn_config,
- const CNN_THREAD_DATA *thread_data,
- int bit_depth, float **output, int out_stride) {
- int out_width = 0, out_height = 0, out_channels = 0;
- av1_find_cnn_output_size(width, height, cnn_config, &out_width, &out_height,
- &out_channels);
- const int output_chs[1] = { out_channels };
- const int output_strides[1] = { out_stride };
- CNN_MULTI_OUT output_struct = { .output_channels = output_chs,
- .output_strides = output_strides,
- .output_buffer = output };
- return av1_cnn_predict_img_multi_out_highbd(dgd, width, height, stride,
- cnn_config, thread_data,
- bit_depth, &output_struct);
-}
diff --git a/av1/encoder/cnn.h b/av1/encoder/cnn.h
index 850c326..df6401f 100644
--- a/av1/encoder/cnn.h
+++ b/av1/encoder/cnn.h
@@ -184,18 +184,6 @@
const CNN_CONFIG *cnn_config,
const CNN_THREAD_DATA *thread_data,
int bit_depth, CNN_MULTI_OUT *output);
-
-// Prediction functions from set of input image buffers. This function only
-// supports a single output.
-bool av1_cnn_predict_img(uint8_t **dgd, int width, int height, int stride,
- const CNN_CONFIG *cnn_config,
- const CNN_THREAD_DATA *thread_data, float **output,
- int out_stride);
-bool av1_cnn_predict_img_highbd(uint16_t **dgd, int width, int height,
- int stride, const CNN_CONFIG *cnn_config,
- const CNN_THREAD_DATA *thread_data,
- int bit_depth, float **output, int out_stride);
-
#ifdef __cplusplus
} // extern "C"
#endif
