From e1b45b85963b5aa9d67e23638ef9b045e7fbd875 Mon Sep 17 00:00:00 2001 From: "Guo, Yejun" Date: Mon, 21 Oct 2019 20:38:10 +0800 Subject: avfilter/dnn: get the data type of network output from dnn execution result so, we can make a filter more general to accept different network models, by adding a data type convertion after getting data from network. After we add dt field into struct DNNData, it becomes the same as DNNInputData, so merge them with one struct: DNNData. Signed-off-by: Guo, Yejun Signed-off-by: Pedro Arthur --- libavfilter/dnn_interface.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libavfilter/dnn_interface.h') diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h index 057005f47e..fdefcb708b 100644 --- a/libavfilter/dnn_interface.h +++ b/libavfilter/dnn_interface.h @@ -34,15 +34,10 @@ typedef enum {DNN_NATIVE, DNN_TF} DNNBackendType; typedef enum {DNN_FLOAT = 1, DNN_UINT8 = 4} DNNDataType; -typedef struct DNNInputData{ +typedef struct DNNData{ void *data; DNNDataType dt; int width, height, channels; -} DNNInputData; - -typedef struct DNNData{ - float *data; - int width, height, channels; } DNNData; typedef struct DNNModel{ @@ -50,7 +45,7 @@ typedef struct DNNModel{ void *model; // Sets model input and output. // Should be called at least once before model execution. - DNNReturnType (*set_input_output)(void *model, DNNInputData *input, const char *input_name, const char **output_names, uint32_t nb_output); + DNNReturnType (*set_input_output)(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output); } DNNModel; // Stores pointers to functions for loading, executing, freeing DNN models for one of the backends. -- cgit v1.2.3