History

dnn: move output name from DNNModel.set_input_output to DNNModule.execute_model

currently, output is set both at DNNModel.set_input_output and DNNModule.execute_model, it makes sense that the output name is provided at model inference time so all the output info is set at a single place. and so DNNModel.set_input_output is renamed to DNNModel.set_input

Guo, Yejun committed 6 years ago

Commit 0f7a99e1 parent b61376b10 files · +82 −137Browse files

Unified · Split

10 files
  1. libavfilter/dnn/dnn_backend_native.c +16 −28
  2. libavfilter/dnn/dnn_backend_native.h +1 −3
  3. libavfilter/dnn/dnn_backend_openvino.c +13 −37
  4. libavfilter/dnn/dnn_backend_openvino.h +1 −1
  5. libavfilter/dnn/dnn_backend_tf.c +35 −52
  6. libavfilter/dnn/dnn_backend_tf.h +1 −1
  7. libavfilter/dnn_interface.h +2 −2
  8. libavfilter/vf_derain.c +3 −3
  9. libavfilter/vf_dnn_processing.c +4 −5
  10. libavfilter/vf_sr.c +6 −5
libavfilter/dnn/dnn_backend_native.c+16−28
@@ -50,7 +50,7 @@ static DNNReturnType get_input_native(void *model, DNNData *input, const char *i · 49 unmodified lines
5050 return DNN_ERROR;
5151 }
5252
53−static DNNReturnType set_input_output_native(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output)
53+static DNNReturnType set_input_native(void *model, DNNData *input, const char *input_name)
5454 {
5555 NativeModel *native_model = (NativeModel *)model;
5656 DnnOperand *oprd = NULL;
@@ -87,27 +87,6 @@ static DNNReturnType set_input_output_native(void *model, DNNData *input, const · 30 unmodified lines
8787
8888 input->data = oprd->data;
8989
90− /* outputs */
91− native_model->nb_output = 0;
92− av_freep(&native_model->output_indexes);
93− native_model->output_indexes = av_mallocz_array(nb_output, sizeof(*native_model->output_indexes));
94− if (!native_model->output_indexes)
95− return DNN_ERROR;
96−
97− for (uint32_t i = 0; i < nb_output; ++i) {
98− const char *output_name = output_names[i];
99− for (int j = 0; j < native_model->operands_num; ++j) {
100− oprd = &native_model->operands[j];
101− if (strcmp(oprd->name, output_name) == 0) {
102− native_model->output_indexes[native_model->nb_output++] = j;
103− break;
104− }
105− }
106− }
107−
108− if (native_model->nb_output != nb_output)
109− return DNN_ERROR;
110−
11190 return DNN_SUCCESS;
11291 }
11392
@@ -243,7 +222,7 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename, const char *optio · 129 unmodified lines
243222 return NULL;
244223 }
245224
246− model->set_input_output = &set_input_output_native;
225+ model->set_input = &set_input_native;
247226 model->get_input = &get_input_native;
248227 model->options = options;
249228
@@ -255,11 +234,10 @@ fail: · 5 unmodified lines
255234 return NULL;
256235 }
257236
258−DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *outputs, uint32_t nb_output)
237+DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output)
259238 {
260239 NativeModel *native_model = (NativeModel *)model->model;
261240 int32_t layer;
262− uint32_t nb = FFMIN(nb_output, native_model->nb_output);
263241
264242 if (native_model->layers_num <= 0 || native_model->operands_num <= 0)
265243 return DNN_ERROR;
@@ -274,8 +252,19 @@ DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *output · 8 unmodified lines
274252 native_model->layers[layer].params);
275253 }
276254
277− for (uint32_t i = 0; i < nb; ++i) {
278− DnnOperand *oprd = &native_model->operands[native_model->output_indexes[i]];
255+ for (uint32_t i = 0; i < nb_output; ++i) {
256+ DnnOperand *oprd = NULL;
257+ const char *output_name = output_names[i];
258+ for (int j = 0; j < native_model->operands_num; ++j) {
259+ if (strcmp(native_model->operands[j].name, output_name) == 0) {
260+ oprd = &native_model->operands[j];
261+ break;
262+ }
263+ }
264+
265+ if (oprd == NULL)
266+ return DNN_ERROR;
267+
279268 outputs[i].data = oprd->data;
280269 outputs[i].height = oprd->dims[1];
281270 outputs[i].width = oprd->dims[2];
@@ -335,7 +324,6 @@ void ff_dnn_free_model_native(DNNModel **model) · 53 unmodified lines
335324 av_freep(&native_model->operands);
336325 }
337326
338− av_freep(&native_model->output_indexes);
339327 av_freep(&native_model);
340328 }
341329 av_freep(model);
libavfilter/dnn/dnn_backend_native.h+1−3
@@ -112,13 +112,11 @@ typedef struct NativeModel{ · 111 unmodified lines
112112 int32_t layers_num;
113113 DnnOperand *operands;
114114 int32_t operands_num;
115− int32_t *output_indexes;
116− uint32_t nb_output;
117115 } NativeModel;
118116
119117 DNNModel *ff_dnn_load_model_native(const char *model_filename, const char *options);
120118
121−DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *outputs, uint32_t nb_output);
119+DNNReturnType ff_dnn_execute_model_native(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output);
122120
123121 void ff_dnn_free_model_native(DNNModel **model);
124122
libavfilter/dnn/dnn_backend_openvino.c+13−37
@@ -34,8 +34,6 @@ typedef struct OVModel{ · 33 unmodified lines
3434 ie_executable_network_t *exe_network;
3535 ie_infer_request_t *infer_request;
3636 ie_blob_t *input_blob;
37− ie_blob_t **output_blobs;
38− uint32_t nb_output;
3937 } OVModel;
4038
4139 static DNNDataType precision_to_datatype(precision_e precision)
@@ -93,7 +91,7 @@ static DNNReturnType get_input_ov(void *model, DNNData *input, const char *input · 51 unmodified lines
9391 return DNN_ERROR;
9492 }
9593
96−static DNNReturnType set_input_output_ov(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output)
94+static DNNReturnType set_input_ov(void *model, DNNData *input, const char *input_name)
9795 {
9896 OVModel *ov_model = (OVModel *)model;
9997 IEStatusCode status;
@@ -124,30 +122,9 @@ static DNNReturnType set_input_output_ov(void *model, DNNData *input, const char · 24 unmodified lines
124122 goto err;
125123 input->data = blob_buffer.buffer;
126124
127− // outputs
128− ov_model->nb_output = 0;
129− av_freep(&ov_model->output_blobs);
130− ov_model->output_blobs = av_mallocz_array(nb_output, sizeof(*ov_model->output_blobs));
131− if (!ov_model->output_blobs)
132− goto err;
133−
134− for (int i = 0; i < nb_output; i++) {
135− const char *output_name = output_names[i];
136− status = ie_infer_request_get_blob(ov_model->infer_request, output_name, &(ov_model->output_blobs[i]));
137− if (status != OK)
138− goto err;
139− ov_model->nb_output++;
140− }
141−
142125 return DNN_SUCCESS;
143126
144127 err:
145− if (ov_model->output_blobs) {
146− for (uint32_t i = 0; i < ov_model->nb_output; i++) {
147− ie_blob_free(&(ov_model->output_blobs[i]));
148− }
149− av_freep(&ov_model->output_blobs);
150− }
151128 if (ov_model->input_blob)
152129 ie_blob_free(&ov_model->input_blob);
153130 if (ov_model->infer_request)
@@ -184,7 +161,7 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) · 30 unmodified lines
184161 goto err;
185162
186163 model->model = (void *)ov_model;
187− model->set_input_output = &set_input_output_ov;
164+ model->set_input = &set_input_ov;
188165 model->get_input = &get_input_ov;
189166 model->options = options;
190167
@@ -205,24 +182,29 @@ err: · 14 unmodified lines
205182 return NULL;
206183 }
207184
208−DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNData *outputs, uint32_t nb_output)
185+DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output)
209186 {
210187 dimensions_t dims;
211188 precision_e precision;
212189 ie_blob_buffer_t blob_buffer;
213190 OVModel *ov_model = (OVModel *)model->model;
214− uint32_t nb = FFMIN(nb_output, ov_model->nb_output);
215191 IEStatusCode status = ie_infer_request_infer(ov_model->infer_request);
216192 if (status != OK)
217193 return DNN_ERROR;
218194
219− for (uint32_t i = 0; i < nb; ++i) {
220− status = ie_blob_get_buffer(ov_model->output_blobs[i], &blob_buffer);
195+ for (uint32_t i = 0; i < nb_output; ++i) {
196+ const char *output_name = output_names[i];
197+ ie_blob_t *output_blob = NULL;
198+ status = ie_infer_request_get_blob(ov_model->infer_request, output_name, &output_blob);
199+ if (status != OK)
200+ return DNN_ERROR;
201+
202+ status = ie_blob_get_buffer(output_blob, &blob_buffer);
221203 if (status != OK)
222204 return DNN_ERROR;
223205
224− status |= ie_blob_get_dims(ov_model->output_blobs[i], &dims);
225− status |= ie_blob_get_precision(ov_model->output_blobs[i], &precision);
206+ status |= ie_blob_get_dims(output_blob, &dims);
207+ status |= ie_blob_get_precision(output_blob, &precision);
226208 if (status != OK)
227209 return DNN_ERROR;
228210
@@ -240,12 +222,6 @@ void ff_dnn_free_model_ov(DNNModel **model) · 11 unmodified lines
240222 {
241223 if (*model){
242224 OVModel *ov_model = (OVModel *)(*model)->model;
243− if (ov_model->output_blobs) {
244− for (uint32_t i = 0; i < ov_model->nb_output; i++) {
245− ie_blob_free(&(ov_model->output_blobs[i]));
246− }
247− av_freep(&ov_model->output_blobs);
248− }
249225 if (ov_model->input_blob)
250226 ie_blob_free(&ov_model->input_blob);
251227 if (ov_model->infer_request)
libavfilter/dnn/dnn_backend_openvino.h+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131
3232 DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options);
3333
34−DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNData *outputs, uint32_t nb_output);
34+DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output);
3535
3636 void ff_dnn_free_model_ov(DNNModel **model);
3737
libavfilter/dnn/dnn_backend_tf.c+35−52
@@ -40,7 +40,6 @@ typedef struct TFModel{ · 39 unmodified lines
4040 TF_Status *status;
4141 TF_Output input;
4242 TF_Tensor *input_tensor;
43− TF_Output *outputs;
4443 TF_Tensor **output_tensors;
4544 uint32_t nb_output;
4645 } TFModel;
@@ -136,7 +135,7 @@ static DNNReturnType get_input_tf(void *model, DNNData *input, const char *input · 89 unmodified lines
136135 return DNN_SUCCESS;
137136 }
138137
139−static DNNReturnType set_input_output_tf(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output)
138+static DNNReturnType set_input_tf(void *model, DNNData *input, const char *input_name)
140139 {
141140 TFModel *tf_model = (TFModel *)model;
142141 TF_SessionOptions *sess_opts;
@@ -157,40 +156,7 @@ static DNNReturnType set_input_output_tf(void *model, DNNData *input, const char · 14 unmodified lines
157156 }
158157 input->data = (float *)TF_TensorData(tf_model->input_tensor);
159158
160− // Output operation
161− if (nb_output == 0)
162− return DNN_ERROR;
163−
164− av_freep(&tf_model->outputs);
165− tf_model->outputs = av_malloc_array(nb_output, sizeof(*tf_model->outputs));
166− if (!tf_model->outputs)
167− return DNN_ERROR;
168− for (int i = 0; i < nb_output; ++i) {
169− tf_model->outputs[i].oper = TF_GraphOperationByName(tf_model->graph, output_names[i]);
170− if (!tf_model->outputs[i].oper){
171− av_freep(&tf_model->outputs);
172− return DNN_ERROR;
173− }
174− tf_model->outputs[i].index = 0;
175− }
176−
177− if (tf_model->output_tensors) {
178− for (uint32_t i = 0; i < tf_model->nb_output; ++i) {
179− if (tf_model->output_tensors[i]) {
180− TF_DeleteTensor(tf_model->output_tensors[i]);
181− tf_model->output_tensors[i] = NULL;
182− }
183− }
184− }
185− av_freep(&tf_model->output_tensors);
186− tf_model->output_tensors = av_mallocz_array(nb_output, sizeof(*tf_model->output_tensors));
187− if (!tf_model->output_tensors) {
188− av_freep(&tf_model->outputs);
189− return DNN_ERROR;
190− }
191−
192− tf_model->nb_output = nb_output;
193−
159+ // session
194160 if (tf_model->session){
195161 TF_CloseSession(tf_model->session, tf_model->status);
196162 TF_DeleteSession(tf_model->session, tf_model->status);
@@ -598,40 +564,57 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, const char *options) · 401 unmodified lines
598564 }
599565
600566 model->model = (void *)tf_model;
601− model->set_input_output = &set_input_output_tf;
567+ model->set_input = &set_input_tf;
602568 model->get_input = &get_input_tf;
603569 model->options = options;
604570
605571 return model;
606572 }
607573
608−
609−
610−DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNData *outputs, uint32_t nb_output)
574+DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output)
611575 {
576+ TF_Output *tf_outputs;
612577 TFModel *tf_model = (TFModel *)model->model;
613− uint32_t nb = FFMIN(nb_output, tf_model->nb_output);
614− if (nb == 0)
578+
579+ tf_outputs = av_malloc_array(nb_output, sizeof(*tf_outputs));
580+ if (tf_outputs == NULL)
615581 return DNN_ERROR;
616582
617− av_assert0(tf_model->output_tensors);
618− for (uint32_t i = 0; i < tf_model->nb_output; ++i) {
619− if (tf_model->output_tensors[i]) {
620− TF_DeleteTensor(tf_model->output_tensors[i]);
621− tf_model->output_tensors[i] = NULL;
583+ if (tf_model->output_tensors) {
584+ for (uint32_t i = 0; i < tf_model->nb_output; ++i) {
585+ if (tf_model->output_tensors[i]) {
586+ TF_DeleteTensor(tf_model->output_tensors[i]);
587+ tf_model->output_tensors[i] = NULL;
588+ }
622589 }
623590 }
591+ av_freep(&tf_model->output_tensors);
592+ tf_model->nb_output = nb_output;
593+ tf_model->output_tensors = av_mallocz_array(nb_output, sizeof(*tf_model->output_tensors));
594+ if (!tf_model->output_tensors) {
595+ av_freep(&tf_outputs);
596+ return DNN_ERROR;
597+ }
598+
599+ for (int i = 0; i < nb_output; ++i) {
600+ tf_outputs[i].oper = TF_GraphOperationByName(tf_model->graph, output_names[i]);
601+ if (!tf_outputs[i].oper) {
602+ av_freep(&tf_outputs);
603+ return DNN_ERROR;
604+ }
605+ tf_outputs[i].index = 0;
606+ }
624607
625608 TF_SessionRun(tf_model->session, NULL,
626609 &tf_model->input, &tf_model->input_tensor, 1,
627− tf_model->outputs, tf_model->output_tensors, nb,
610+ tf_outputs, tf_model->output_tensors, nb_output,
628611 NULL, 0, NULL, tf_model->status);
629−
630− if (TF_GetCode(tf_model->status) != TF_OK){
612+ if (TF_GetCode(tf_model->status) != TF_OK) {
613+ av_freep(&tf_outputs);
631614 return DNN_ERROR;
632615 }
633616
634− for (uint32_t i = 0; i < nb; ++i) {
617+ for (uint32_t i = 0; i < nb_output; ++i) {
635618 outputs[i].height = TF_Dim(tf_model->output_tensors[i], 1);
636619 outputs[i].width = TF_Dim(tf_model->output_tensors[i], 2);
637620 outputs[i].channels = TF_Dim(tf_model->output_tensors[i], 3);
@@ -639,6 +622,7 @@ DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNData *outputs, u · 1 unmodified line
639622 outputs[i].dt = TF_TensorType(tf_model->output_tensors[i]);
640623 }
641624
625+ av_freep(&tf_outputs);
642626 return DNN_SUCCESS;
643627 }
644628
@@ -669,7 +653,6 @@ void ff_dnn_free_model_tf(DNNModel **model) · 24 unmodified lines
669653 }
670654 }
671655 }
672− av_freep(&tf_model->outputs);
673656 av_freep(&tf_model->output_tensors);
674657 av_freep(&tf_model);
675658 av_freep(model);
libavfilter/dnn/dnn_backend_tf.h+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131
3232 DNNModel *ff_dnn_load_model_tf(const char *model_filename, const char *options);
3333
34−DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNData *outputs, uint32_t nb_output);
34+DNNReturnType ff_dnn_execute_model_tf(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output);
3535
3636 void ff_dnn_free_model_tf(DNNModel **model);
3737
libavfilter/dnn_interface.h+2−2
@@ -50,7 +50,7 @@ typedef struct DNNModel{ · 49 unmodified lines
5050 DNNReturnType (*get_input)(void *model, DNNData *input, const char *input_name);
5151 // Sets model input and output.
5252 // Should be called at least once before model execution.
53− DNNReturnType (*set_input_output)(void *model, DNNData *input, const char *input_name, const char **output_names, uint32_t nb_output);
53+ DNNReturnType (*set_input)(void *model, DNNData *input, const char *input_name);
5454 } DNNModel;
5555
5656 // Stores pointers to functions for loading, executing, freeing DNN models for one of the backends.
@@ -58,7 +58,7 @@ typedef struct DNNModule{ · 1 unmodified line
5858 // Loads model and parameters from given file. Returns NULL if it is not possible.
5959 DNNModel *(*load_model)(const char *model_filename, const char *options);
6060 // Executes model with specified input and output. Returns DNN_ERROR otherwise.
61− DNNReturnType (*execute_model)(const DNNModel *model, DNNData *outputs, uint32_t nb_output);
61+ DNNReturnType (*execute_model)(const DNNModel *model, DNNData *outputs, const char **output_names, uint32_t nb_output);
6262 // Frees memory allocated for model.
6363 void (*free_model)(DNNModel **model);
6464 } DNNModule;
libavfilter/vf_derain.c+3−3
@@ -78,14 +78,13 @@ static int config_inputs(AVFilterLink *inlink) · 77 unmodified lines
7878 {
7979 AVFilterContext *ctx = inlink->dst;
8080 DRContext *dr_context = ctx->priv;
81− const char *model_output_name = "y";
8281 DNNReturnType result;
8382
8483 dr_context->input.width = inlink->w;
8584 dr_context->input.height = inlink->h;
8685 dr_context->input.channels = 3;
8786
88− result = (dr_context->model->set_input_output)(dr_context->model->model, &dr_context->input, "x", &model_output_name, 1);
87+ result = (dr_context->model->set_input)(dr_context->model->model, &dr_context->input, "x");
8988 if (result != DNN_SUCCESS) {
9089 av_log(ctx, AV_LOG_ERROR, "could not set input and output for the model\n");
9190 return AVERROR(EIO);
@@ -100,6 +99,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 8 unmodified lines
10099 AVFilterLink *outlink = ctx->outputs[0];
101100 DRContext *dr_context = ctx->priv;
102101 DNNReturnType dnn_result;
102+ const char *model_output_name = "y";
103103
104104 AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
105105 if (!out) {
@@ -118,7 +118,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 12 unmodified lines
118118 }
119119 }
120120
121− dnn_result = (dr_context->dnn_module->execute_model)(dr_context->model, &dr_context->output, 1);
121+ dnn_result = (dr_context->dnn_module->execute_model)(dr_context->model, &dr_context->output, &model_output_name, 1);
122122 if (dnn_result != DNN_SUCCESS){
123123 av_log(ctx, AV_LOG_ERROR, "failed to execute model\n");
124124 return AVERROR(EIO);
libavfilter/vf_dnn_processing.c+4−5
@@ -218,9 +218,8 @@ static int config_input(AVFilterLink *inlink) · 217 unmodified lines
218218 ctx->input.channels = model_input.channels;
219219 ctx->input.dt = model_input.dt;
220220
221− result = (ctx->model->set_input_output)(ctx->model->model,
222− &ctx->input, ctx->model_inputname,
223− (const char **)&ctx->model_outputname, 1);
221+ result = (ctx->model->set_input)(ctx->model->model,
222+ &ctx->input, ctx->model_inputname);
224223 if (result != DNN_SUCCESS) {
225224 av_log(ctx, AV_LOG_ERROR, "could not set input and output for the model\n");
226225 return AVERROR(EIO);
@@ -309,7 +308,7 @@ static int config_output(AVFilterLink *outlink) · 82 unmodified lines
309308 DNNReturnType result;
310309
311310 // have a try run in case that the dnn model resize the frame
312− result = (ctx->dnn_module->execute_model)(ctx->model, &ctx->output, 1);
311+ result = (ctx->dnn_module->execute_model)(ctx->model, &ctx->output, (const char **)&ctx->model_outputname, 1);
313312 if (result != DNN_SUCCESS){
314313 av_log(ctx, AV_LOG_ERROR, "failed to execute model\n");
315314 return AVERROR(EIO);
@@ -456,7 +455,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 140 unmodified lines
456455
457456 copy_from_frame_to_dnn(ctx, in);
458457
459− dnn_result = (ctx->dnn_module->execute_model)(ctx->model, &ctx->output, 1);
458+ dnn_result = (ctx->dnn_module->execute_model)(ctx->model, &ctx->output, (const char **)&ctx->model_outputname, 1);
460459 if (dnn_result != DNN_SUCCESS){
461460 av_log(ctx, AV_LOG_ERROR, "failed to execute model\n");
462461 av_frame_free(&in);
libavfilter/vf_sr.c+6−5
@@ -124,13 +124,13 @@ static int config_props(AVFilterLink *inlink) · 123 unmodified lines
124124 sr_context->input.height = inlink->h * sr_context->scale_factor;
125125 sr_context->input.channels = 1;
126126
127− result = (sr_context->model->set_input_output)(sr_context->model->model, &sr_context->input, "x", &model_output_name, 1);
127+ result = (sr_context->model->set_input)(sr_context->model->model, &sr_context->input, "x");
128128 if (result != DNN_SUCCESS){
129129 av_log(context, AV_LOG_ERROR, "could not set input and output for the model\n");
130130 return AVERROR(EIO);
131131 }
132132
133− result = (sr_context->dnn_module->execute_model)(sr_context->model, &sr_context->output, 1);
133+ result = (sr_context->dnn_module->execute_model)(sr_context->model, &sr_context->output, &model_output_name, 1);
134134 if (result != DNN_SUCCESS){
135135 av_log(context, AV_LOG_ERROR, "failed to execute loaded model\n");
136136 return AVERROR(EIO);
@@ -139,12 +139,12 @@ static int config_props(AVFilterLink *inlink) · 2 unmodified lines
139139 if (sr_context->input.height != sr_context->output.height || sr_context->input.width != sr_context->output.width){
140140 sr_context->input.width = inlink->w;
141141 sr_context->input.height = inlink->h;
142− result = (sr_context->model->set_input_output)(sr_context->model->model, &sr_context->input, "x", &model_output_name, 1);
142+ result = (sr_context->model->set_input)(sr_context->model->model, &sr_context->input, "x");
143143 if (result != DNN_SUCCESS){
144144 av_log(context, AV_LOG_ERROR, "could not set input and output for the model\n");
145145 return AVERROR(EIO);
146146 }
147− result = (sr_context->dnn_module->execute_model)(sr_context->model, &sr_context->output, 1);
147+ result = (sr_context->dnn_module->execute_model)(sr_context->model, &sr_context->output, &model_output_name, 1);
148148 if (result != DNN_SUCCESS){
149149 av_log(context, AV_LOG_ERROR, "failed to execute loaded model\n");
150150 return AVERROR(EIO);
@@ -203,6 +203,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 52 unmodified lines
203203 AVFilterLink *outlink = context->outputs[0];
204204 AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
205205 DNNReturnType dnn_result;
206+ const char *model_output_name = "y";
206207
207208 if (!out){
208209 av_log(context, AV_LOG_ERROR, "could not allocate memory for output frame\n");
@@ -233,7 +234,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 24 unmodified lines
233234 }
234235 av_frame_free(&in);
235236
236− dnn_result = (sr_context->dnn_module->execute_model)(sr_context->model, &sr_context->output, 1);
237+ dnn_result = (sr_context->dnn_module->execute_model)(sr_context->model, &sr_context->output, &model_output_name, 1);
237238 if (dnn_result != DNN_SUCCESS){
238239 av_log(context, AV_LOG_ERROR, "failed to execute loaded model\n");
239240 return AVERROR(EIO);

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