From patchwork Tue Feb 20 02:49:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1614509pzb; Mon, 19 Feb 2024 18:49:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXO+YwmW5+NgAuoEDdE/M5a+Rq/aCAGeowBWFGuR6SjOEDj4g2d1QHdMuS2XWt3u23/sKP5j806N8TGF1D8Ek0o06jAFON6hAjxWw== X-Google-Smtp-Source: AGHT+IFaoxrReEzcOHV+mj6zS6sr+P1+yMcz5X42ZlIXBOqlzD6TsC7Lnpd1oLUJ6pExii0WwKLS X-Received: by 2002:a17:906:c7d6:b0:a3e:b726:20ef with SMTP id dc22-20020a170906c7d600b00a3eb72620efmr2198938ejb.34.1708397384387; Mon, 19 Feb 2024 18:49:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708397384; cv=none; d=google.com; s=arc-20160816; b=fYhoFYinZAgdxomUamKewEsKf255g3fEz+EdZn/B/LyNSosVyiptCtVfRaq8FYvmd2 M12BJVy2pXF2kHWnWo3NXZP4PkbljXUNqkOJMEV0LZh0x304DvhpgcmErMAVsAobM1/2 m2mbdoCrPwkQcgfcO87hNjTyAYLs36v5gtRwt8/06WjeFSUyupH2s4nu2Hveob/8aK5R FuiD0IIFnOYhPwSxavHxHN3SL9ciAkBeFb7QrnCghVA9YzEuVGJTCbgVCNwXxCJDWGHP Qju3T4NmPsZ8BtS0arFRNwj9W4Ax4jRhmwv/M1iVLUN5PpFruyGvJ6YzZ2q2eDY6utoZ BcVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=xLPjjLFVY0Rxg/G8hp1/gOCB1G2O1QhVoKVfpjTP0s8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gNRUgkekyVgkPXl1RTg5ywMVJQWRIlQfZ0l9qskMu9fLhDn4xZjV4RiEYEUnofm0G6 QesL7iJbiV573kVz9AE+OKRb+zETrGY616LRSb+0gfx5KQdMkhdwJRbxdUL3kr8LjuR1 +ksWEp0cU6dqjRCjMk9EPQqgw+7j30T1W1lU9CKffuqUhnekqAeuTSqiEMwG8kLzoDu9 q95HMjZnLsFgy0V2icG0Kwzd9anfyLYS4AgmpK8imsx57J078m3nMgSOyaWqV5aL/Xsp nP/hZs983Du3Sn5P6VlePhnSHmCEAdHcofztlf5aq/NjFxuclMgRjvNEtcGQZCCcSW+y OiOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="OV/NTb1h"; 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 gx3-20020a170906f1c300b00a3f01279328si69473ejb.107.2024.02.19.18.49.43; Mon, 19 Feb 2024 18:49:44 -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=@niedermayer.cc header.s=gm1 header.b="OV/NTb1h"; 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 2056D68D44C; Tue, 20 Feb 2024 04:49:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9158B68C248 for ; Tue, 20 Feb 2024 04:49:24 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id C0D8DE0002 for ; Tue, 20 Feb 2024 02:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1708397363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=TFIlpQAqtQF5AtC95gl3/dHot2anc+MorwbmQvmeIDI=; b=OV/NTb1hx1OUGyI6EEzKMy4exWPmBxAB3IfNNs8aLrvzcyaO9zhJJznT8hCRDrmSNNEPeX tANn80BaufCxVutrZRhQR2Puf15fXBj/xANfNWBbsnpLDjpsl/Zwlcor8ryINV5V2Sm1sf Bm+qcLkTwP6ZD5quomagpGggIJ2jrBiz39LMhMyGlVywst5sziX0BhwJ4Umr0dLvREkbE/ 10SiQsiOHou/Xv3FWfxlHH+NGGtRCo9mEjP8HUPkeLgBXGFYvrtpKsrtKJ1g9DSvrwp6dj uSn/LIjHEVEJt8oPysvEAmIPQZwzy3klnNhsm9IR4qLMF4oPaw3AHe/J+pKpMQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Feb 2024 03:49:21 +0100 Message-Id: <20240220024922.22779-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240220024922.22779-1-michael@niedermayer.cc> References: <20240220024922.22779-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] Revert "swscale: fix sws_setColorspaceDetails after sws_init_context" 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eSKF0Eq6ZnVM Suggested by: Niklas Haas in Ticket10824 Fixes: Assertion failure Fixes: Ticket10824 This reverts commit cedf589c09c567b72bf4c1a58db53d94622567e1. --- libswscale/swscale.c | 2 +- libswscale/utils.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7bea5147db..fe0e74f871 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1017,7 +1017,7 @@ static int scale_internal(SwsContext *c, reset_ptr(src2, c->srcFormat); reset_ptr((void*)dst2, c->dstFormat); - if (c->convert_unscaled && !c->lumConvertRange && !c->chrConvertRange) { + if (c->convert_unscaled) { int offset = srcSliceY_internal; int slice_h = srcSliceH; diff --git a/libswscale/utils.c b/libswscale/utils.c index 4dc0fbfefb..d27128e42f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1713,26 +1713,30 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, if (unscaled && !usesHFilter && !usesVFilter && c->alphablend != SWS_ALPHA_BLEND_NONE && isALPHA(srcFormat) && + (c->srcRange == c->dstRange || isAnyRGB(dstFormat)) && alphaless_fmt(srcFormat) == dstFormat ) { c->convert_unscaled = ff_sws_alphablendaway; if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, - "alpha blendaway %s -> %s special converter is available\n", + "using alpha blendaway %s -> %s special converter\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); return 0; } /* unscaled special cases */ - if (unscaled && !usesHFilter && !usesVFilter) { + if (unscaled && !usesHFilter && !usesVFilter && + (c->srcRange == c->dstRange || isAnyRGB(dstFormat) || + isFloat(srcFormat) || isFloat(dstFormat))){ ff_get_unscaled_swscale(c); if (c->convert_unscaled) { if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, - "unscaled %s -> %s special converter is available\n", + "using unscaled %s -> %s special converter\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); + return 0; } }