Commit 1b9064e3 authored by Guo, Yejun's avatar Guo, Yejun Committed by Pedro Arthur

libavfilter/dnn: move dnn files from libavfilter to libavfilter/dnn

it is expected that there will be more files to support native mode,
so put all the dnn codes under libavfilter/dnn

The main change of this patch is to move the file location, see below:
modified:   libavfilter/Makefile
new file:   libavfilter/dnn/Makefile
renamed:    libavfilter/dnn_backend_native.c -> libavfilter/dnn/dnn_backend_native.c
renamed:    libavfilter/dnn_backend_native.h -> libavfilter/dnn/dnn_backend_native.h
renamed:    libavfilter/dnn_backend_tf.c -> libavfilter/dnn/dnn_backend_tf.c
renamed:    libavfilter/dnn_backend_tf.h -> libavfilter/dnn/dnn_backend_tf.h
renamed:    libavfilter/dnn_interface.c -> libavfilter/dnn/dnn_interface.c
Signed-off-by: 's avatarGuo, Yejun <yejun.guo@intel.com>
Signed-off-by: 's avatarPedro Arthur <bygrandao@gmail.com>
parent ebfcd4be
...@@ -26,9 +26,8 @@ OBJS-$(HAVE_THREADS) += pthread.o ...@@ -26,9 +26,8 @@ OBJS-$(HAVE_THREADS) += pthread.o
# subsystems # subsystems
OBJS-$(CONFIG_QSVVPP) += qsvvpp.o OBJS-$(CONFIG_QSVVPP) += qsvvpp.o
DNN-OBJS-$(CONFIG_LIBTENSORFLOW) += dnn_backend_tf.o
OBJS-$(CONFIG_DNN) += dnn_interface.o dnn_backend_native.o $(DNN-OBJS-yes)
OBJS-$(CONFIG_SCENE_SAD) += scene_sad.o OBJS-$(CONFIG_SCENE_SAD) += scene_sad.o
include $(SRC_PATH)/libavfilter/dnn/Makefile
# audio filters # audio filters
OBJS-$(CONFIG_ABENCH_FILTER) += f_bench.o OBJS-$(CONFIG_ABENCH_FILTER) += f_bench.o
......
OBJS-$(CONFIG_DNN) += dnn/dnn_interface.o
OBJS-$(CONFIG_DNN) += dnn/dnn_backend_native.o
DNN-OBJS-$(CONFIG_LIBTENSORFLOW) += dnn/dnn_backend_tf.o
OBJS-$(CONFIG_DNN) += $(DNN-OBJS-yes)
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
*/ */
#ifndef AVFILTER_DNN_BACKEND_NATIVE_H #ifndef AVFILTER_DNN_DNN_BACKEND_NATIVE_H
#define AVFILTER_DNN_BACKEND_NATIVE_H #define AVFILTER_DNN_DNN_BACKEND_NATIVE_H
#include "dnn_interface.h" #include "../dnn_interface.h"
#include "libavformat/avio.h" #include "libavformat/avio.h"
typedef enum {INPUT, CONV, DEPTH_TO_SPACE} DNNLayerType; typedef enum {INPUT, CONV, DEPTH_TO_SPACE} DNNLayerType;
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
*/ */
#ifndef AVFILTER_DNN_BACKEND_TF_H #ifndef AVFILTER_DNN_DNN_BACKEND_TF_H
#define AVFILTER_DNN_BACKEND_TF_H #define AVFILTER_DNN_DNN_BACKEND_TF_H
#include "dnn_interface.h" #include "../dnn_interface.h"
DNNModel *ff_dnn_load_model_tf(const char *model_filename); DNNModel *ff_dnn_load_model_tf(const char *model_filename);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* Implements DNN module initialization with specified backend. * Implements DNN module initialization with specified backend.
*/ */
#include "dnn_interface.h" #include "../dnn_interface.h"
#include "dnn_backend_native.h" #include "dnn_backend_native.h"
#include "dnn_backend_tf.h" #include "dnn_backend_tf.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment