From patchwork Mon Nov 13 15:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44649 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp1385514pzg; Mon, 13 Nov 2023 07:32:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfs2dxHU/c7kXf8Zcqgei8bVshOkSAmJwo6lGHZJzgGAP+1rNBqGE4YVC2xZCZpQBlgpcu X-Received: by 2002:a17:906:4e08:b0:9dd:cc3d:7ba7 with SMTP id z8-20020a1709064e0800b009ddcc3d7ba7mr4826148eju.29.1699889571105; Mon, 13 Nov 2023 07:32:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699889571; cv=none; d=google.com; s=arc-20160816; b=HhrXEEDVKXK3YN1tc9NHVCtFo7Mow4z8a/Y7/tWV+vwrC7F7Nbs/sMM5sqI+X/flyQ 2G//FMwpmaeKvZIThTREmPIWruZmcBSnZcSu9i9pVrRaGzv5jSDtFAH5fvApkaWnRE4r 3r5yZb2+n1Inw69tQkPxHFcNGxkcmqVoCO0Ael1rHS5LH3xsy5cb3Bfxm13QUrPevjR1 aOmy690g2Epgw7g5v9FP0SJ52NoVlGAutu0WGLAAdZU2ctM6Pafog4bKWORT9NULDF9H le4USBt9Had8XwdGfvL3Ewm2zU9DSGCEWBoUWW29o2bdbJeo6fHFDrDdLCzNiHs6W/wF Eigg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=YZVDn4T8q9PdslzEnpAGJFJoOnvHSd0Hps5K29cxZU4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Z2m0vi3WxMBuRjac3N2/rN1a+MUkbvMyMX074M/CLWm15OjayszWU9S4ra/O4RtbO+ D00Fqv2dVZP8GZPWzL+UNJ4lwEn8vpI584ROMxTI+8hrHXIxkKCjkYalmQX/nd5IE0JO yqzIlWjH/scUMImZ1igy4Y67afx2pIa2BYGrJuImN4n3uoXPXox31h38em8NO+T/I+KS TuMgZU4ixZbpIH5jOtEu4us22eo42aW3DPII/8nAT4Udejatx4KbeHuSIoIDTs5uasLR G/n5WpYtPk1RC3lga3ojJ2jzyggxdMmVDTyjps2/b3XQhz7MjfVd8zdWOQFmIRW4mi3X I17w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=lhZIJG93; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga10-20020a170906b84a00b009ddbd424ed2si2919627ejb.255.2023.11.13.07.32.50; Mon, 13 Nov 2023 07:32:51 -0800 (PST) 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=@haasn.xyz header.s=mail header.b=lhZIJG93; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7955F68CCFA; Mon, 13 Nov 2023 17:32:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2BC268CC74 for ; Mon, 13 Nov 2023 17:32:39 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 41F0A4B527; Mon, 13 Nov 2023 16:32:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1699889559; bh=SP8lKYiaMKtNjKTZmr8BdEc3qUHxydSNM63PUgWvdQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lhZIJG93bGQFoALRibZfeWUD9ggZJpfqaSOTGg85g8dt2PMmGyvJWbzbDaWToOtrh vdf5czQ5d0PzN2ZpRfqVLxLJZBKFn0LOgZmXVX4jdheyrnams5oHg6lazl3mIuu24E h+g39JEsqL0pAsuqHgtu0JBwBSzA+5RTYP5Ho54Y= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2023 16:32:34 +0100 Message-ID: <20231113153234.8812-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231113153234.8812-1-ffmpeg@haasn.xyz> References: <20231113153234.8812-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] swscale/utils: don't early return in yuv alpha blendaway X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LwfiANnJatkO From: Niklas Haas If changing YUV range after init results in the special converter no longer being picked, then we need the rest of the init function to have been hit. Fixes: cedf589c09c567b72bf4c1a58db53d94622567e1 --- libswscale/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 7ce86f83ea..294b0b5ace 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1721,7 +1721,9 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, av_log(c, AV_LOG_INFO, "alpha blendaway %s -> %s special converter is available\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); - return 0; + + if (isAnyRGB(dstFormat)) + return 0; } /* unscaled special cases */