From patchwork Mon Apr 8 16:07:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 47934 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3f98:b0:1a7:a0dc:8de5 with SMTP id ay24csp5360pzb; Mon, 8 Apr 2024 09:07:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX01vcwKENj22qhzA1zdW8kE3e8GXOiktgRJzGBibr4V3btoqe4GjLtowf9NnDeVd8qfY1Xt3xoBuFXS3qw4R13d1Dh/zKtDXJyVQ== X-Google-Smtp-Source: AGHT+IEeoLkz/9BbGuYAjA+X/KD/eiiFzkgAYQmHawYU42AH3eSPLLQYraU981dPUCiGTZHX7Xh9 X-Received: by 2002:a50:9319:0:b0:56e:2dfc:6189 with SMTP id m25-20020a509319000000b0056e2dfc6189mr6195631eda.2.1712592437886; Mon, 08 Apr 2024 09:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712592437; cv=none; d=google.com; s=arc-20160816; b=NtJguWRroLqF/M7W4k+S5TCEq37iam/pcP0EWuLyXM4Sc4cMI33+oNmsySh+hH2p8M qFnbzyIXIhWDwEaobkibbfTWdAjDeMB7KAjIdr27xd7F2WU2i3JmgNRt3H82kLKgZuM1 CjExcE7fKOP5eWY1oJZ3c1UQLb+uH1WYu5vCfyKXBXDe3PpKeLQTWPbYf8wZzhRcfpO4 6HXSD3iQtvlqtYnEYPxTe/AfT68IILzOtHu5M8q/GuckylOXYeTmHTENTNXFYILFQpqd 8PFIPjN9zyVG4uWc7paoi64MWlKKj9gmfIYYdEIdmBP+DezbZm9RZpgpmO7SOKESgnet MNww== 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:to:mime-version:message-id:date:from :dkim-signature:delivered-to; bh=6XpVHyUGGXPxW9zeLsWFqNLzubOmKEJFjrXod579du4=; fh=GABYHefZpsCOOVRn8a1IgmYuOvaCu1oFlwEOjvaxWTE=; b=vBtGTuRa6KHwRC/mONDazQsT8rJ9exxDQId4mwA4teUdzIc2MCUIuqysV1fJ5fX+tx 2Mzaw6pP5TgBetMRGIGCnQ06y1Br28zNhUsVxXGrfDUbzVgVjoo59PrRBOjZmoxO9AGg nz6687JlqLwZZIWiaPWJsXh0F0GaaL+GD9fn7riipae5rRRMFXqhBmi/chIyxK1hbj4R jEUEa3NE/tkFxMMqXNtt0sYQXuNjTEbS5xW+U8R30udmxEwm81Mi9BqvxMbhmIiujxhb bOo9vpSL9kiQ30Os9c8XkucyG0pzvud9nHAOiAWkbxntNEFmxn+dqUoaTH/tWjbimfBW GTxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@frankplowman.com header.s=s1 header.b=H9p2iZbx; 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 n4-20020a509344000000b0056e2c12b574si3753442eda.531.2024.04.08.09.07.14; Mon, 08 Apr 2024 09:07:17 -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=@frankplowman.com header.s=s1 header.b=H9p2iZbx; 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 9FE7C68D27D; Mon, 8 Apr 2024 19:07:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wrqvffvh.outbound-mail.sendgrid.net (wrqvffvh.outbound-mail.sendgrid.net [149.72.255.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B26A68D193 for ; Mon, 8 Apr 2024 19:07:03 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=frankplowman.com; h=from:subject:mime-version:to:cc:content-transfer-encoding: content-type:cc:content-type:from:subject:to; s=s1; bh=p6RobLMIKH9PX113lVckgXIPdI8ewMNngCe8vXq1DD0=; b=H9p2iZbxqGlEf5/ihEweNizjGHm/Tk3RzRdFYlXE0QuvCDoxmGg/N4Di92tmdKB5KW6e MVoRPbXa9otvOYWsiFhiRfFFWIgy+P2DPafqNiElH8+zjtNPViIFgu7RIQcfNuopVzYZLu +YK4pbmcKAFbt+6WkWi9z8IfXWFCj5eWlI4TDahzuTPwy9jXIaFX2TrrDKaMzaH1v35kzj gzosUu6IZgGQXuaOQOQXnCN7k/mqmHIPjlPIZ+x4G5w9ZEcwlrY7pMqdEJYzpMY4B852Q1 Q0Zknc5F09Y5CL8VA3wI/kmCbBu0wCSQT4cG1EKptWbKw3QLVE/1nqJ9IuuWc9IA== Received: by recvd-7555548f4d-ztqmr with SMTP id recvd-7555548f4d-ztqmr-1-66141626-10 2024-04-08 16:07:02.402073104 +0000 UTC m=+1796850.161778086 Received: from localhost.localdomain (unknown) by geopod-ismtpd-1 (SG) with ESMTP id tWJAUrYuQLCZ3ptFr01Yhw Mon, 08 Apr 2024 16:07:02.011 +0000 (UTC) From: Frank Plowman Date: Mon, 08 Apr 2024 16:07:02 +0000 (UTC) Message-ID: <20240408160658.428236-1-post@frankplowman.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-SG-EID: u001.Z0KJCHpts8tvDq7PHgz5cpqJ+vJcSmdTtST/g91WT3qAbNxUpEMGIDQq91mXy3Yjvepp8fYsFUJzGsyhT1EwBQsP+y+b+IeiCA4GaZkd8PhqGlewy1PbHNuI3c1S3DCgoSkqIg2kUJz5QH/IT7XhXZu7m/nuBG7aOnVD0Tci6xkgWbFn7nxmvsgc9vFr11lm0PQWqNyh5usJHl/eTTRb+nMiOWNFe1b21Abp/FAsGxsJZqFrk9KMejd4TfxRWID+ To: ffmpeg-devel@ffmpeg.org X-Entity-ID: u001.qzljkbu34TNIX4NwfTiKWA== Subject: [FFmpeg-devel] [PATCH] lavc/vvc: Fix left shifts of negative values 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: Frank Plowman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: H8qndQawehJE All these variables lie in the range [-12..12] Signed-off-by: Frank Plowman --- libavcodec/vvc/ps.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index 3c71c34bae..1b23675c98 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -1196,12 +1196,12 @@ static void sh_deblock_offsets(VVCSH *sh) const H266RawSliceHeader *r = sh->r; if (!r->sh_deblocking_filter_disabled_flag) { - sh->deblock.beta_offset[LUMA] = r->sh_luma_beta_offset_div2 << 1; - sh->deblock.tc_offset[LUMA] = r->sh_luma_tc_offset_div2 << 1; - sh->deblock.beta_offset[CB] = r->sh_cb_beta_offset_div2 << 1; - sh->deblock.tc_offset[CB] = r->sh_cb_tc_offset_div2 << 1; - sh->deblock.beta_offset[CR] = r->sh_cr_beta_offset_div2 << 1; - sh->deblock.tc_offset[CR] = r->sh_cr_tc_offset_div2 << 1; + sh->deblock.beta_offset[LUMA] = r->sh_luma_beta_offset_div2 * 2; + sh->deblock.tc_offset[LUMA] = r->sh_luma_tc_offset_div2 * 2; + sh->deblock.beta_offset[CB] = r->sh_cb_beta_offset_div2 * 2; + sh->deblock.tc_offset[CB] = r->sh_cb_tc_offset_div2 * 2; + sh->deblock.beta_offset[CR] = r->sh_cr_beta_offset_div2 * 2; + sh->deblock.tc_offset[CR] = r->sh_cr_tc_offset_div2 * 2; } }