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: refact out ep_init and ep_init_wpp

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

48
libavcodec/vvc/dec.c
View File

@ -506,23 +506,18 @@ static int slices_realloc(VVCFrameContext *fc)
return 0; return 0;
} }
static int ep_init_cabac_decoder(SliceContext *sc, const int index, static int get_ep_size(const H266RawSliceHeader *rsh, GetBitContext *gb, const H2645NAL *nal, const int header_size, const int ep_index)
const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit *unit)
{ {
const H266RawSlice *slice = unit->content_ref;
const H266RawSliceHeader *rsh = sc->sh.r;
EntryPoint *ep = sc->eps + index;
int size; int size;
int ret;
if (index < rsh->num_entry_points) { if (ep_index < rsh->num_entry_points) {
int skipped = 0; int skipped = 0;
int64_t start = (gb->index >> 3); int64_t start = (gb->index >> 3);
int64_t end = start + rsh->sh_entry_point_offset_minus1[index] + 1; int64_t end = start + rsh->sh_entry_point_offset_minus1[ep_index] + 1;
while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped] <= start + slice->header_size) { while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped] <= start + header_size) {
skipped++; skipped++;
} }
while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped] <= end + slice->header_size) { while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped] <= end + header_size) {
end--; end--;
skipped++; skipped++;
} }
@ -531,6 +526,13 @@ static int ep_init_cabac_decoder(SliceContext *sc, const int index,
} else { } else {
size = get_bits_left(gb) / 8; size = get_bits_left(gb) / 8;
} }
return size;
}
static int ep_init_cabac_decoder(EntryPoint *ep, GetBitContext *gb, const int size)
{
int ret;
av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end); av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end);
ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size);
if (ret < 0) if (ret < 0)
@ -539,6 +541,19 @@ static int ep_init_cabac_decoder(SliceContext *sc, const int index,
return 0; return 0;
} }
static int ep_init(EntryPoint *ep, const int ctu_addr, const int ctu_end, GetBitContext *gb, const int size)
{
const int ret = ep_init_cabac_decoder(ep, gb, size);
if (ret < 0)
return ret;
ep->ctu_start = ctu_addr;
ep->ctu_end = ctu_end;
return 0;
}
static int slice_init_entry_points(SliceContext *sc, static int slice_init_entry_points(SliceContext *sc,
VVCFrameContext *fc, const H2645NAL *nal, const CodedBitstreamUnit *unit) VVCFrameContext *fc, const H2645NAL *nal, const CodedBitstreamUnit *unit)
{ {
@ -562,20 +577,19 @@ static int slice_init_entry_points(SliceContext *sc,
return ret; return ret;
for (int i = 0; i < sc->nb_eps; i++) for (int i = 0; i < sc->nb_eps; i++)
{ {
EntryPoint *ep = sc->eps + i; const int size = get_ep_size(sc->sh.r, &gb, nal, slice->header_size, i);
const int ctu_end = (i + 1 == sc->nb_eps ? sh->num_ctus_in_curr_slice : sh->entry_point_start_ctu[i]);
EntryPoint *ep = sc->eps + i;
ep->ctu_start = ctu_addr; ret = ep_init(ep, ctu_addr, ctu_end, &gb, size);
ep->ctu_end = (i + 1 == sc->nb_eps ? sh->num_ctus_in_curr_slice : sh->entry_point_start_ctu[i]); if (ret < 0)
return ret;
for (int j = ep->ctu_start; j < ep->ctu_end; j++) { for (int j = ep->ctu_start; j < ep->ctu_end; j++) {
const int rs = sc->sh.ctb_addr_in_curr_slice[j]; const int rs = sc->sh.ctb_addr_in_curr_slice[j];
fc->tab.slice_idx[rs] = sc->slice_idx; fc->tab.slice_idx[rs] = sc->slice_idx;
} }
ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit);
if (ret < 0)
return ret;
if (i + 1 < sc->nb_eps) if (i + 1 < sc->nb_eps)
ctu_addr = sh->entry_point_start_ctu[i]; ctu_addr = sh->entry_point_start_ctu[i];
} }

12
libavcodec/vvc/thread.c
View File

@ -283,6 +283,12 @@ static void add_progress_listener(VVCFrame *ref, ProgressListener *l,
ff_vvc_add_progress_listener(ref, (VVCProgressListener*)l); ff_vvc_add_progress_listener(ref, (VVCProgressListener*)l);
} }
static void ep_init_wpp(EntryPoint *next, const EntryPoint *ep, const VVCSPS *sps)
{
memcpy(next->cabac_state, ep->cabac_state, sizeof(next->cabac_state));
ff_vvc_ep_init_stat_coeff(next, sps->bit_depth, sps->r->sps_persistent_rice_adaptation_enabled_flag);
}
static void schedule_next_parse(VVCContext *s, VVCFrameContext *fc, const SliceContext *sc, const VVCTask *t) static void schedule_next_parse(VVCContext *s, VVCFrameContext *fc, const SliceContext *sc, const VVCTask *t)
{ {
VVCFrameThread *ft = fc->ft; VVCFrameThread *ft = fc->ft;
@ -292,10 +298,8 @@ static void schedule_next_parse(VVCContext *s, VVCFrameContext *fc, const SliceC
if (sps->r->sps_entropy_coding_sync_enabled_flag) { if (sps->r->sps_entropy_coding_sync_enabled_flag) {
if (t->rx == fc->ps.pps->ctb_to_col_bd[t->rx]) { if (t->rx == fc->ps.pps->ctb_to_col_bd[t->rx]) {
EntryPoint *next = ep + 1; EntryPoint *next = ep + 1;
if (next < sc->eps + sc->nb_eps && !is_first_row(fc, t->rx, t->ry + 1)) { if (next < sc->eps + sc->nb_eps && !is_first_row(fc, t->rx, t->ry + 1))
memcpy(next->cabac_state, ep->cabac_state, sizeof(next->cabac_state)); ep_init_wpp(next, ep, sps);
ff_vvc_ep_init_stat_coeff(next, sps->bit_depth, sps->r->sps_persistent_rice_adaptation_enabled_flag);
}
} }
if (t->ry + 1 < ft->ctu_height && !is_first_row(fc, t->rx, t->ry + 1)) if (t->ry + 1 < ft->ctu_height && !is_first_row(fc, t->rx, t->ry + 1))
frame_thread_add_score(s, ft, t->rx, t->ry + 1, VVC_TASK_STAGE_PARSE); frame_thread_add_score(s, ft, t->rx, t->ry + 1, VVC_TASK_STAGE_PARSE);