From patchwork Sat Jun 1 04:58:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13367 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D2B4A449601 for ; Sat, 1 Jun 2019 07:58:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B89ED68AAAB; Sat, 1 Jun 2019 07:58:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C92B68AAAB for ; Sat, 1 Jun 2019 07:58:41 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id g69so4806879plb.7 for ; Fri, 31 May 2019 21:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N7KQlfGXkqRiGpQ9Rx7x90v+8OdxgyoJdDX0ay4QlNw=; b=Y0ST/HqJyjZgNlT27q8OZkrcK+lXtUauCXHhWt86Pw7yftOvNGMKXRJf3EJo38hE0v C3FdOUWIgu/ssqk0D5++BGDYsbrahPc5VDpvE0VOn0dzbMKqPaxqeMA+8Sa0lq3gJs1r QmEnNwWrfOkGLnSHsRwiYo+oJER29Tzptqif1QqYfYgEYmgz0auXavwrtIyFPhSUGuMz b82pluaMOQWbJJuWnKAEioX128h1eGsKVaPUr+bH+lf+px5Yy6jBiTJ4padO2KGotFpq 0ZpsjjOHxZ2Ep5Lhhvz5D+EgxOat66d2CD9rmV5B1uU0wDcQ9PnlacHkP+CYJ7z4TsCi WKiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N7KQlfGXkqRiGpQ9Rx7x90v+8OdxgyoJdDX0ay4QlNw=; b=gwpGicaYL31my/FkZEOfJnB3NKubcdTZnAV9repLe1kxf3a+R47NOza6bQWibSF/Vp gHK7l+GmQXpBeFIG/bZq2DuHULYiLyyErd/E+StNIqr0dukI61uzZlyzmEgXfvclg5On kjidbtmkY3ORaN5cLLbXUlsRi6OF/yJNNxNEjWCOj+SvlOodJyLYATRXBxcOoyIEIkEN zBAlUDyG27LbI01x5LQAW2ANaiN7My+SI7lBm3WphU1dzI0LI7Zra/PnouVicsjiD31W ggYTA/bHH/vwyNPlCCAW7hBqbegojYN7MOJ+72R1dRLCWnovSMhxE229RiDWggYFjeuF Df9A== X-Gm-Message-State: APjAAAV2mu2NuASi+OJ6Oxxs9mm38i8VGpo87hBtuFhXQF9veLHlZND2 MnrdpMQX1fpLq8r8q3BayTOHHp1f X-Google-Smtp-Source: APXvYqxUhrfh+OzEOO9tfZQnuLmssNwf1jxNUoxm9/5cYXsNK0RECl3gcFnPSGNxnksrB/7i/z5aAA== X-Received: by 2002:a17:902:9a43:: with SMTP id x3mr14104520plv.35.1559365119696; Fri, 31 May 2019 21:58:39 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id o6sm7696822pfo.164.2019.05.31.21.58.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 May 2019 21:58:39 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jun 2019 12:58:26 +0800 Message-Id: <1559365106-9734-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1559365106-9734-1-git-send-email-mypopydev@gmail.com> References: <1559365106-9734-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 3/3] lavf/sr: Refine the coding style for init 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao We perfer the coding style like: /* some stuff */ if (error) { /* error handling */ return -(errorcode); } /* normal actions */ do_something() Signed-off-by: Jun Zhao --- libavfilter/vf_sr.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index 0be572f..0433246 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -72,17 +72,16 @@ static av_cold int init(AVFilterContext *context) av_log(context, AV_LOG_ERROR, "could not create DNN module for requested backend\n"); return AVERROR(ENOMEM); } + if (!sr_context->model_filename){ av_log(context, AV_LOG_ERROR, "model file for network was not specified\n"); return AVERROR(EIO); - } else { - if (!sr_context->dnn_module->load_model) { - av_log(context, AV_LOG_ERROR, "load_model for network was not specified\n"); - return AVERROR(EIO); - } else { - sr_context->model = (sr_context->dnn_module->load_model)(sr_context->model_filename); - } } + if (!sr_context->dnn_module->load_model) { + av_log(context, AV_LOG_ERROR, "load_model for network was not specified\n"); + return AVERROR(EIO); + } + sr_context->model = (sr_context->dnn_module->load_model)(sr_context->model_filename); if (!sr_context->model){ av_log(context, AV_LOG_ERROR, "could not load DNN model\n"); return AVERROR(EIO);