From patchwork Mon Aug 6 21:13:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Lavrushkin X-Patchwork-Id: 9916 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3721677jad; Mon, 6 Aug 2018 14:13:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcjgHCSyHz8UOo9qgHlpqh2kiP3p2afZ5IDy+Osoi5vW2rbOhr8u5vj1p4Y4gekUkfE/UBl X-Received: by 2002:a1c:9b43:: with SMTP id d64-v6mr12961250wme.109.1533590004660; Mon, 06 Aug 2018 14:13:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533590004; cv=none; d=google.com; s=arc-20160816; b=ybdbCe7pz2gSqzRdwuKACWYqg0XPBc9hwyb/1kj5xC3MNBIkT4Rs0j5qP/Q7X2G/t9 0X8QzPLhkbweIvDE44YJFLVFz3nN9rmq2LqolBvDQJn0igShqnRe+Mapw9zXvuT12I57 T6u3e9+c5il1fgRWj10AnFq2aEA2NqcN6Sfbc/2XXKXyjvmDhO27F8AvWjgSRRFXEvCr jYcMrjU9oEM2awSHNTOSSVITTsGe6LWqmno9ZgygFl1iq3bH1gfc4zJywSjSjoTlC/LF BnHgaM0bVSSG0jZipIAYIW6UczrYEqtvXbNL9/roNEihh0X5KLYcxGyDnrCZrAZML0bO cBbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=Ni8LhcACeiuVzpNqofjkjz8oR1Gs7vr3+Cv0E+cItgU=; b=mEkNbmqGjLzZuE+jH0uynMLKIbh5uZ9rOc82T5/pL/ebrKHWXsgI1YjlUUjECtzMpo lf8NvdaTUxnHU6y+eq7hXTCcUGKPfnATuS1KFz6jnZuY2a7YgPwkKIyhaV+2opksGvUo ugBUshyNnveByCzJyea/r6fZe9d/uUhyJhdavy3OOk+z/IgvW3GpgN4G3NG0H4Br+iEI XXdkPEhYMYlwQGxLu0LLXn9dIf/OfvvPR3E5q5cnkhvhnjjEZVw4uyJhaOIDmegQUzZv dqlvYS6RrZyNcftz/6TpVwKYkoEjDanEI+mp4H0ksNv7P2vd0h1oNDg9K5GHBHikpo2y mkVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ovnxFBqh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t6-v6si9266962wrm.351.2018.08.06.14.13.24; Mon, 06 Aug 2018 14:13:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ovnxFBqh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2ACFF689C0C; Tue, 7 Aug 2018 00:13:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3487689952 for ; Tue, 7 Aug 2018 00:12:56 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id f14-v6so6245199pgv.13 for ; Mon, 06 Aug 2018 14:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=mDH4BpujbeI2/6OaJ5cHn/CncfSysxBENy8cxobcwmE=; b=ovnxFBqh3f8zULKlXxpxGsXai0pPodxJjfDzufGGCVsHeGGALmiD9JV9MJJkbRWu9M jAUcF7lrmPrmaY5p71iuouy8NUUAN30SVilSRF22NGwWI+GtVddetJiMuAvVZxv/QVfc aydWV9q44Rj3nHNPqk3ZZ9TdaqZvuQPMRZEMIYuKgxJfkBIriGbKasEXbABORcgu7iEM zu/ncpH+lydbJtDl4DxnCNpsa00XMYCOHFHMMteQ3x5AEKGRZsAh8xBd6Hf0m+oNZ4ms bWpAe3RoNmK/o0L0s778sqRfcIosYh88Y2qdZkVMVZpEOaz0uwb9cJkj/JsVxXOojlnj icQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=mDH4BpujbeI2/6OaJ5cHn/CncfSysxBENy8cxobcwmE=; b=pnO0A4GdJgYZKH8pHmIag/v29ipImUhV49FyWnF+c3WktlQGNR+gGghdDYI68W+Yqv d3+RaQ+FFv/5NeEvAdEKTythBUZMMHjh77RqImWe0xmdNVm/orZiz9UoZTCkOQwfgFh/ S4pbGQPRoV/Xj8IEQwtu0Qohix9GBVtzDKXXO8Ayr2uNPTKPmr3R+rSMAOYtVACHHTcJ T3vL6DOb7gPpixYZwo2tjmynFFnm4+X8pq37vasr18OjEi91PLNqcwYDRT1UsHH0TtxK 83mtxF6JmgLFsBwV8RfAk5G1mAm6tl0r38IohQDtE3Gfpe0BOxrhlyYUP2EgATEkVh6F ehrw== X-Gm-Message-State: AOUpUlEwzbZAzXG5ufqYIXjXc733aRIBx0fZ9LKJpLGXFoliBSEZQVAr f3lUS7jyEvSTKRrzITWNQwgvd7OW5zhJo1FWS9qfp9CB X-Received: by 2002:a62:6eca:: with SMTP id j193-v6mr18940488pfc.256.1533589995083; Mon, 06 Aug 2018 14:13:15 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:90a:501:0:0:0:0 with HTTP; Mon, 6 Aug 2018 14:13:14 -0700 (PDT) In-Reply-To: References: <20180802185248.18168-1-dualfal@gmail.com> <20180802185248.18168-4-dualfal@gmail.com> From: Sergey Lavrushkin Date: Tue, 7 Aug 2018 00:13:14 +0300 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH 3/7] libavfilter: Fixes warnings for unused variables in dnn_srcnn.h, dnn_espcn.h, dnn_backend_tf.c. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Made variables static. 2018-08-06 21:19 GMT+03:00 Pedro Arthur : > 2018-08-02 15:52 GMT-03:00 Sergey Lavrushkin : > > --- > > libavfilter/dnn_backend_tf.c | 64 ++++++++++++++++++++++++++++++ > +++++++++++++- > > libavfilter/dnn_espcn.h | 37 ------------------------- > > libavfilter/dnn_srcnn.h | 35 ------------------------ > > 3 files changed, 63 insertions(+), 73 deletions(-) > > > > diff --git a/libavfilter/dnn_backend_tf.c b/libavfilter/dnn_backend_tf.c > > index 6307c794a5..7a4ad72d27 100644 > > --- a/libavfilter/dnn_backend_tf.c > > +++ b/libavfilter/dnn_backend_tf.c > > @@ -374,9 +374,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}; > > + const char tanh[] = "Tanh"; > > + const char sigmoid[] = "Sigmoid"; > > + const char relu[] = "Relu"; > > + > > + const float *srcnn_consts[] = { > > + srcnn_conv1_kernel, > > + srcnn_conv1_bias, > > + srcnn_conv2_kernel, > > + srcnn_conv2_bias, > > + srcnn_conv3_kernel, > > + srcnn_conv3_bias > > + }; > > + 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 > > + }; > > + const int srcnn_consts_dims_len[] = { > > + 4, > > + 1, > > + 4, > > + 1, > > + 4, > > + 1 > > + }; > > + const char *srcnn_activations[] = { > > + relu, > > + relu, > > + relu > > + }; > > + > > + const float *espcn_consts[] = { > > + espcn_conv1_kernel, > > + espcn_conv1_bias, > > + espcn_conv2_kernel, > > + espcn_conv2_bias, > > + espcn_conv3_kernel, > > + espcn_conv3_bias > > + }; > > + 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 > > + }; > > + const int espcn_consts_dims_len[] = { > > + 4, > > + 1, > > + 4, > > + 1, > > + 4, > > + 1 > > + }; > > + const char *espcn_activations[] = { > > + tanh, > > + tanh, > > + sigmoid > > + }; > > > > input.index = 0; > > > > diff --git a/libavfilter/dnn_espcn.h b/libavfilter/dnn_espcn.h > > index a0dd61cd0d..9344aa90fe 100644 > > --- a/libavfilter/dnn_espcn.h > > +++ b/libavfilter/dnn_espcn.h > > @@ -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 > > diff --git a/libavfilter/dnn_srcnn.h b/libavfilter/dnn_srcnn.h > > index 26143654b8..4f5332ce18 100644 > > --- a/libavfilter/dnn_srcnn.h > > +++ b/libavfilter/dnn_srcnn.h > > @@ -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 > > -- > > 2.14.1 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > LGTM. > I'll push it by tomorrow. > From 88d476956c86f0b55d7610c417b3f6c2f516f70e Mon Sep 17 00:00:00 2001 From: Sergey Lavrushkin Date: Sat, 28 Jul 2018 12:55:02 +0300 Subject: [PATCH 3/9] libavfilter: Fixes warnings for unused variables in dnn_srcnn.h, dnn_espcn.h, dnn_backend_tf.c. --- libavfilter/dnn_backend_tf.c | 66 ++++++++++++++++++++++++++++++++++++++++++-- libavfilter/dnn_espcn.h | 37 ------------------------- libavfilter/dnn_srcnn.h | 35 ----------------------- 3 files changed, 64 insertions(+), 74 deletions(-) diff --git a/libavfilter/dnn_backend_tf.c b/libavfilter/dnn_backend_tf.c index 6528a2a390..bd21137a8a 100644 --- a/libavfilter/dnn_backend_tf.c +++ b/libavfilter/dnn_backend_tf.c @@ -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; diff --git a/libavfilter/dnn_espcn.h b/libavfilter/dnn_espcn.h index a0dd61cd0d..9344aa90fe 100644 --- a/libavfilter/dnn_espcn.h +++ b/libavfilter/dnn_espcn.h @@ -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 diff --git a/libavfilter/dnn_srcnn.h b/libavfilter/dnn_srcnn.h index 26143654b8..4f5332ce18 100644 --- a/libavfilter/dnn_srcnn.h +++ b/libavfilter/dnn_srcnn.h @@ -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 -- 2.14.1