libavfilter: Fixes warnings for unused variables in dnn_srcnn.h, dnn_espcn.h, dnn_bac...
authorSergey Lavrushkin <dualfal@gmail.com>
Sat, 28 Jul 2018 09:55:02 +0000 (12:55 +0300)
committerPedro Arthur <bygrandao@gmail.com>
Tue, 7 Aug 2018 16:28:04 +0000 (13:28 -0300)
Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
libavfilter/dnn_backend_tf.c
libavfilter/dnn_espcn.h
libavfilter/dnn_srcnn.h

index 6528a2a..bd21137 100644 (file)
@@ -375,9 +375,71 @@ DNNModel *ff_dnn_load_default_model_tf(DNNDefaultModel model_type)
     TFModel *tf_model = NULL;
     TF_OperationDescription *op_desc;
     TF_Operation *op;
-    TF_Operation *const_ops_buffer[6];
     TF_Output input;
-    int64_t input_shape[] = {1, -1, -1, 1};
+    static const int64_t input_shape[] = {1, -1, -1, 1};
+    static const char tanh[] = "Tanh";
+    static const char sigmoid[] = "Sigmoid";
+    static const char relu[] = "Relu";
+
+    static const float *srcnn_consts[] = {
+        srcnn_conv1_kernel,
+        srcnn_conv1_bias,
+        srcnn_conv2_kernel,
+        srcnn_conv2_bias,
+        srcnn_conv3_kernel,
+        srcnn_conv3_bias
+    };
+    static const long int *srcnn_consts_dims[] = {
+        srcnn_conv1_kernel_dims,
+        srcnn_conv1_bias_dims,
+        srcnn_conv2_kernel_dims,
+        srcnn_conv2_bias_dims,
+        srcnn_conv3_kernel_dims,
+        srcnn_conv3_bias_dims
+    };
+    static const int srcnn_consts_dims_len[] = {
+        4,
+        1,
+        4,
+        1,
+        4,
+        1
+    };
+    static const char *srcnn_activations[] = {
+        relu,
+        relu,
+        relu
+    };
+
+    static const float *espcn_consts[] = {
+        espcn_conv1_kernel,
+        espcn_conv1_bias,
+        espcn_conv2_kernel,
+        espcn_conv2_bias,
+        espcn_conv3_kernel,
+        espcn_conv3_bias
+    };
+    static const long int *espcn_consts_dims[] = {
+        espcn_conv1_kernel_dims,
+        espcn_conv1_bias_dims,
+        espcn_conv2_kernel_dims,
+        espcn_conv2_bias_dims,
+        espcn_conv3_kernel_dims,
+        espcn_conv3_bias_dims
+    };
+    static const int espcn_consts_dims_len[] = {
+        4,
+        1,
+        4,
+        1,
+        4,
+        1
+    };
+    static const char *espcn_activations[] = {
+        tanh,
+        tanh,
+        sigmoid
+    };
 
     input.index = 0;
 
index a0dd61c..9344aa9 100644 (file)
@@ -5398,41 +5398,4 @@ static const long int espcn_conv3_bias_dims[] = {
     4
 };
 
-static const float *espcn_consts[] = {
-    espcn_conv1_kernel,
-    espcn_conv1_bias,
-    espcn_conv2_kernel,
-    espcn_conv2_bias,
-    espcn_conv3_kernel,
-    espcn_conv3_bias
-};
-
-static const long int *espcn_consts_dims[] = {
-    espcn_conv1_kernel_dims,
-    espcn_conv1_bias_dims,
-    espcn_conv2_kernel_dims,
-    espcn_conv2_bias_dims,
-    espcn_conv3_kernel_dims,
-    espcn_conv3_bias_dims
-};
-
-static const int espcn_consts_dims_len[] = {
-    4,
-    1,
-    4,
-    1,
-    4,
-    1
-};
-
-static const char espcn_tanh[] = "Tanh";
-
-static const char espcn_sigmoid[] = "Sigmoid";
-
-static const char *espcn_activations[] = {
-    espcn_tanh,
-    espcn_tanh,
-    espcn_sigmoid
-};
-
 #endif
index 2614365..4f5332c 100644 (file)
@@ -2110,39 +2110,4 @@ static const long int srcnn_conv3_bias_dims[] = {
     1
 };
 
-static const float *srcnn_consts[] = {
-    srcnn_conv1_kernel,
-    srcnn_conv1_bias,
-    srcnn_conv2_kernel,
-    srcnn_conv2_bias,
-    srcnn_conv3_kernel,
-    srcnn_conv3_bias
-};
-
-static const long int *srcnn_consts_dims[] = {
-    srcnn_conv1_kernel_dims,
-    srcnn_conv1_bias_dims,
-    srcnn_conv2_kernel_dims,
-    srcnn_conv2_bias_dims,
-    srcnn_conv3_kernel_dims,
-    srcnn_conv3_bias_dims
-};
-
-static const int srcnn_consts_dims_len[] = {
-    4,
-    1,
-    4,
-    1,
-    4,
-    1
-};
-
-static const char srcnn_relu[] = "Relu";
-
-static const char *srcnn_activations[] = {
-    srcnn_relu,
-    srcnn_relu,
-    srcnn_relu
-};
-
 #endif