From: Wu Jianhua <toq...@outlook.com>
Signed-off-by: Wu Jianhua <toq...@outlook.com>
---
libavcodec/vvc/dec.c | 48 ++++++++++++++++++++++++++---------------
libavcodec/vvc/thread.c | 12 +++++++----
2 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c
index f860e116ab..09b0053703 100644
--- a/libavcodec/vvc/dec.c
+++ b/libavcodec/vvc/dec.c
@@ -506,23 +506,18 @@ static int slices_realloc(VVCFrameContext *fc)
return 0;
}
-static int ep_init_cabac_decoder(SliceContext *sc, const int index,
- const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit *unit)
+static int get_ep_size(const H266RawSliceHeader *rsh, GetBitContext *gb, const
H2645NAL *nal, const int header_size, const int ep_index)
{
- const H266RawSlice *slice = unit->content_ref;
- const H266RawSliceHeader *rsh = sc->sh.r;
- EntryPoint *ep = sc->eps + index;
int size;
- int ret;
- if (index < rsh->num_entry_points) {
+ if (ep_index < rsh->num_entry_points) {
int skipped = 0;
int64_t start = (gb->index >> 3);
- int64_t end = start + rsh->sh_entry_point_offset_minus1[index] + 1;
- while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped]
<= start + slice->header_size) {
+ int64_t end = start + rsh->sh_entry_point_offset_minus1[ep_index] + 1;
+ while (skipped < nal->skipped_bytes && nal->skipped_bytes_pos[skipped]
<= start + header_size) {
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--;
skipped++;
}
@@ -531,6 +526,13 @@ static int ep_init_cabac_decoder(SliceContext *sc, const
int index,
} else {
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);
ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8,
size);
if (ret < 0)
@@ -539,6 +541,19 @@ static int ep_init_cabac_decoder(SliceContext *sc, const
int index,
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,
VVCFrameContext *fc, const H2645NAL *nal, const CodedBitstreamUnit *unit)
{
@@ -562,20 +577,19 @@ static int slice_init_entry_points(SliceContext *sc,
return ret;
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;
- ep->ctu_end = (i + 1 == sc->nb_eps ? sh->num_ctus_in_curr_slice :
sh->entry_point_start_ctu[i]);
+ ret = ep_init(ep, ctu_addr, ctu_end, &gb, size);
+ if (ret < 0)
+ return ret;
for (int j = ep->ctu_start; j < ep->ctu_end; j++) {
const int rs = sc->sh.ctb_addr_in_curr_slice[j];
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)
ctu_addr = sh->entry_point_start_ctu[i];
}
diff --git a/libavcodec/vvc/thread.c b/libavcodec/vvc/thread.c
index 6194416e14..e1d64bd3d2 100644
--- a/libavcodec/vvc/thread.c
+++ b/libavcodec/vvc/thread.c
@@ -283,6 +283,12 @@ static void add_progress_listener(VVCFrame *ref,
ProgressListener *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)
{
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 (t->rx == fc->ps.pps->ctb_to_col_bd[t->rx]) {
EntryPoint *next = ep + 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));
- ff_vvc_ep_init_stat_coeff(next, sps->bit_depth,
sps->r->sps_persistent_rice_adaptation_enabled_flag);
- }
+ if (next < sc->eps + sc->nb_eps && !is_first_row(fc, t->rx, t->ry
+ 1))
+ ep_init_wpp(next, ep, sps);
}
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);
--
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-requ...@ffmpeg.org with subject "unsubscribe".
