From patchwork Mon Aug 19 13:01:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14586 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 1BAD5447F67 for ; Mon, 19 Aug 2019 16:09:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02B4C68AB33; Mon, 19 Aug 2019 16:09:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71A8468AAAB for ; Mon, 19 Aug 2019 16:09:47 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id d1so1208247pgp.4 for ; Mon, 19 Aug 2019 06:09:47 -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=VxYR9HO5jQHKoVJTyIJx47Jk7MFoiPzzqsa2DJa4SUw=; b=a4BAazmE57fU/oBGoMxOR4NTpdpZ8pDF02qjC7Y0RJo/JO0purVraSYe8vuIL0oIBm Cs0vTvcnc2SCmnWTCuDwu+eAkOZcR2O3P80DQ7uQjj2D8sAijdANIO1bVSKSNj0wJfBV K5qC7cMusgjYGwmteBtJc9d2umbgte9T5Iy6Rh1GIyhhSgl57gduGFhvjyrqHDmZbKOh wz58Ls+BP7aT+QjGkGl0TG6icaCo/FyPpm6sWTtZz3Oy990UNieFmUhOOQvFqGv8osAl p5UM98ki3TI/B4HBnuoSsfRdp7lYHlHhWBEBX4kr+1Vz1AQhfxKVISZBH7ow33kZEfDd ZJ3Q== 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=VxYR9HO5jQHKoVJTyIJx47Jk7MFoiPzzqsa2DJa4SUw=; b=hO5mhuN1tSRpBS3gEGtS9bC6eNC5dnPeraOEzU1t2pW9sEt5wRe5L+zqgoEonDGZqP 09fvW0xx6+DBgUCngtHp0W8YKJJ8Q4FMuLTZbAZjbdytA/IhCA0cnjJzQPCM+4uSvAPY qmEIJp5uDpmzkDnfwpqJyrRHwDJRdFeELqHueaqpA0L5dt48gFKCho0gMA2M3I1wSkzM CXQXfQJDc/bfqJhNYQ6oWIO0yaUvKh4W2zfin+LL2nFE0Nqqb2GyC6KoOR5M8q38fcTl mfnWK8tcZUjfkZKIEAZx1G66AT1uIf9njWbOiFqJwSiecGnjTgJYYyKsZ6m7h7eY1jyE snJQ== X-Gm-Message-State: APjAAAVCQSDEzMbS13/K+IUeP0kIvww1tB5O3I8kX+dEL7U9KR2G47BW jfVteJFsrAMFRS4i82iTx1Hk48+t X-Google-Smtp-Source: APXvYqyfJHoQDG2S3NBcU+egu0NDXmjWwCS2sgsrzxnt0mIh8Efy/BEhCeaE1G+KVQtKGhFWy+oJ4w== X-Received: by 2002:aa7:984a:: with SMTP id n10mr24217697pfq.3.1566219678923; Mon, 19 Aug 2019 06:01:18 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s125sm20865656pfc.133.2019.08.19.06.01.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 06:01:18 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Aug 2019 21:01:05 +0800 Message-Id: <1566219667-22805-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1566219667-22805-1-git-send-email-mypopydev@gmail.com> References: <1566219667-22805-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 3/5] lavfi/dnn/dnn_backend_native: Refine the coding style 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/dnn/dnn_backend_native.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native.c b/libavfilter/dnn/dnn_backend_native.c index 09c583b..7b489d0 100644 --- a/libavfilter/dnn/dnn_backend_native.c +++ b/libavfilter/dnn/dnn_backend_native.c @@ -40,19 +40,17 @@ static DNNReturnType set_input_output_native(void *model, DNNInputData *input, c if (network->layers_num <= 0 || network->layers[0].type != INPUT){ return DNN_ERROR; } - else{ - input_params = (InputParams *)network->layers[0].params; - input_params->width = cur_width = input->width; - input_params->height = cur_height = input->height; - input_params->channels = cur_channels = input->channels; - if (input->data){ - av_freep(&input->data); - } - av_assert0(input->dt == DNN_FLOAT); - network->layers[0].output = input->data = av_malloc(cur_height * cur_width * cur_channels * sizeof(float)); - if (!network->layers[0].output){ - return DNN_ERROR; - } + input_params = (InputParams *)network->layers[0].params; + input_params->width = cur_width = input->width; + input_params->height = cur_height = input->height; + input_params->channels = cur_channels = input->channels; + if (input->data){ + av_freep(&input->data); + } + av_assert0(input->dt == DNN_FLOAT); + network->layers[0].output = input->data = av_malloc(cur_height * cur_width * cur_channels * sizeof(float)); + if (!network->layers[0].output){ + return DNN_ERROR; } for (layer = 1; layer < network->layers_num; ++layer){