History

libavfilter/dnn: add more data type support for dnn model input

currently, only float is supported as model input, actually, there are other data types, this patch adds uint8.

Guo, Yejun committed 7 years ago

Commit c636dc91 parent 25c1cd94 files · +39 −7Browse files

Showing the changes to libavfilter (4 of 4 files). Show all

Unified · Split

4 files
  1. libavfilter/dnn_backend_native.c +3 −1
  2. libavfilter/dnn_backend_tf.c +24 −4
  3. libavfilter/dnn_interface.h +9 −1
  4. libavfilter/vf_sr.c +3 −1
libavfilter/dnn_backend_native.c+3−1
@@ -24,8 +24,9 @@ · 23 unmodified lines
2424 */
2525
2626 #include "dnn_backend_native.h"
27+#include "libavutil/avassert.h"
2728
28−static DNNReturnType set_input_output_native(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output)
29+static DNNReturnType set_input_output_native(void *model, DNNInputData *input, const char *input_name, const char **output_names, uint32_t nb_output)
2930 {
3031 ConvolutionalNetwork *network = (ConvolutionalNetwork *)model;
3132 InputParams *input_params;
@@ -45,6 +46,7 @@ static DNNReturnType set_input_output_native(void *model, DNNData *input, const · 13 unmodified lines
4546 if (input->data){
4647 av_freep(&input->data);
4748 }
49+ av_assert0(input->dt == DNN_FLOAT);
4850 network->layers[0].output = input->data = av_malloc(cur_height * cur_width * cur_channels * sizeof(float));
4951 if (!network->layers[0].output){
5052 return DNN_ERROR;
libavfilter/dnn_backend_tf.c+24−4
@@ -79,10 +79,31 @@ static TF_Buffer *read_graph(const char *model_filename) · 78 unmodified lines
7979 return graph_buf;
8080 }
8181
82−static DNNReturnType set_input_output_tf(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output)
82+static TF_Tensor *allocate_input_tensor(const DNNInputData *input)
8383 {
84− TFModel *tf_model = (TFModel *)model;
84+ TF_DataType dt;
85+ size_t size;
8586 int64_t input_dims[] = {1, input->height, input->width, input->channels};
87+ switch (input->dt) {
88+ case DNN_FLOAT:
89+ dt = TF_FLOAT;
90+ size = sizeof(float);
91+ break;
92+ case DNN_UINT8:
93+ dt = TF_UINT8;
94+ size = sizeof(char);
95+ break;
96+ default:
97+ av_assert0(!"should not reach here");
98+ }
99+
100+ return TF_AllocateTensor(dt, input_dims, 4,
101+ input_dims[1] * input_dims[2] * input_dims[3] * size);
102+}
103+
104+static DNNReturnType set_input_output_tf(void *model, DNNInputData *input, const char *input_name, const char **output_names, uint32_t nb_output)
105+{
106+ TFModel *tf_model = (TFModel *)model;
86107 TF_SessionOptions *sess_opts;
87108 const TF_Operation *init_op = TF_GraphOperationByName(tf_model->graph, "init");
88109
@@ -95,8 +116,7 @@ static DNNReturnType set_input_output_tf(void *model, DNNData *input, const char · 6 unmodified lines
95116 if (tf_model->input_tensor){
96117 TF_DeleteTensor(tf_model->input_tensor);
97118 }
98− tf_model->input_tensor = TF_AllocateTensor(TF_FLOAT, input_dims, 4,
99− input_dims[1] * input_dims[2] * input_dims[3] * sizeof(float));
119+ tf_model->input_tensor = allocate_input_tensor(input);
100120 if (!tf_model->input_tensor){
101121 return DNN_ERROR;
102122 }
libavfilter/dnn_interface.h+9−1
@@ -32,6 +32,14 @@ typedef enum {DNN_SUCCESS, DNN_ERROR} DNNReturnType; · 31 unmodified lines
3232
3333 typedef enum {DNN_NATIVE, DNN_TF} DNNBackendType;
3434
35+typedef enum {DNN_FLOAT, DNN_UINT8} DNNDataType;
36+
37+typedef struct DNNInputData{
38+ void *data;
39+ DNNDataType dt;
40+ int width, height, channels;
41+} DNNInputData;
42+
3543 typedef struct DNNData{
3644 float *data;
3745 int width, height, channels;
@@ -42,7 +50,7 @@ typedef struct DNNModel{ · 4 unmodified lines
4250 void *model;
4351 // Sets model input and output.
4452 // Should be called at least once before model execution.
45− DNNReturnType (*set_input_output)(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output);
53+ DNNReturnType (*set_input_output)(void *model, DNNInputData *input, const char *input_name, const char **output_names, uint32_t nb_output);
4654 } DNNModel;
4755
4856 // Stores pointers to functions for loading, executing, freeing DNN models for one of the backends.
libavfilter/vf_sr.c+3−1
@@ -40,7 +40,8 @@ typedef struct SRContext { · 39 unmodified lines
4040 DNNBackendType backend_type;
4141 DNNModule *dnn_module;
4242 DNNModel *model;
43− DNNData input, output;
43+ DNNInputData input;
44+ DNNData output;
4445 int scale_factor;
4546 struct SwsContext *sws_contexts[3];
4647 int sws_slice_h, sws_input_linesize, sws_output_linesize;
@@ -86,6 +87,7 @@ static av_cold int init(AVFilterContext *context) · 39 unmodified lines
8687 return AVERROR(EIO);
8788 }
8889
90+ sr_context->input.dt = DNN_FLOAT;
8991 sr_context->sws_contexts[0] = NULL;
9092 sr_context->sws_contexts[1] = NULL;
9193 sr_context->sws_contexts[2] = NULL;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t