From patchwork Sat Jun 13 15:05:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20330 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 3A180449DAA for ; Sat, 13 Jun 2020 18:05:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 169CC68B361; Sat, 13 Jun 2020 18:05:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C63BA68A9F0 for ; Sat, 13 Jun 2020 18:05:42 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id y18so4939115plr.4 for ; Sat, 13 Jun 2020 08:05:42 -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; bh=ZJMDYfDoxpSbMbkz49ML0sHJJ+eloNhnS1QokJ6PyJg=; b=gIXATj5JlRZPi4zlexksvWqLqVXwvww6vBsvpCFfOIYYONJFY+42XQllZBLxrSvTBi 8e85sYsEFTLK8aNWMMMMcRI3iqssJzvzu3BIaaAOzcCQMAcQK7lA+cGz/gsmw9RvTQr3 iA7HPhPIuwCkA9zrQdcVJmXeZrMhFAMB4QYDAmPE/0zDvuuvAyv+ucLBbhAJWE2x5/1z pi8vHe46r5fJY/jd2RA2QTpcWlxwaT00IYCI6nrtRVd1UV27YcXVOtSGM/AYLdfV08hQ dFC/L7edSD2avUBrcdqpyyDw9ASBCcTHC3wWFFELVAK6anyKd8DIIwENXgst/FRCdVEV VAdA== 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; bh=ZJMDYfDoxpSbMbkz49ML0sHJJ+eloNhnS1QokJ6PyJg=; b=G9CX2yDNzo5U4PXSUhYpGV13hmXcIEJqgmObsfpnQW5IBJPZd5WR064E/u6Wo8XKBb ePKWsLK+5F/Eau8vZclVC2xfIFgqkfcRWbJZEJemqGah5laMGdLevMR58KgJsaMTry4i EkxX7m+rpGBWZn9KmIhpyQqKk6FAVn6Yo//JVfUWEzU66JyFd/Axv/qg9UdjxOAyi+hB k+84zI5F9x4CgrYMR/iM9OpKbzK8B49bUNZEPCGlxFuRTZrQ0uq8klhhFew8TTfLfsjb AehRes5zBGneU/ElZPCEyCEq97csZBGdoE8Tdl0UDrzGpu7T4RLiHj1mpCg6EqhHryop vJNg== X-Gm-Message-State: AOAM5326bpeuA9pV6zo/8BABovaPgNbfkDuoykgo9+XyDewneOdhYcUk /vf+ARd7hhDyErYui/xQlMIFqOLS X-Google-Smtp-Source: ABdhPJwHtO4g1lmHbYbsv30Pjx4zIaY8UdP9pPenZLH20mQxFLSDx4gNBi5a9hPBCugOQhTJhgs7tA== X-Received: by 2002:a17:902:9346:: with SMTP id g6mr15432680plp.19.1592060740996; Sat, 13 Jun 2020 08:05:40 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u61sm8168379pjb.7.2020.06.13.08.05.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 08:05:40 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jun 2020 23:05:36 +0800 Message-Id: <1592060736-3496-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/4] swscale/utils: reindent 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libswscale/utils.c | 71 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index ff99e79..6e218ba 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1575,41 +1575,42 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, if (CONFIG_SWSCALE_ALPHA && isALPHA(srcFormat) && !isALPHA(dstFormat)) { enum AVPixelFormat tmpFormat = alphaless_fmt(srcFormat); - if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE) - if (!unscaled || - dstFormat != tmpFormat || - usesHFilter || usesVFilter || - c->srcRange != c->dstRange - ) { - c->cascaded_mainindex = 1; - ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, - srcW, srcH, tmpFormat, 64); - if (ret < 0) - return ret; - - c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat, - srcW, srcH, tmpFormat, - flags, c->param); - if (!c->cascaded_context[0]) - return -1; - c->cascaded_context[0]->alphablend = c->alphablend; - ret = sws_init_context(c->cascaded_context[0], NULL , NULL); - if (ret < 0) - return ret; - - c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat, - dstW, dstH, dstFormat, - flags, c->param); - if (!c->cascaded_context[1]) - return -1; - - c->cascaded_context[1]->srcRange = c->srcRange; - c->cascaded_context[1]->dstRange = c->dstRange; - ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter); - if (ret < 0) - return ret; - - return 0; + if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE) { + if (!unscaled || + dstFormat != tmpFormat || + usesHFilter || usesVFilter || + c->srcRange != c->dstRange + ) { + c->cascaded_mainindex = 1; + ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, + srcW, srcH, tmpFormat, 64); + if (ret < 0) + return ret; + + c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat, + srcW, srcH, tmpFormat, + flags, c->param); + if (!c->cascaded_context[0]) + return -1; + c->cascaded_context[0]->alphablend = c->alphablend; + ret = sws_init_context(c->cascaded_context[0], NULL , NULL); + if (ret < 0) + return ret; + + c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat, + dstW, dstH, dstFormat, + flags, c->param); + if (!c->cascaded_context[1]) + return -1; + + c->cascaded_context[1]->srcRange = c->srcRange; + c->cascaded_context[1]->dstRange = c->dstRange; + ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter); + if (ret < 0) + return ret; + + return 0; + } } }