From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2024E471A9 for ; Sat, 28 Oct 2023 10:46:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B9F568CB3B; Sat, 28 Oct 2023 13:46:46 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C3C168CAC2 for ; Sat, 28 Oct 2023 13:46:39 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id EE24940C3B for ; Sat, 28 Oct 2023 12:46:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698489999; bh=aH02YuiIkxG7AMJ5RUZMPojNsAEEMIzD/F4Ag0QWGS4=; h=Date:From:To:Subject:In-Reply-To:References:From; b=Kg+VdcNIiKq8K+WBFfNeLOMmqZHTWddFdQHQ3ECJOFUF/RyQgu7XxGsdYZEX2Ooly dgOX8HU3JdMfpyKdzBz3Xb4PYDkiAV3VrOotFVD/gAi4BMriN82wUwKReX1qt/bfk9 qs5OY+0wiTHCSWc67+8eyXaC7WiZlZTRVqk/HORw= Date: Sat, 28 Oct 2023 12:46:38 +0200 Message-ID: <20231028124638.GF3388@haasn.xyz> From: Niklas Haas To: FFmpeg development discussions and patches In-Reply-To: <20231027214241.GB3543730@pb2> References: <20231027170446.63684-1-ffmpeg@haasn.xyz> <20231027214241.GB3543730@pb2> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [FFmpeg-devel] [PATCH 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 27 Oct 2023 23:42:41 +0200 Michael Niedermayer wrote: > On Fri, Oct 27, 2023 at 07:04:39PM +0200, Niklas Haas wrote: > > 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. > > --- > > libswscale/swscale.c | 2 +- > > libswscale/utils.c | 5 +---- > > 2 files changed, 2 insertions(+), 5 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..455955e907 100644 > > --- a/libswscale/utils.c > > +++ b/libswscale/utils.c > > @@ -1728,9 +1728,7 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, > > } > > > > /* 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) { > > @@ -1738,7 +1736,6 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, > > av_log(c, AV_LOG_INFO, > > "using unscaled %s -> %s special converter\n", > > av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat)); > > - return 0; > > } > > } > > the av_log() message will be wrong if this path is unused Indeed. Perhaps the only way to fix that would be to instead try approach 2 and go through full reinit if any params change after setColorspaceDetails. > also this ties convert_unscaled to never do range conversion, if thats > intended, i guess thats ok. Otherwise that maybe is a restriction > we dont want to add. In the original code, c->convert_unscaled is set behind a `c->srcRange == c->dstRange` check, so how is that a change in behavior? _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".