From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7D987439C2 for <ffmpegdev@gitmailbox.com>; Wed, 2 Nov 2022 22:55:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFEBC68BEE5; Thu, 3 Nov 2022 00:55:25 +0200 (EET) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E57568BD8B for <ffmpeg-devel@ffmpeg.org>; Thu, 3 Nov 2022 00:55:19 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id u11so171729ljk.6 for <ffmpeg-devel@ffmpeg.org>; Wed, 02 Nov 2022 15:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=BJsxVXZRWXExNC16mbLI55Tthklgtm1RMZpIwzMzGsY=; b=Xei6xDT8Zpi2MCyTKvO8AY93fnHkOfdnVQ1fuOGcTZpgvUiPgx9M6hkSDcszKvBn8N NRS3mL9ZFgH5LDiRbfvXU7yogDjaDpI5HLY37UXdGtxVhM3B1+4aZDmFunLhX46KKUg7 F/FY0c6DQN4Op8SV32orAIBI9NjzYsMWG07SePAK1mNUgIFcJmuRM8QbmxRWZucj0HHJ RZnSj5tm/PMEsfvGWCY9s7mhE8Jei8vzrrICjrZ6xGjqyT+ESBSuuwmzUZhXqahPRj22 vMuHf37u9u6fWuTP4Uw9cSS3RES61WPsTlJbOWkc6DqcS0n0AO+0a/392OeKE4HnZzOa NZPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BJsxVXZRWXExNC16mbLI55Tthklgtm1RMZpIwzMzGsY=; b=ee29tmchfwuZgR7OnXkpl83Tjx0Kh/fp6yQcwnLAVrJn5Kf23OIFLZaPo3/LBaV3O5 LXPXcRa/1pU8WOT67bgks8IFR8c7rzn5weGsn7oz1OFN3/SJPS2Uyp8KDcoeSaENDCLH xYrY798mIm3iCwsbGWcaq+oXpDHHHk6AI0IAxNBnlniDIwZsV3/X0AeVUG4Ys1hxUx9l eLKCTZJ0VWWg05T5X/AdDujkTzd8PmOmDMmYtBXjIiinttQ5RiizX3ez6PFPpJpqIX0T XYWLjNBhGr7pxfwXSQJ1QbeEnH9bkpAfu+/I8BzdM7RndWtZzNENal6k6Av6tyO9w81s siRA== X-Gm-Message-State: ACrzQf3Q+dKv8jbTVi82HEXBx1whidV9qPJwYmPUYaw61yDolcnOQOq5 QKD1+AxZq3rvWMvMfVDAEjWpVhQyn7tj/khp40qkrfFD X-Google-Smtp-Source: AMsMyM6fC+0cDLJZFsRjgGXx0DjjFeoRWOZAmn36ipW6LU39lVWHwuVTd1BhMrjZOZOocL6Z54j1iBQVvqJHJI/IseM= X-Received: by 2002:a2e:9c53:0:b0:277:55d8:8f18 with SMTP id t19-20020a2e9c53000000b0027755d88f18mr7896863ljj.453.1667429716688; Wed, 02 Nov 2022 15:55:16 -0700 (PDT) MIME-Version: 1.0 References: <20221102210239.1689-1-michael@niedermayer.cc> <20221102210239.1689-2-michael@niedermayer.cc> <CA+anCRno+Y=8FzdY6di=94348=RW+9nFCi=U0k2=dEeW7qNJEw@mail.gmail.com> In-Reply-To: <CA+anCRno+Y=8FzdY6di=94348=RW+9nFCi=U0k2=dEeW7qNJEw@mail.gmail.com> From: Mark Reid <mindmark@gmail.com> Date: Wed, 2 Nov 2022 15:55:01 -0700 Message-ID: <CA+anCRnWMfJDxmubpPz5g+8_TMEo0LgyoFisvz_aonSNTCBQ1w@mail.gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH 2/2] swscale/output: Bias 16bps output calculations to improve non overflowing range for GBRP16/GBRPF32 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/CA+anCRnWMfJDxmubpPz5g+8_TMEo0LgyoFisvz_aonSNTCBQ1w@mail.gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> On Wed, Nov 2, 2022 at 3:52 PM Mark Reid <mindmark@gmail.com> wrote: > > > On Wed, Nov 2, 2022 at 2:03 PM Michael Niedermayer <michael@niedermayer.cc> > wrote: > >> Fixes: integer overflow >> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> >> --- >> libswscale/output.c | 25 +++++++++++-------------- >> libswscale/x86/output.asm | 16 +++++++++++++++- >> 2 files changed, 26 insertions(+), 15 deletions(-) >> >> diff --git a/libswscale/output.c b/libswscale/output.c >> index df4647adde..5c85bff971 100644 >> --- a/libswscale/output.c >> +++ b/libswscale/output.c >> @@ -2372,18 +2372,15 @@ yuv2gbrp16_full_X_c(SwsContext *c, const int16_t >> *lumFilter, >> >> Y -= c->yuv2rgb_y_offset; >> Y *= c->yuv2rgb_y_coeff; >> - Y += 1 << 13; >> + Y += (1 << 13) - (1 << 29); >> R = V * c->yuv2rgb_v2r_coeff; >> G = V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff; >> B = U * c->yuv2rgb_u2b_coeff; >> >> - R = av_clip_uintp2(Y + R, 30); >> - G = av_clip_uintp2(Y + G, 30); >> - B = av_clip_uintp2(Y + B, 30); >> + dest16[2][i] = av_clip_uintp2(((Y + R) >> 14) + (1<<15), 16); >> + dest16[0][i] = av_clip_uintp2(((Y + G) >> 14) + (1<<15), 16); >> + dest16[1][i] = av_clip_uintp2(((Y + B) >> 14) + (1<<15), 16); >> >> - dest16[0][i] = G >> 14; >> - dest16[1][i] = B >> 14; >> - dest16[2][i] = R >> 14; >> if (hasAlpha) >> dest16[3][i] = av_clip_uintp2(A, 30) >> 14; >> } >> @@ -2448,18 +2445,18 @@ yuv2gbrpf32_full_X_c(SwsContext *c, const int16_t >> *lumFilter, >> >> Y -= c->yuv2rgb_y_offset; >> Y *= c->yuv2rgb_y_coeff; >> - Y += 1 << 13; >> + Y += (1 << 13) - (1 << 29); >> R = V * c->yuv2rgb_v2r_coeff; >> G = V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff; >> B = U * c->yuv2rgb_u2b_coeff; >> >> - R = av_clip_uintp2(Y + R, 30); >> - G = av_clip_uintp2(Y + G, 30); >> - B = av_clip_uintp2(Y + B, 30); >> + R = av_clip_uintp2(((Y + R) >> 14) + (1<<15), 16); >> + G = av_clip_uintp2(((Y + G) >> 14) + (1<<15), 16); >> + B = av_clip_uintp2(((Y + B) >> 14) + (1<<15), 16); >> >> - dest32[0][i] = av_float2int(float_mult * (float)(G >> 14)); >> - dest32[1][i] = av_float2int(float_mult * (float)(B >> 14)); >> - dest32[2][i] = av_float2int(float_mult * (float)(R >> 14)); >> + dest32[0][i] = av_float2int(float_mult * (float)G); >> + dest32[1][i] = av_float2int(float_mult * (float)B); >> + dest32[2][i] = av_float2int(float_mult * (float)R); >> if (hasAlpha) >> dest32[3][i] = av_float2int(float_mult * >> (float)(av_clip_uintp2(A, 30) >> 14)); >> } >> diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm >> index 84e94baaf6..f943a27534 100644 >> --- a/libswscale/x86/output.asm >> +++ b/libswscale/x86/output.asm >> @@ -44,11 +44,13 @@ pd_yuv2gbrp_y_start: times 8 dd (1 << 9) >> pd_yuv2gbrp_uv_start: times 8 dd ((1 << 9) - (128 << 19)) >> pd_yuv2gbrp_a_start: times 8 dd (1 << 18) >> pd_yuv2gbrp16_offset: times 8 dd 0x10000 ;(1 << 16) >> -pd_yuv2gbrp16_round13: times 8 dd 0x02000 ;(1 << 13) >> +pd_yuv2gbrp16_round13: times 8 dd 0xE0002000 ;(1 << 13) - (1 << 29) >> pd_yuv2gbrp16_a_offset: times 8 dd 0x20002000 >> pd_yuv2gbrp16_upper30: times 8 dd 0x3FFFFFFF ;(1<<30) - 1 >> pd_yuv2gbrp16_upper27: times 8 dd 0x07FFFFFF ;(1<<27) - 1 >> +pd_yuv2gbrp16_upper16: times 8 dd 0x0000FFFF ;(1<<16) - 1 >> > > pd_yuv2gbrp16_upper16 doesn't appear to be used anywhere > nevermind, I see where it is used now. > > >> pd_yuv2gbrp16_upperC: times 8 dd 0xC0000000 >> +pd_yuv2gbrp_debias: times 8 dd 0x00008000 ;(1 << 29 - 14) >> pb_pack_shuffle8: db 0, 4, 8, 12, \ >> -1, -1, -1, -1, \ >> -1, -1, -1, -1, \ >> @@ -883,14 +885,26 @@ cglobal yuv2%1_full_X, 12, 14, 16, ptr, lumFilter, >> lumSrcx, lumFilterSize, chrFi >> paddd G, Y >> paddd B, Y >> >> +%if DEPTH < 16 >> CLIPP2 R, 30 >> CLIPP2 G, 30 >> CLIPP2 B, 30 >> +%endif >> >> psrad R, RGB_SHIFT >> psrad G, RGB_SHIFT >> psrad B, RGB_SHIFT >> >> +%if DEPTH >= 16 >> + paddd R, [pd_yuv2gbrp_debias] >> + paddd G, [pd_yuv2gbrp_debias] >> + paddd B, [pd_yuv2gbrp_debias] >> + >> + CLIPP2 R, 16 >> + CLIPP2 G, 16 >> + CLIPP2 B, 16 >> +%endif >> + >> %if FLOAT >> cvtdq2ps R, R >> cvtdq2ps G, G >> -- >> 2.17.1 >> >> _______________________________________________ >> 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". >> > _______________________________________________ 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".