From patchwork Tue Sep 10 06:39:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:41b1:b0:48e:c0f8:d0de with SMTP id le49csp210298vqb; Mon, 9 Sep 2024 23:40:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdRR2jcP71pciNXackx1gY4D+IR3DKVsEyxqR6jw/EzEDkzoz54ZxtL1s809rhlpNiGUiNNoJYygPYLovO2Dtz@gmail.com X-Google-Smtp-Source: AGHT+IFeD9HGI78MjbuIsk80kZAHKQwViVBY8ojRr/uZ0LyQks9J0uuD0aO9iEMx7nIydm68Cepq X-Received: by 2002:a2e:bc0a:0:b0:2ee:e196:1486 with SMTP id 38308e7fff4ca-2f751f8d3d4mr33575451fa.4.1725950431455; Mon, 09 Sep 2024 23:40:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725950431; cv=none; d=google.com; s=arc-20240605; b=d67tyDPLvu+dYClxFw07J7eUuOmRpIlTyNv19TJ+kBScrQ846mDHBaH4TjC9X4Ua/z 1gQh1S4qs7SGSaEzOru7e3PFQG0PEck4ptokGelYvSNpXeoGgydhoicawfWhCAN5XLnu fDYxmWT58QKMI/5b9rYArXisGb+sehKH39BijpRRbQZRucmisL4IW7U+1vsiO7igF+eM bfgXAzfzA5M8b9nAcRuC7G3dUu+lYsZ3wER+MCI4115qbrJ0hWYjLju2f/10mBa7mCPT 2EuVu4TDP76x+2PA39Pk4foPcdi2MU4pKSIv3nnfXX0TlLnUevQErAPjV77A3SQbqduj 80mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding: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=Td4i9zh6em3ZCAEBt5rUh44IDznsmgrX24bBNqZR6sc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HwlHegIyV8jBCcDIoaxpHo/zwATfOvqEJB7pdNPX/232Ye46z7uvtU0acRD3YJ+ZzX 5joGJ86BSVmca7d/KambE8w4HE78Snd+7RWqAq5+yLvvZcSf7DQhV9ymp47Spzgi4kE3 xMFGy684HnfPFwcHkOEUEwUx5J5ZN5lx7wbVWfYW/vDXHagw5RmqZAz8LvvQEXMd7KO0 G9iITVulynQRymzluC65Er5mMPDxSBVtPzZrpPzNkF7YGtz2oUVGNRzeK9M4QxCI1dRp TOUJMQsC6W0p0wvhwqoNgXdw0Kap47sKe4LXJUuQ4co1vAIOS7fKCpscRmlUJfq/kiYH P/8A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=seN0zcKD; 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 38308e7fff4ca-2f75c087c06si20339271fa.390.2024.09.09.23.40.30; Mon, 09 Sep 2024 23:40:31 -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=@khirnov.net header.s=mail header.b=seN0zcKD; 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 D7FA668DE23; Tue, 10 Sep 2024 09:40:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67F7A68DD1F for ; Tue, 10 Sep 2024 09:40:09 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=seN0zcKD; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 12F444DF3 for ; Tue, 10 Sep 2024 08:40:09 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id DHQtM0Rg27Yx for ; Tue, 10 Sep 2024 08:40:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1725950408; bh=udcgQ/aqgnDKh1soaXMoZ7r6hYtXT/kIT/WkQgq9EJE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=seN0zcKDC/mEExUPTlIWYLojMGJc2ZWaWGuQzs8c/FSPJ5dzD6XVRnlXzs5zJ0F4k PZ/Iw0Gp8FlHoQm0JL6fJku8dEjaT+CZF5i8Vy4FysC9bmCjkF8KRdQjSZpxfvhknm NiWCCrM1BMSXyjetA6NsxNC7NeK2qrG5VvOQjtApiMQuodPdbIepnOwSrjEV2odIAv br6jcx31qGD3cQRgfsxB6G3kEX4KeAGtld+yu5XTZTbQ+aV9wz2mNKWGSy5XMW4qVI gYkPDSfNZCQNsri6UnmcHsRqOow37MRJe5+woIKjLM1sS3mfLBXAbY2vQzsvBvkHFK lQgMnd09f+K2Q== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id B322181C for ; Tue, 10 Sep 2024 08:40:08 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A2F623A03CA for ; Tue, 10 Sep 2024 08:40:08 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Sep 2024 08:39:42 +0200 Message-ID: <20240910063942.23588-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240910063942.23588-2-anton@khirnov.net> References: <20240910063942.23588-2-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/hevcdec: set per-CTB filter parameters for WPP 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SRWK3pO/lWFc Fixes #10887 --- libavcodec/hevc/hevcdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 993349b678..df68e0b626 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2629,6 +2629,11 @@ static int hls_decode_entry_wpp(AVCodecContext *avctx, void *hevc_lclist, goto error; hls_sao_param(lc, l, pps, sps, x_ctb >> sps->log2_ctb_size, y_ctb >> sps->log2_ctb_size); + + l->deblock[ctb_addr_rs].beta_offset = s->sh.beta_offset; + l->deblock[ctb_addr_rs].tc_offset = s->sh.tc_offset; + l->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; + more_data = hls_coding_quadtree(lc, l, pps, sps, x_ctb, y_ctb, sps->log2_ctb_size, 0); if (more_data < 0) {