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 BFE104EE96 for ; Wed, 14 May 2025 13:44:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B00C868C774; Wed, 14 May 2025 16:41:21 +0300 (EEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E894B68C6DE for ; Wed, 14 May 2025 16:41:13 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-741b3e37a1eso5575098b3a.1 for ; Wed, 14 May 2025 06:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747230072; x=1747834872; 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=eCNXVH4a+/Y6DMdfWrO8Elfp6RrT54kHYL3FYkVWsFk=; b=io4hOUsQw9WdMezhKoS7BY6I0fcrJWHYfCbZw8544n4bAymySH1gRWLa/Y6l13QlJv MUgzL3/j5vdITl0Fmy469Xfn+WOmd7TRc1HLEUDwEEjUZKfiq7hj2soz3gs33JwIjIOg MsMgENQglU/W2FjzDiGZvQr+1wMS+Gr0s+tkPJ/VidNoYJq0+C9p8UEbGyA6x0VosQnr y1WnnriQ3aqFeWYc+PIPOQCLg6cKTyzCsggMBKM+Pkg/R1IX4MxJWIwdkSuFelVVDTPz R6EJeYHbmYoRUVW2g8XHiYDcK7VlebCo+8TBza54S4G05hYAfT5R6jknqpmtgrB519eg 0xaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747230072; x=1747834872; 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=eCNXVH4a+/Y6DMdfWrO8Elfp6RrT54kHYL3FYkVWsFk=; b=lvScpq8laVOfgqqfDno4Qd2nfzil5s0c6izQM+PtdbpacKckaWTHNO9aPLji0fbAfx eCUG5qGcAecwvdzhUb3kUh/5RImNxrInrKAMKe9BJNb9q2NQcy7J1bEh27h1zDFhUBqr 961YcYOF0PmsNISAh0c1RvM1i2fPf46b+ld8A7dO+D3JGNnPJavzLF90CxoGicktIHYp 1OksOjqzF+o8NqcQ5e4iW/RR7oUFQ6q82U+7ojztv4TaEE9YwjRxpKDwkxcpfQlQo+aN 6u2TtG5Uy/6Y9OBdL8DGSi2TBgr1/aLRGAPNoIhqKovrwqt0K92IqBrcod095LdDsbyX M6pA== X-Gm-Message-State: AOJu0YwfJjUY9RUqZxYliq1jMbIAFgSqadXZ4VsIZL39TVFmCAFCZciJ EzcEvv9Z7Tf33INM7/SFAmZp20oDo91mrTWEmWq1fHS46auKmIfdLNvtSJ5Z X-Gm-Gg: ASbGnctIrT5oZXdL5n2AznOR7fT3AB0OBRLsn0QfxXUPnYFNBzyfTXiyKObSHv2Z6eb g6YdPfT8St510oJD4CbZAUbbDnTablfNbX/PIrDIuWwIcos/5oQYsC05gjbH8dWwNajIbvUsjAa jzU1qWT5hpzEMCj8Oyaf4LuG1jVB6H5/YynyhdK+PAOKItImSIupOAAJHqL0vxlyyZKKWEwV9IZ SMzhsS5s+BD4kBzswmiuSg9QzDOnjnV4HOGD+O8Mwt47ICZFRCaDCffugMlkgnNqyP6tpORTX6b CtQmqkbbLJxME4y03Rhudx6yOq3wq1Vm2C4Ysqfco9/lIO6BM0Bki/LXNHpzg/p7X8uEw+XH X-Google-Smtp-Source: AGHT+IEVrO7jZcJsLnhYU7JXsSNq+tQ0z4wQ12C4YcRl61Ei1J9jHM7BFF02ysxGlyPf7uLpjo2xhQ== X-Received: by 2002:a05:6a00:1bca:b0:742:3fb4:f992 with SMTP id d2e1a72fcca58-74289298426mr4075808b3a.10.1747230071872; Wed, 14 May 2025 06:41:11 -0700 (PDT) Received: from localhost.localdomain ([124.79.129.75]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a8f7edsm9310669b3a.167.2025.05.14.06.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 06:41:11 -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:26 +0800 Message-ID: <20250514134031.1584-19-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 19/23] avcodec/vvc/intra: refact, predict jcbcr to tb->coeffs 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 prepare for adaptive color transform Signed-off-by: Wu Jianhua --- libavcodec/vvc/dsp.h | 1 - libavcodec/vvc/dsp_template.c | 18 ------------- libavcodec/vvc/intra.c | 51 ++++++++++++++--------------------- 3 files changed, 20 insertions(+), 50 deletions(-) diff --git a/libavcodec/vvc/dsp.h b/libavcodec/vvc/dsp.h index e9ef9f5b25..fa1387aadd 100644 --- a/libavcodec/vvc/dsp.h +++ b/libavcodec/vvc/dsp.h @@ -122,7 +122,6 @@ typedef struct VVCIntraDSPContext { typedef struct VVCItxDSPContext { void (*add_residual)(uint8_t *dst, const int *res, int width, int height, ptrdiff_t stride); - void (*add_residual_joint)(uint8_t *dst, const int *res, int width, int height, ptrdiff_t stride, int c_sign, int shift); void (*pred_residual_joint)(int *dst, const int *src, int width, int height, int c_sign, int shift); void (*itx[VVC_N_TX_TYPE][VVC_N_TX_SIZE])(int *coeffs, ptrdiff_t step, size_t nz); diff --git a/libavcodec/vvc/dsp_template.c b/libavcodec/vvc/dsp_template.c index 218a600cce..13bd8cd4a1 100644 --- a/libavcodec/vvc/dsp_template.c +++ b/libavcodec/vvc/dsp_template.c @@ -45,23 +45,6 @@ static void FUNC(add_residual)(uint8_t *_dst, const int *res, } } -static void FUNC(add_residual_joint)(uint8_t *_dst, const int *res, - const int w, const int h, const ptrdiff_t _stride, const int c_sign, const int shift) -{ - pixel *dst = (pixel *)_dst; - - const int stride = _stride / sizeof(pixel); - - for (int y = 0; y < h; y++) { - for (int x = 0; x < w; x++) { - const int r = ((*res) * c_sign) >> shift; - dst[x] = av_clip_pixel(dst[x] + r); - res++; - } - dst += stride; - } -} - static void FUNC(pred_residual_joint)(int *dst, const int *src, const int w, const int h, const int c_sign, const int shift) { @@ -121,7 +104,6 @@ static void FUNC(ff_vvc_itx_dsp_init)(VVCItxDSPContext *const itx) VVC_ITX(TYPE, type, 32); itx->add_residual = FUNC(add_residual); - itx->add_residual_joint = FUNC(add_residual_joint); itx->pred_residual_joint = FUNC(pred_residual_joint); itx->transform_bdpcm = FUNC(transform_bdpcm); VVC_ITX(DCT2, dct2, 2) diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c index 5f9bbea3d1..3db3347d8c 100644 --- a/libavcodec/vvc/intra.c +++ b/libavcodec/vvc/intra.c @@ -164,28 +164,6 @@ static void derive_transform_type(const VVCFrameContext *fc, const VVCLocalConte *trv = mts_to_trv[cu->mts_idx]; } -static void add_residual_for_joint_coding_chroma(VVCLocalContext *lc, - const TransformUnit *tu, TransformBlock *tb, const int chroma_scale) -{ - const VVCFrameContext *fc = lc->fc; - const CodingUnit *cu = lc->cu; - const int c_sign = 1 - 2 * fc->ps.ph.r->ph_joint_cbcr_sign_flag; - const int shift = tu->coded_flag[1] ^ tu->coded_flag[2]; - const int c_idx = 1 + tu->coded_flag[1]; - const ptrdiff_t stride = fc->frame->linesize[c_idx]; - const int hs = fc->ps.sps->hshift[c_idx]; - const int vs = fc->ps.sps->vshift[c_idx]; - uint8_t *dst = &fc->frame->data[c_idx][(tb->y0 >> vs) * stride + - ((tb->x0 >> hs) << fc->ps.sps->pixel_shift)]; - if (chroma_scale) { - fc->vvcdsp.itx.pred_residual_joint(tb->coeffs, tb->coeffs, tb->tb_width, tb->tb_height, c_sign, shift); - fc->vvcdsp.intra.lmcs_scale_chroma(lc, tb->coeffs, tb->coeffs, tb->tb_width, tb->tb_height, cu->x0, cu->y0); - fc->vvcdsp.itx.add_residual(dst, tb->coeffs, tb->tb_width, tb->tb_height, stride); - } else { - fc->vvcdsp.itx.add_residual_joint(dst, tb->coeffs, tb->tb_width, tb->tb_height, stride, c_sign, shift); - } -} - static int add_reconstructed_area(VVCLocalContext *lc, const int ch_type, const int x0, const int y0, const int w, const int h) { const VVCSPS *sps = lc->fc->ps.sps; @@ -531,7 +509,7 @@ static void itransform(VVCLocalContext *lc, TransformUnit *tu, const int tu_idx, const ptrdiff_t stride = fc->frame->linesize[c_idx]; const int hs = sps->hshift[c_idx]; const int vs = sps->vshift[c_idx]; - uint8_t *dst = &fc->frame->data[c_idx][(tb->y0 >> vs) * stride + ((tb->x0 >> hs) << ps)]; + const int has_jcbcr = tu->joint_cbcr_residual_flag && c_idx; if (cu->bdpcm_flag[tb->c_idx]) transform_bdpcm(tb, lc, cu); @@ -548,14 +526,25 @@ static void itransform(VVCLocalContext *lc, TransformUnit *tu, const int tu_idx, itx_1d(fc, tb, trh, trv); } - if (chroma_scale) - fc->vvcdsp.intra.lmcs_scale_chroma(lc, temp, tb->coeffs, w, h, cu->x0, cu->y0); - // TODO: Address performance issue here by combining transform, lmcs_scale_chroma, and add_residual into one function. - // Complete this task before implementing ASM code. - fc->vvcdsp.itx.add_residual(dst, chroma_scale ? temp : tb->coeffs, w, h, stride); - - if (tu->joint_cbcr_residual_flag && tb->c_idx) - add_residual_for_joint_coding_chroma(lc, tu, tb, chroma_scale); + for (int j = 0; j < 1 + has_jcbcr; j++) { + const bool is_jcbcr = j > 0; + const int jcbcr_idx = CB + tu->coded_flag[CB]; + TransformBlock *jcbcr = &tu->tbs[jcbcr_idx - tu->tbs[0].c_idx]; + const int c = is_jcbcr ? jcbcr_idx : tb->c_idx; + int *coeffs = is_jcbcr ? jcbcr->coeffs : tb->coeffs; + uint8_t *dst = &fc->frame->data[c][(tb->y0 >> vs) * stride + ((tb->x0 >> hs) << ps)]; + + if (!j && has_jcbcr) { + const int c_sign = 1 - 2 * fc->ps.ph.r->ph_joint_cbcr_sign_flag; + const int shift = tu->coded_flag[CB] ^ tu->coded_flag[CR]; + fc->vvcdsp.itx.pred_residual_joint(jcbcr->coeffs, tb->coeffs, tb->tb_width, tb->tb_height, c_sign, shift); + } + if (chroma_scale) + fc->vvcdsp.intra.lmcs_scale_chroma(lc, temp, coeffs, w, h, cu->x0, cu->y0); + // TODO: Address performance issue here by combining transform, lmcs_scale_chroma, and add_residual into one function. + // Complete this task before implementing ASM code. + fc->vvcdsp.itx.add_residual(dst, chroma_scale ? temp : coeffs, w, h, stride); + } } } } -- 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".