From patchwork Tue Oct 31 14:54:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp381887pzb; Tue, 31 Oct 2023 07:55:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFk6Ik15HkPyLfmAeclrPEqNmHKwZrLIPTMssF+0/LdhBQN7lspRLk62wUquWalRJVfYSDB X-Received: by 2002:a50:8716:0:b0:542:ff1b:6c7a with SMTP id i22-20020a508716000000b00542ff1b6c7amr2868267edb.9.1698764128379; Tue, 31 Oct 2023 07:55:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698764128; cv=none; d=google.com; s=arc-20160816; b=m6PngwYHkBYJqey++ShIXACSA142xKFr+HKWQknIJw4AUjP5A4n54nJ/juGCGYeJL/ pAgTT1eXUUsOc9zqwMayB45aPDxUctj3eNOCvSU9HeMs+84iCPthMVSOyZQghZxx+0v2 TCn0Dex3OjqH0uPX/U7ot1+Jx0Bh8gMxaPedhnZiEbi/prup3h4sCIRGgxinD3Vx/lMC zCAIO2nEb6NXieen7eO0uB6OOF2eIaWrMmIzRHozVO5TCbzA8rSzfFfv+1OlSoXUh9Dj xX0bRRHXzgkTLUTZcYGvqXqa6aygHQFzgC2tEy1YC+NMkK/Hxf5Eh8zv4wixTNb5J8wJ jNaA== 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=wzylmVZCC+cBfqoj9wGj0v+0uDj3RahKU8oMGLVp1yrEh4+FNd5vuhXKm2AZZAXJ/R zZqOs6SXLhbA2RbLV0MhNVsE0bEUQLVS5q/OWCso6FAKguT/Sw2mm23r3oKeAdDCcwJM LBUYqk7wjknON5a23J14XUXHuLmfcvkQXDsAdPkD/Dwgp0HMic/g1uzeOTuIEwZQrU72 /1iUO5cim+XRp76eRT3PvwZHCMbURGhwTEKjmZdWHSd3+3iuLzgvmF84SVBooQdMgZGS kisutaWnHJwt9Xd4imdo9plqVTJRkGvwx+q0VQ4AKg16WKb+MrqIqDpuVY+sHYlvOpy7 voEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=XO6v0ZQT; 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 x43-20020a50baae000000b0053e2addab30si669080ede.569.2023.10.31.07.55.28; Tue, 31 Oct 2023 07:55:28 -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=XO6v0ZQT; 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 4EBFD68CD47; Tue, 31 Oct 2023 16:55:04 +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 865A168CD09 for ; Tue, 31 Oct 2023 16:54:55 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id CF17746D23; Tue, 31 Oct 2023 15:54:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698764094; bh=FtLuwViaguikU25UXM+4Y3gxeFPCCg+XFLVpu+tlnyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XO6v0ZQTpqdAWNxCB86Su5nNO025078tNhudidD1nibWIGpFFPOx/8EqGL4JupB+O 2BrBh53xtvwK0DjYLX+7HGjh+o2ywMAJSPxl7MMqJOfZHo3Um50RjwDp+qRENc/DkE ZpbjMihvYhacCY2H47uuQPCNLzw/IXXiEEOqUT60= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Oct 2023 15:54:44 +0100 Message-ID: <20231031145450.94975-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231031145450.94975-1-ffmpeg@haasn.xyz> References: <20231031145450.94975-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/8] 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: gAHA5g2vUDLa 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);