From patchwork Sat Jun 13 15:00:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20336 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 1F27B44B6ED for ; Sat, 13 Jun 2020 18:27:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6DF568B5E7; Sat, 13 Jun 2020 18:27:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0700C68B5C9 for ; Sat, 13 Jun 2020 18:27:06 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id d67so11648020oig.6 for ; Sat, 13 Jun 2020 08:27:05 -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=Q5ECs8EgKTEeEGRW95AGX+AmIkCczuCZfY17mhpOlmn4Me6PpOMdueF2UXyvBRWx+3 CdU7B0EZ4XvY/sXygOgEQl4Sj0xZMffymmTCZFjfkZulEwiUJ8RdOnOoMAjvlkjuLEBr w8HfnJjwN7OLxE1ibt1AIbvV56VORIaS/0Hhp7ABB0kOQ1Mv7n5RX8c7FARRCGv3Ixkl vEebUtXUfc/unoD5QIveiDLqSagicfPQn9R2xgk0/iN9AYWONG6TwQ81Aq8GWHpCKe/I 96kn5MOCMifiLqpdEjy+QBsiqwm698U9VkjgSKS0/uJ9/uIen8Ejz3L56nYW2Kx+XIdv dErg== 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=F/8CdnL9k3JCaMbuLo/iUO0tka8F11LcW5X7MtdSYtbUghR6LN3QFqxijb0RAcAN4n LNa2Zx1suazKmhRqTdtkf/olWB8cypZIQCnCzlzCZTuRSjq+9emn7X/TSo4B+BpbNcvj tg1fWdD8yRU28qU9Nd/uOwhRVtAHl8gObXGYAJYHYI4Nt832P3r4++oifWBPHV8of5X/ hXFcnXlTnJbQL0vltlikWK0FvcyFj2vAxUi1DlY3V7b6dKsc9rJBD9+Rb4xhbs9qLkla 1gB0HQdSOPjbNeRVti7qR2+TOzMc8L+zG3TuksUihW1PGwSLCnKk38TKcnOq6513AbIN RdUA== X-Gm-Message-State: AOAM5319acwhTdKs+hgTg6FfbyN37s4fxniPfhUAzebNvnIY4JdP90A6 /bJyWE0sxcjnqEYTCc0LmTE1VNu6 X-Google-Smtp-Source: ABdhPJy/GClOLVBOxMUV9phQudxy1hdNeBYEYIz+qDXqfdw+iEdT90CJsfJaLcDS9nkDUAi9NBwjOw== X-Received: by 2002:a17:90a:fa04:: with SMTP id cm4mr3792483pjb.218.1592060439499; Sat, 13 Jun 2020 08:00:39 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r7sm8902550pfl.117.2020.06.13.08.00.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 08:00:38 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jun 2020 23:00:27 +0800 Message-Id: <1592060430-3383-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; + } } }