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 273DB4EE78 for ; Wed, 14 May 2025 13:42:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C564C68C639; Wed, 14 May 2025 16:41:04 +0300 (EEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB61368C5DD for ; Wed, 14 May 2025 16:40:52 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso8613136b3a.2 for ; Wed, 14 May 2025 06:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747230051; x=1747834851; 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=iNful70Qu2zoh7kzTNlzhKZfcH4kowkAtnGMS5CFTAw27FLDrtdv2RxoJ3+fDGfsb7 0j8dKJBOJSqsErR5ADCwNs93VBWLlyljgcnSZ+WsB98GgyFYI3hOph2qINoOZD8pDtJK P//fWWWwMj3Yo8wO1O2t+0BbOoncDju6ONIS4PDg0YfeoDYSfyW/Va2b+aj1Yk5QWcVO Rq3eicRQpa/+VYZNF8SxCOq5GlSOuqT/5h5DJ7lD+FQuTRUzH2wbN8S1iHZ32nd7U1FB s5BkZUvoU4LwZeBFMeJfojIWcKv6g3/wNDA9SiTjcVsYrZoil16cScmBBdLfTjK2BrAu N2YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747230051; x=1747834851; 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=l71WN4DTVYN8xzissr25fE1dRYXYOb7bUgjnsnQAJl2uTftcWEvP2fuj+jR5Y8RuEq 2LNFLkT6qpvBg8J8tBEdjwcrYu1/ojc6rWmaq5GyzUKV/qKUsJCRsydCqN20rYjBIFvo h+09wKhydSIo8NBYXYnbTNFG9Krltz6ab2iTyoiQwUhwFTzeDtLOkl0eRJIm1uLqoibS hhppOcASD2M5vEWgiyEjS18NUTnYPMVh+NUzNZJHorpwfZAiaX/86TNDTT9C1Z4hw7Qt FojlpaZlQVrpo50Kza61Rx7nFUUpOcI92xG4TZihYFUivtfphB//SfeMMAKMVIvTRHh/ iwCg== X-Gm-Message-State: AOJu0YylHdk04AlWu/lylVNgJFHh6mPDYOKhUGyMFi4+xpuGntYPwR3s brhvKMUumRBm73hHiD7H95uDaXtrd3qcdxbJUbEWrXj66Q+yMmTnR9Cb2LI9 X-Gm-Gg: ASbGncsZFKvnsO79LPThzOa8o/oU0EjdmichcW0EVvMYgQXsD8/g8y5Mc8WS10lWaAF cRaBj6rcx163bRdXemcpqJJc40J8ADax37bmKoQXPaR6aydkmUby+rxC+fhPm3jz5/DnPtJLbGO E1Oijp+MLCSBDRb+57jpMOBbMv1MzaUnvZuNmLeonyOdm5mDkXWTigCuXuuoIlrCcWzRTACf9/W TOh3WmHiSdLlL8T0Ya+L6SvCi3zQLbfXXKgu9MuL7erZhwF5Qv6qxFwmxldUkmXLYq9lzqQZwYY ozOkJPJGvetTaaxWIKpuOUxcwbBaPMGkmWoP4eDZ8WNZ/0Xkn8LVwuABWkg2NF+YRv9kCHM0 X-Google-Smtp-Source: AGHT+IFOU0pJjaQwPT6cS07TTDk+jQbL4EuUZM/NKIDSovp6ErqK5w4HK7Yp/gWaa+jk9bCvxF6IeA== X-Received: by 2002:a05:6a00:6c96:b0:73e:598:7e5b with SMTP id d2e1a72fcca58-74289241ac6mr4230330b3a.1.1747230050810; Wed, 14 May 2025 06:40:50 -0700 (PDT) Received: from localhost.localdomain ([124.79.129.75]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a8f7edsm9310669b3a.167.2025.05.14.06.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 06:40:50 -0700 (PDT) From: toqsxw@gmail.com X-Google-Original-From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 May 2025 21:40:14 +0800 Message-ID: <20250514134031.1584-7-toqsxw@outlook.com> X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20250514134031.1584-1-toqsxw@outlook.com> References: <20250514134031.1584-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".