diff options
author | Guo, Yejun <yejun.guo@intel.com> | 2019-10-21 20:38:10 +0800 |
---|---|---|
committer | Pedro Arthur <bygrandao@gmail.com> | 2019-10-30 11:00:41 -0300 |
commit | e1b45b85963b5aa9d67e23638ef9b045e7fbd875 (patch) | |
tree | 8f42ca165f693649ea2ec8f6f9a8e62c1a505027 /libavfilter/dnn/dnn_backend_native.c | |
parent | dff39ea9f0154ec52b7548b122a4a5332df3c2c6 (diff) | |
download | ffmpeg-streaming-e1b45b85963b5aa9d67e23638ef9b045e7fbd875.zip ffmpeg-streaming-e1b45b85963b5aa9d67e23638ef9b045e7fbd875.tar.gz |
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 <yejun.guo@intel.com>
Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
Diffstat (limited to 'libavfilter/dnn/dnn_backend_native.c')
-rw-r--r-- | libavfilter/dnn/dnn_backend_native.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/dnn/dnn_backend_native.c b/libavfilter/dnn/dnn_backend_native.c index ff280b5..add1db4 100644 --- a/libavfilter/dnn/dnn_backend_native.c +++ b/libavfilter/dnn/dnn_backend_native.c @@ -28,7 +28,7 @@ #include "dnn_backend_native_layer_conv2d.h" #include "dnn_backend_native_layers.h" -static DNNReturnType set_input_output_native(void *model, DNNInputData *input, const char *input_name, const char **output_names, uint32_t nb_output) +static DNNReturnType set_input_output_native(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output) { ConvolutionalNetwork *network = (ConvolutionalNetwork *)model; DnnOperand *oprd = NULL; @@ -263,6 +263,7 @@ DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *output outputs[i].height = oprd->dims[1]; outputs[i].width = oprd->dims[2]; outputs[i].channels = oprd->dims[3]; + outputs[i].dt = oprd->data_type; } return DNN_SUCCESS; |