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 0275849D7B for ; Mon, 11 Mar 2024 01:58:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1531068CF0F; Mon, 11 Mar 2024 03:58:36 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 524C768C9C7 for ; Mon, 11 Mar 2024 03:58:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710122314; x=1741658314; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dDz9M51kZlUqOsk7bw8w4OKYYGzErXTj3WrrwCwOTD8=; b=N+46sUXMMIzqMd96WcAq7z+/KCtKoro6F+DXit+Zck6fe5pRCJ/3vTxC PPpHb4u1dzZuHzR5kfokfyRySPwAaeUmh9FtSscbJL7L4xL1UG1KIkXx/ ei/JzeWTT9fhWxAKkNaCMT3/GnipC/RHpoAY16xpxynMmm7ZtDHf8xppU YH0WB2DaFFkAqH6wQY+fMjb1VpE4sQq9FE2YWMjGlB1aPxUdcMfs6D7U+ mpH9v6UMVb7d6/TzrZKD2M6JxIewZ2PKGy8jf0KLm1hxDWkCqH9RjiXgD mqPh6D564zsm7ioAeSahwAc9gVd7g2kk91rL84Lsb4GIEnreheZMqkZaP A==; X-IronPort-AV: E=McAfee;i="6600,9927,11009"; a="30213854" X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="30213854" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 18:58:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="15667971" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa004.jf.intel.com with ESMTP; 10 Mar 2024 18:58:27 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 09:58:39 +0800 Message-Id: <20240311015840.204571-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 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: From: 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) -- 2.25.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".