From patchwork Tue Oct 31 14:54:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp381802pzb; Tue, 31 Oct 2023 07:55:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5BVbwic2AnOeS0lL/zn6jBH+gaqjBFputhChFhpfOjHIXW5guHi1FeDnaO8UQbhu8IDSx X-Received: by 2002:ac2:47fa:0:b0:506:899d:1994 with SMTP id b26-20020ac247fa000000b00506899d1994mr8769384lfp.52.1698764118501; Tue, 31 Oct 2023 07:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698764118; cv=none; d=google.com; s=arc-20160816; b=jgajRtJkNDebbmPv0n44+FkP1JVeUWd/zYVQvXdn4BTjgrfAajEhZg8nfC1WWZs/jo LqCQfBfYP7rMJoy7LsBKcoO4kelFxJv1c2WGP8cErgKkJfTfz6escKufUfWA0MKzzxA8 D7Zz9ZJKRE3CIrRrlKDZQgWdparoB9g9vxPYdAac6WpUxdp57t6KaVevu3Yr59DuD1Og QA4CZWSh309GwGQt2CWOL8wfpPx0CYnGX6wAhIe0+1yNq9zDy8RHPrOXc4M3sfyUodlP Q5eFGDAm1aOA3uw4iKYlpt6wqDMIrStp9tGeZPFFrkP90m09HxRUmsmPOQQNlZ3Cu26E lCYA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=JcKBT1Xb5GZOLTb0yM/Qn91MGVAccOFvCj9yqH7GPx0=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=AIME4CrkAlkX8HEdJ7SBcWrtsLb4hJAwjAZrbx0sJvPPC960PpxLFGBulXwA1wP7YA txOS473FF7AvRhORU5FvzryhRKZUBth1wt3nd7SXhgp/lpivwKsDFOXwW8CDwHfPps2s 5Fn8VmPlcZpkUXA0FW8y+elbAyMLODbH0yiR+6odXta7OAlyCe7oeqpuArJijGWXCIQ3 Xu5LtcaQ8bCLI7+keuTFGnAJpcLhSCzlmxb4MEIRlZsJ3Xa00UJWWFkVlWS72Yz+rsyw m8Kr2fAbKsZoAc34Lvv0A6dU5reOcQxvR7xIrtBlclYqaRc20Tv7dCxrMSivc2If/Z+s TCDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=kL53EHwE; 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 ec33-20020a0564020d6100b005435bfe2c2asi690216edb.155.2023.10.31.07.55.17; Tue, 31 Oct 2023 07:55:18 -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=kL53EHwE; 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 5068968CD43; Tue, 31 Oct 2023 16:55:03 +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 83C4E68CD05 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 9392A42B85; 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=dW2Yxi4RGVNynukmBkUaUCkNK04Q5h1fYm+SYEpeUtk=; h=From:To:Cc:Subject:Date:From; b=kL53EHwEuhoehYsRVTp9GnqRwA7/hobfNOFBwL+PlkYl+TinrmeUOZ4ntB+dKCY/Q h96/NWyuy3Wm5WKGnhUDYwNCyDjOEufAU6RMXl9fQxdMSkLXok9rmocoYr5eME8Vi7 DfM8DW7mf09wNvk+C6CvzbmfvNrm9Fq7f38HDzz8= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Oct 2023 15:54:43 +0100 Message-ID: <20231031145450.94975-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/8] 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WsCQTJSH7eEI From: Niklas Haas More commonly, this fixes the case of sws_setColorspaceDetails after sws_getContext, since the latter implies sws_init_context. The problem here is that sws_init_context sets up the range conversion and fast path tables based on the values of srcRange/dstRange at init time. This may result in locking in a "wrong" path (either using unscaled fast path when range conversion later required, or using scaled slow path when range conversion becomes no longer required). There are two way outs: 1. Always initialize range conversion and unscaled converters, even if they will be unused, and extend the runtime check. 2. Re-do initialization if the values change after sws_setColorspaceDetails. I opted for approach 1 because it was simpler and easier to reason about. Reword the av_log message to make it clear that this special converter is not necessarily used, depending on whether or not there is range conversion or YUV matrix conversion going on. --- libswscale/swscale.c | 2 +- libswscale/utils.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 90e5b299ab..46ba68fe6a 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1016,7 +1016,7 @@ static int scale_internal(SwsContext *c, reset_ptr(src2, c->srcFormat); reset_ptr((void*)dst2, c->dstFormat); - if (c->convert_unscaled) { + if (c->convert_unscaled && !c->lumConvertRange && !c->chrConvertRange) { int offset = srcSliceY_internal; int slice_h = srcSliceH; diff --git a/libswscale/utils.c b/libswscale/utils.c index e1ad685972..0a55657800 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1715,30 +1715,26 @@ 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, - "using alpha blendaway %s -> %s special converter\n", + "alpha blendaway %s -> %s special converter is available\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); return 0; } /* unscaled special cases */ - if (unscaled && !usesHFilter && !usesVFilter && - (c->srcRange == c->dstRange || isAnyRGB(dstFormat) || - isFloat(srcFormat) || isFloat(dstFormat))){ + if (unscaled && !usesHFilter && !usesVFilter) { ff_get_unscaled_swscale(c); if (c->convert_unscaled) { if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, - "using unscaled %s -> %s special converter\n", + "unscaled %s -> %s special converter is available\n", av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); - return 0; } }