From patchwork Fri Mar 8 00:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 46882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp635306pzb; Thu, 7 Mar 2024 16:54:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWQ/TrFdWBKQq7sxAVwt/pAaMK8+g0+E6HSB1lBLrvMkfJ4iiDd7gOEUNYO/4LAjRcj+Go/fBELXHYkLHX7M/6f75CBHAYtR+8i2A== X-Google-Smtp-Source: AGHT+IEsu7Wbz4ohMF9m/UX+Ashgh71ay/1WKBYztcaxBSlPEyPNMCisW019oN603AUp7eOW71Rw X-Received: by 2002:a17:907:7718:b0:a45:da3d:dc5c with SMTP id kw24-20020a170907771800b00a45da3ddc5cmr281946ejc.4.1709859272945; Thu, 07 Mar 2024 16:54:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709859272; cv=none; d=google.com; s=arc-20160816; b=sx6nCYvKxrBLEbH4ujcz2oj0VKxGt9nLsfHVwbGnz05PO9JKyEx4gg8hmbjlq4VoOT znMkuOf8k4O9khMVrDeTf4YqrlZKXNtW5GPikKnHfZphobIRpChL4MvvwWJiqcm606rT QFDPesMuqZY4rYaLTZ0EdqqwZAirdbKkM8gg5jFu/PUbXVoARoQhRJiR3MFPhaIyw5gi 4QcErj5dbK3JDZV6RkNtx0kiHI8dbin9PsVWhVvQHYfuo6ft7/MvQasbpih5yE7K72HX I/KCOTqIRsL3oj+zgypoVv/UTG+av2qrHnTxz+2aYCPpdQZSuRvFWkxu/2IgaNBFkoBN AA6g== 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=7dB4KpA95v/wg5gQEcQPHPmtcU6LfhFx2Be/55IlCaE=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=GSLVVHjucxacCfebggtbfNFUK7+JYRuYMATopzf6UlYmyASbMxMRni//iVpMOQBJWx BEUVBwd3VON+AP9clQvZbU9BeRLjLzfMjHuYyMOEgTskX+AG2XZ0P2jgY3bUZxxJ0e8+ 3e41ceajo7pmj+UYBuKzLDbPufDNOPrumEwNMPc8+zqacMiW9SUq/gwY+vamV7uGBuGN TC/ukevJ393MIIFGbGo4p/MThI1LcW++W6ZnNszYllkWdhF6t1ZarLoluaGnkitbPDIX t1+87LmdYqCq4JtNMGRgFiwCTkgBS5JRWQEoyb7T57L9pxhgFuwL9b2pAnzq3CKdGWmy u8dg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="PgwIB4s/"; 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 cr18-20020a170906d55200b00a45cd649306si1074240ejc.401.2024.03.07.16.54.32; Thu, 07 Mar 2024 16:54:32 -0800 (PST) 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=@intel.com header.s=Intel header.b="PgwIB4s/"; 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 1BA2668CDCC; Fri, 8 Mar 2024 02:54:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77C4168CD49 for ; Fri, 8 Mar 2024 02:53:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709859244; x=1741395244; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dDz9M51kZlUqOsk7bw8w4OKYYGzErXTj3WrrwCwOTD8=; b=PgwIB4s/nm4lMiDFOPqmSSid8YuQmYtZXwcu3yvqNTIKKt1URw8DSoT4 vchj5WSJTW7oR/P7vjhK6tliFqCRHML3s27WKDTk8nWvOspGHjxE2EAdT XSDh/jhe5N1gUsfurqSscjDtekqB7aMxs9pB6PsQw/34GwkXLZuLwxNPr 3eVPjbaM6CkltNxDxKJpaspBMVgj45i+V1xLUHJxK5b3OAQowQkgcu4p3 coc32+NAAv0xp3uMar0XuScVf7MI2eTECHb+rdctrbBeAjMurVXnLTYza /yprV26Bie+si0+Xhns/D9tfoOK5C5U3tEMuZMAxX3rGb7RDQD653QZ/c Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11006"; a="4409164" X-IronPort-AV: E=Sophos;i="6.07,107,1708416000"; d="scan'208";a="4409164" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2024 16:53:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,108,1708416000"; d="scan'208";a="10275611" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa010.jf.intel.com with ESMTP; 07 Mar 2024 16:53:55 -0800 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 08:55:30 +0800 Message-Id: <20240308005531.1757078-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KXJCWYmIdFuM From: Fei Wang Signed-off-by: Fei Wang Signed-off-by: Fei Wang > --- libavcodec/vvc/vvc_refs.c | 8 ++++---- libavcodec/vvc/vvcdec.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vvc/vvc_refs.c b/libavcodec/vvc/vvc_refs.c index 99f2dcf3ec..afcfc09da7 100644 --- a/libavcodec/vvc/vvc_refs.c +++ b/libavcodec/vvc/vvc_refs.c @@ -185,10 +185,10 @@ int ff_vvc_set_new_ref(VVCContext *s, VVCFrameContext *fc, AVFrame **frame) ref->poc = poc; ref->sequence = s->seq_decode; - ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset; - ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset; - ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset; - ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset; + ref->frame->crop_left = fc->ps.pps->r->pps_conf_win_left_offset << fc->ps.sps->hshift[CHROMA]; + ref->frame->crop_right = fc->ps.pps->r->pps_conf_win_right_offset << fc->ps.sps->hshift[CHROMA]; + ref->frame->crop_top = fc->ps.pps->r->pps_conf_win_top_offset << fc->ps.sps->vshift[CHROMA]; + ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset << fc->ps.sps->vshift[CHROMA]; return 0; } diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c index 570e2aa513..a979ebd41c 100644 --- a/libavcodec/vvc/vvcdec.c +++ b/libavcodec/vvc/vvcdec.c @@ -727,8 +727,8 @@ static void export_frame_params(VVCContext *s, const VVCFrameContext *fc) c->pix_fmt = sps->pix_fmt; c->coded_width = pps->width; c->coded_height = pps->height; - c->width = pps->width - pps->r->pps_conf_win_left_offset - pps->r->pps_conf_win_right_offset; - c->height = pps->height - pps->r->pps_conf_win_top_offset - pps->r->pps_conf_win_bottom_offset; + c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]); + c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]); } static int frame_setup(VVCFrameContext *fc, VVCContext *s)