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 ESMTPS id E9DA14BA0B for ; Thu, 1 May 2025 14:45:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBF3B68B799; Thu, 1 May 2025 17:44:00 +0300 (EEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71E6F68B5E2 for ; Thu, 1 May 2025 17:43:51 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-224341bbc1dso13469305ad.3 for ; Thu, 01 May 2025 07:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746110629; x=1746715429; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NGpYEaTzD85VezDoiCf/I2IsdOZpgpmOofO4m9mkff4=; b=P4TBKMJXtrYIlDYRr78yBORCP7jVKBK094ihivhwuZMErpY+UNEzlAQYirmnzsYmkl 7ZWqJqtgw2hHOVrA/4ZI0TI4FJirYn9bbWgQjA+6aNL93VmHPpcoBwJ+f/5HrJExoN6h vNGd7Kdd+CmbhruEpMY9BdPdvohz/IS9/KacCQ9YYZXjOon2tNbsyZsi8jgGCC5Ph7eJ +egf1GXvU1BrfauP7pLc3q21CxuO7O6wPLnWI551YRRYjaVOj/iU7W1oRJLwjkhMSK0Z 5WMkuKTp51QwyMSez+texsRJ/JAV6hWCdhXUukWz54Z5ZOcc4pVDNg6cUWqvnQStc3MT tR9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746110629; x=1746715429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NGpYEaTzD85VezDoiCf/I2IsdOZpgpmOofO4m9mkff4=; b=aJ2qMlT2HlpKwaT12kth2jmyNE/qv+Ww7/Ur8EFhLy0/mu6BDQ+oC2OoUVCKLQPprm nNI+z/se3ihugbLKyh3eRGdCFoJoMYbZjaMuobtPBQE/S1LZI776WIoCycftrw1cSVYH Kd8nqTgw0iEmeu33ZHIgqFEb+9QcXRQy8kjLjPB9aJVLnRKY+LNmlEh/REuzC0/eOVN6 qbea7zq78om2BtiIda+u3z583/uBlwr6aprsI0CpzhHvqelYySPN94SrjNADfp/0kYOa v4a0l5dXpIjG1/BbPKLk/ABN9Eu7T3GRsLCFJJoprXkQ02dPd+tREmRoAg6JhTa33Axj UbYg== X-Gm-Message-State: AOJu0YwR7iCn80hIBX58pM28crhW0rZHtrQ5YoCBP9zbN4B7ojKOBvLz C6dAM8CLJrb9+k0WvdqvM50c/zzjqJRq1KL1CWYUDPiQNEhbKvZv1JnYWQ== X-Gm-Gg: ASbGncsF5BiDafpE+vUhDvW92ExGnvlhHZXOM+V/gFvAe57HYn08QvllPDfoYb181La mbSY/W71O64UhgN2gpA3cG+127qfxX8NNy4WG595+yAjnb6BGWpPpbTFNw7B9sm/BqeKePhm/hz O/OaS9xvKfxcNBBAzqTmrc4fDOnCQOxFHHPxnMOO1+p98idNL34K8XeAOB3aQu9GblOcvyHtQ/K QObADUfKiSlQYiMMhiihFciDXfUF0M3qsJN1eQjbcMFZZGRmNp/Rg8SPqY0zTrBhUuJAff92NV7 na9RmHOWUi9XmNcPoFNPh3A++j6EO6r8/MXiThIZ6Dd0tM5MiBSDyGHNq342tQ== X-Google-Smtp-Source: AGHT+IE3Wu17wEcH2Q9eTXu05EUiSmuYG2h2UlucUBRvOHrURX1yl+X7+xelRXNHGUT+VGo8E2l45g== X-Received: by 2002:a17:902:c403:b0:224:2524:3047 with SMTP id d9443c01a7336-22df35067f0mr105971465ad.26.1746110629596; Thu, 01 May 2025 07:43:49 -0700 (PDT) Received: from localhost.localdomain ([124.79.129.75]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1f9d4b68e8sm807271a12.27.2025.05.01.07.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 07:43:49 -0700 (PDT) From: toqsxw@gmail.com X-Google-Original-From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 May 2025 22:43:05 +0800 Message-ID: <20250501144324.958-7-toqsxw@outlook.com> X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20250501144324.958-1-toqsxw@outlook.com> References: <20250501144324.958-1-toqsxw@outlook.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 07/23] avcodec/vvc: refact, save pf and ciip_flag in ff_vvc_set_intra_mvf 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: Wu Jianhua 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: Wu Jianhua Signed-off-by: Wu Jianhua --- libavcodec/vvc/ctu.c | 4 ++-- libavcodec/vvc/mvs.c | 24 ++++++++++++++++++++---- libavcodec/vvc/mvs.h | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index c621b6d5d6..f77697af08 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1756,7 +1756,7 @@ static void fill_dmvr_info(const VVCLocalContext *lc) const CodingUnit *cu = lc->cu; if (cu->pred_mode == MODE_IBC) { - ff_vvc_set_intra_mvf(lc, 1); + ff_vvc_set_intra_mvf(lc, true, PF_IBC, false); } else { const VVCPPS *pps = fc->ps.pps; const int w = cu->cb_width >> MIN_PU_LOG2; @@ -1849,8 +1849,8 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in return AVERROR_PATCHWELCOME; } else { intra_luma_pred_modes(lc); + ff_vvc_set_intra_mvf(lc, false, PF_INTRA, cu->ciip_flag); } - ff_vvc_set_intra_mvf(lc, 0); } if ((tree_type == SINGLE_TREE || tree_type == DUAL_TREE_CHROMA) && sps->r->sps_chroma_format_idc) { if (pred_mode_plt_flag && tree_type == DUAL_TREE_CHROMA) { diff --git a/libavcodec/vvc/mvs.c b/libavcodec/vvc/mvs.c index 566df158a8..8946b00b5b 100644 --- a/libavcodec/vvc/mvs.c +++ b/libavcodec/vvc/mvs.c @@ -144,7 +144,8 @@ static int derive_temporal_colocated_mvs(const VVCLocalContext *lc, MvField temp const SliceContext *sc = lc->sc; RefPicList* refPicList = sc->rpl; - if (temp_col.pred_flag == PF_INTRA) + if (temp_col.pred_flag == PF_INTRA || + temp_col.pred_flag == PF_IBC) return 0; if (sb_flag){ @@ -266,7 +267,7 @@ void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const } } -void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, const int dmvr) +void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, const bool dmvr, const PredFlag pf, const bool ciip_flag) { const VVCFrameContext *fc = lc->fc; const CodingUnit *cu = lc->cu; @@ -277,7 +278,10 @@ void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, const int dmvr) for (int dx = 0; dx < cu->cb_width; dx += min_pu_size) { const int x = cu->x0 + dx; const int y = cu->y0 + dy; - TAB_MVF(x, y).pred_flag = PF_INTRA; + MvField *mv = &TAB_MVF(x, y); + + mv->pred_flag = pf; + mv->ciip_flag = ciip_flag; } } } @@ -599,7 +603,19 @@ static void init_neighbour_context(NeighbourContext *ctx, const VVCLocalContext static av_always_inline PredMode pred_flag_to_mode(PredFlag pred) { - return pred == PF_IBC ? MODE_IBC : (pred == PF_INTRA ? MODE_INTRA : MODE_INTER); + static const PredMode lut[] = { + MODE_INTRA, // PF_INTRA + MODE_INTER, // PF_L0 + MODE_INTER, // PF_L1 + MODE_INTER, // PF_BI + 0, // invalid + MODE_IBC, // PF_IBC + 0, // invalid + 0, // invalid + MODE_PLT, // PF_PLT + }; + + return lut[pred]; } static int check_available(Neighbour *n, const VVCLocalContext *lc, const int check_mer) diff --git a/libavcodec/vvc/mvs.h b/libavcodec/vvc/mvs.h index b2242b2a4d..7150c0b8cf 100644 --- a/libavcodec/vvc/mvs.h +++ b/libavcodec/vvc/mvs.h @@ -43,6 +43,6 @@ void ff_vvc_update_hmvp(VVCLocalContext *lc, const MotionInfo *mi); int ff_vvc_no_backward_pred_flag(const VVCLocalContext *lc); MvField* ff_vvc_get_mvf(const VVCFrameContext *fc, const int x0, const int y0); void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const int w, const int h, const MvField *mvf); -void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, int dmvr); +void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, bool dmvr, PredFlag pf, bool ciip_flag); #endif //AVCODEC_VVC_MVS_H -- 2.44.0.windows.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".