virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/vvc/ctu: refact out ff_vvc_channel_range

Browse Source 
Signed-off-by: Wu Jianhua <toqsxw@outlook.com>
This commit is contained in:
Wu Jianhua
2025-05-14 21:40:12 +08:00
committed by Nuo Mi
parent d80041f123
commit cfea9b88a5
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/vvc/ctu.c
View File

@ -501,13 +501,12 @@ static int skipped_transform_tree(VVCLocalContext *lc, int x0, int y0,int tu_wid
SKIPPED_TRANSFORM_TREE(x0, y0 + trafo_height); SKIPPED_TRANSFORM_TREE(x0, y0 + trafo_height);
} else { } else {
TransformUnit *tu = add_tu(fc, lc->cu, x0, y0, tu_width, tu_height); TransformUnit *tu = add_tu(fc, lc->cu, x0, y0, tu_width, tu_height);
const int has_chroma = sps->r->sps_chroma_format_idc && cu->tree_type != DUAL_TREE_LUMA; int start, end;
const int c_start = cu->tree_type == DUAL_TREE_CHROMA ? CB : LUMA;
const int c_end = has_chroma ? VVC_MAX_SAMPLE_ARRAYS : CB;
if (!tu) if (!tu)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for (int i = c_start; i < c_end; i++) { ff_vvc_channel_range(&start, &end, cu->tree_type, sps->r->sps_chroma_format_idc);
for (int i = start; i < end; i++) {
TransformBlock *tb = add_tb(tu, lc, x0, y0, tu_width >> sps->hshift[i], tu_height >> sps->vshift[i], i); TransformBlock *tb = add_tb(tu, lc, x0, y0, tu_width >> sps->hshift[i], tu_height >> sps->vshift[i], i);
if (i != CR) if (i != CR)
set_tb_size(fc, tb); set_tb_size(fc, tb);
@ -2580,3 +2579,12 @@ void ff_vvc_ep_init_stat_coeff(EntryPoint *ep,
persistent_rice_adaptation_enabled_flag ? 2 * (av_log2(bit_depth - 10)) : 0; persistent_rice_adaptation_enabled_flag ? 2 * (av_log2(bit_depth - 10)) : 0;
} }
} }
void ff_vvc_channel_range(int *start, int *end, const VVCTreeType tree_type, const uint8_t chroma_format_idc)
{
const bool has_chroma = chroma_format_idc && tree_type != DUAL_TREE_LUMA;
const bool has_luma = tree_type != DUAL_TREE_CHROMA;
*start = has_luma ? LUMA : CB;
*end = has_chroma ? VVC_MAX_SAMPLE_ARRAYS : CB;
}

1
libavcodec/vvc/ctu.h
View File

@ -489,5 +489,6 @@ void ff_vvc_decode_neighbour(VVCLocalContext *lc, int x_ctb, int y_ctb, int rx,
void ff_vvc_ctu_free_cus(CodingUnit **cus); void ff_vvc_ctu_free_cus(CodingUnit **cus);
int ff_vvc_get_qPy(const VVCFrameContext *fc, int xc, int yc); int ff_vvc_get_qPy(const VVCFrameContext *fc, int xc, int yc);
void ff_vvc_ep_init_stat_coeff(EntryPoint *ep, int bit_depth, int persistent_rice_adaptation_enabled_flag); void ff_vvc_ep_init_stat_coeff(EntryPoint *ep, int bit_depth, int persistent_rice_adaptation_enabled_flag);
void ff_vvc_channel_range(int *start, int *end, VVCTreeType tree_type, uint8_t chroma_format_idc);
#endif // AVCODEC_VVC_CTU_H #endif // AVCODEC_VVC_CTU_H

8
libavcodec/vvc/intra.c
View File

@ -639,11 +639,11 @@ static void ibc_fill_vir_buf(const VVCLocalContext *lc, const CodingUnit *cu)
{ {
const VVCFrameContext *fc = lc->fc; const VVCFrameContext *fc = lc->fc;
const VVCSPS *sps = fc->ps.sps; const VVCSPS *sps = fc->ps.sps;
const int has_chroma = sps->r->sps_chroma_format_idc && cu->tree_type != DUAL_TREE_LUMA; int start, end;
const int start = cu->tree_type == DUAL_TREE_CHROMA;
const int end = has_chroma ? CR : LUMA;
for (int c_idx = start; c_idx <= end; c_idx++) { ff_vvc_channel_range(&start, &end, cu->tree_type, sps->r->sps_chroma_format_idc);
for (int c_idx = start; c_idx < end; c_idx++) {
const int hs = sps->hshift[c_idx]; const int hs = sps->hshift[c_idx];
const int vs = sps->vshift[c_idx]; const int vs = sps->vshift[c_idx];
const int ps = sps->pixel_shift; const int ps = sps->pixel_shift;