From patchwork Sat Oct 28 14:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp497892pzb; Sat, 28 Oct 2023 07:45:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5Ue2v4LFNgxA2GA5F9zdhqCVbCaddmhWY0dm+YgXbNf9JCgfh2oHXPYKYA7MCvEXhyR4f X-Received: by 2002:a17:907:7f90:b0:9ba:1d08:ad43 with SMTP id qk16-20020a1709077f9000b009ba1d08ad43mr5337148ejc.70.1698504303220; Sat, 28 Oct 2023 07:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698504303; cv=none; d=google.com; s=arc-20160816; b=ezEaSgZg9yef8OLwDP14W+CKh5cWPTCgv9ai+KBuRsSu1M+Fi7Sp6poSJEV6zq9wMF /VvUQIlgZawM3WgKnrdsY+MCd4V8mFmKckFxSlz6wIkokeVCnr6S14GAeHvq3NWNhQna kZ2/qd18qyIK4IzoRQ588T5rJcPilzNRExmajvH3YbzgmXEztyfVSeAsbc5wXfpggukX +BheSgZUoYzZiZBqRFO5pvAWPX9iD/I9YisBhAGBlQ08TFp5+bULxJ+/qJqtTvKEXfDP 0kkgpn3wL8SbbopZ6oaFiOZgdoCT1sTndGUpFxJBRLXh/26H6WdRGhKDaThkcomliJy0 rcPA== 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=0gxzmIE/FRpVsQstgjwnuqbLZnBKGiTUo6367rGfhXc=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=rVuQc/0R9plOx5DZaJI5D3x2MSv+IDhihT3H9iJH9t2Dqzp9m4p7yPY7eKFkS1BS4k IsPZ5mNMiUtsRlOoV/HgeHEcU/X1cB8xoapV/8RM5/Zo1otobMDE1t8VWqs4vyT0Oc53 K3FAEI60KasASgiq7Lj97BT9DS1pn8kjwnoXrdjDJoGAmC08/iqL9vk1qw08lUQmqXCv dAYEr6chI9j4xIscU/18rfn/3HfCyMOGr1fDTPYeUNU6kGTzx2vHKMs855non4f8MGLd C2Xy2u+6ZMoPfCxTEhWVNxBBcEFEmLlmlsH5A9zkbGV6BVXpmOX26O21tE8+MUCNUVVf R3nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=VhESeKRJ; 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 xa6-20020a170906fd8600b0099e028b0201si1801449ejb.962.2023.10.28.07.45.02; Sat, 28 Oct 2023 07:45:03 -0700 (PDT) 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=VhESeKRJ; 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 8673D68CBAB; Sat, 28 Oct 2023 17:44:43 +0300 (EEST) 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 AFA1368C96A for ; Sat, 28 Oct 2023 17:44:35 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6527648D04; Sat, 28 Oct 2023 16:44:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698504275; bh=FtLuwViaguikU25UXM+4Y3gxeFPCCg+XFLVpu+tlnyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VhESeKRJCuQTwNjWCENyy4WqibEONQVN9Sz37UCzOhTvSv5TQDxmWSHSpsZzbURwn HU11AeKSKAtwBhZHmPH2k6FBcvvHcgnHh5RsjCh9vj612W0pPP5GkeQdqWBwCGJg6/ Im16uUSts4+pLgEMANrPa122XxN0/BDLWaIBGbuw= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Oct 2023 16:41:09 +0200 Message-ID: <20231028144430.60538-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028144430.60538-1-ffmpeg@haasn.xyz> References: <20231028144430.60538-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/10] swscale: don't omit ff_sws_init_range_convert for high-bit 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: jxY1ienlHIge From: Niklas Haas This was a complete hack seemingly designed to work around a different bug, which was fixed in the previous commit. As such, there is no more reason not to do this, as it simply breaks changing color range in sws_setColorspaceDetails for no reason. --- libswscale/utils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 0a55657800..ec822ff5d9 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1049,9 +1049,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], c->srcRange = srcRange; c->dstRange = dstRange; - //The srcBpc check is possibly wrong but we seem to lack a definitive reference to test this - //and what we have in ticket 2939 looks better with this check - if (need_reinit && (c->srcBpc == 8 || !isYUV(c->srcFormat))) + if (need_reinit) ff_sws_init_range_convert(c); c->dstFormatBpp = av_get_bits_per_pixel(desc_dst);