PR #25870 opened by charlymp URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25870 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25870.patch
tile_row_order_dslice.hevc was encoded with the HM reference software: Main 10, 768x256, 3x1 tiles of 8 CTBs of 32x32, one dependent slice segment per tile without entry points, low delay P with a CRA every 32 pictures, cu_qp_delta, SAO, PCM and TMVP. The expected output is the HM reconstruction. tile_row_order_damaged.hevc is tile_row_order_nokey.hevc with the first two bytes of the slice data of tile 1 in picture 1 set to 0xff, so that the CABAC initialization of that slice fails. Without the first commit, -tile_interleave 1 gives an output that differs from -tile_interleave 0 and from one threading mode to another. Both are to be added to fate-suite under hevc/. >From f47a3f4aa4084c0c58e11a217b1528bb649fb0c7 Mon Sep 17 00:00:00 2001 From: Charly Morgand-Poyac <[email protected]> Date: Sun, 8 Nov 2026 17:43:07 +0100 Subject: [PATCH 1/2] lavc/hevcdec: skip undecodable deferred slices decode_nal_unit() skips a slice that fails to decode unless err_detect explode is set, but a deferred one fails the whole packet, and frame threading then drops the picture. Skip it as well. Signed-off-by: Charly Morgand-Poyac <[email protected]> --- libavcodec/hevc/hevcdec.c | 13 +++++++++++-- tests/fate/hevc.mak | 4 ++++ tests/ref/fate/hevc-tile-row-order-damaged | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 tests/ref/fate/hevc-tile-row-order-damaged diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 83fbdef9ba4..2e4fec693d3 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3203,6 +3203,11 @@ static int decode_tiles_row_major(HEVCContext *s, const HEVCLayerContext *l, substream_load(&lc->sub, t->data, t->size, t->qp_y_seed); ret = decode_ctb(s, l, lc, rs); + if (ret == AVERROR_INVALIDDATA && + !(s->avctx->err_recognition & AV_EF_EXPLODE)) { + t->ended = 1; + continue; + } if (ret < 0) return ret; @@ -3624,10 +3629,14 @@ static int decode_deferred_tile_slices(HEVCContext *s, int picture_complete) y_ctb = (rs / sps->ctb_width) << sps->log2_ctb_size; more_data = decode_ctb(s, l, lc, rs); - if (more_data < 0) - return more_data; } + if (more_data == AVERROR_INVALIDDATA && + !(s->avctx->err_recognition & AV_EF_EXPLODE)) + continue; + if (more_data < 0) + return more_data; + finish_last_ctb_filter(s, l, lc, x_ctb, y_ctb); } diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 9ae21af24ab..532f1f2f253 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -373,6 +373,10 @@ FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += fate-hevc-tile-row-order- fate-hevc-tile-row-order-nokey: CMD = framecrc -tile_interleave 1 -skip_loop_filter nokey -i $(TARGET_SAMPLES)/hevc/tile_row_order_nokey.hevc -pix_fmt yuv420p FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += fate-hevc-tile-row-order-nokey +# tile_row_order_nokey.hevc with the CABAC data of a slice made undecodable. +fate-hevc-tile-row-order-damaged: CMD = framecrc -tile_interleave 1 -i $(TARGET_SAMPLES)/hevc/tile_row_order_damaged.hevc -pix_fmt yuv420p +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += fate-hevc-tile-row-order-damaged + FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes) FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes) diff --git a/tests/ref/fate/hevc-tile-row-order-damaged b/tests/ref/fate/hevc-tile-row-order-damaged new file mode 100644 index 00000000000..c37bf5edcfe --- /dev/null +++ b/tests/ref/fate/hevc-tile-row-order-damaged @@ -0,0 +1,11 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 256x192 +#sar 0: 1/1 +0, 0, 0, 1, 73728, 0xf335c004 +0, 1, 1, 1, 73728, 0xfc957310 +0, 2, 2, 1, 73728, 0x2b78bdc1 +0, 3, 3, 1, 73728, 0x24721509 +0, 4, 4, 1, 73728, 0xa2ec2f8a +0, 5, 5, 1, 73728, 0xeae4590d -- 2.54.0 >From ffa65c40c60192440e4c8cd005fdec45b2db8939 Mon Sep 17 00:00:00 2001 From: Charly Morgand-Poyac <[email protected]> Date: Sun, 8 Nov 2026 17:43:07 +0100 Subject: [PATCH 2/2] lavc/hevcdec: defer dependent slice segments that start a tile A dependent slice segment that starts a tile reinitializes CABAC and the QP predictor, so it can be deferred like a single-tile slice. Pictures with one dependent segment per tile, as some broadcast encoders emit, can then take the CTB row order. The previous segment check moves to the deferred decoding, once that segment is decoded. Signed-off-by: Charly Morgand-Poyac <[email protected]> --- libavcodec/hevc/hevcdec.c | 30 +++++++++++++++---- tests/fate/hevc.mak | 4 +++ .../fate/hevc-tile-row-order-dependent-slices | 21 +++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 tests/ref/fate/hevc-tile-row-order-dependent-slices diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 2e4fec693d3..26e97036a42 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3287,15 +3287,14 @@ static int tile_slice_payload(const HEVCTileSlice *sl, return 0; } -/* Only an independent slice covering exactly one tile, or any independent - * slice of an untiled picture under slice threading, may be deferred. */ +/* Only a slice segment covering exactly one tile, or any independent slice + * of an untiled picture under slice threading, may be deferred. */ static int slice_is_deferrable(const HEVCContext *s) { const HEVCPPS *const pps = s->pps; int start_ts; if (s->sh.num_entry_point_offsets != 0 || - s->sh.dependent_slice_segment_flag || s->cur_layer != 0 || !s->cur_frame) return 0; @@ -3305,7 +3304,7 @@ static int slice_is_deferrable(const HEVCContext *s) return 0; if (slice_threads_wanted(s, pps)) - return 1; + return !s->sh.dependent_slice_segment_flag; if (!tile_interleave_wanted(s, pps)) return 0; @@ -3316,6 +3315,18 @@ static int slice_is_deferrable(const HEVCContext *s) (start_ts > 0 && pps->tile_id[start_ts - 1] == pps->tile_id[start_ts])) return 0; + if (s->sh.dependent_slice_segment_flag) { + const HEVCTileSlice *prev; + + if (!s->nb_tile_slices || start_ts == 0) + return 0; + + prev = &s->tile_slices[s->nb_tile_slices - 1]; + if (prev->sh.slice_addr != s->sh.slice_addr || + pps->tile_id[prev->start_ts] != pps->tile_id[start_ts - 1]) + return 0; + } + return 1; } @@ -3619,6 +3630,15 @@ static int decode_deferred_tile_slices(HEVCContext *s, int picture_complete) if (tile_slice_payload(sl, &data, &size) < 0) continue; + if (sl->sh.dependent_slice_segment_flag && + l->tab_slice_address[pps->ctb_addr_ts_to_rs[sl->start_ts - 1]] != + sl->sh.slice_addr) { + av_log(s->avctx, AV_LOG_ERROR, "Previous slice segment missing\n"); + if (s->avctx->err_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; + continue; + } + bind_slice_ctx(lc, &sl->sh, sl->rpl, sl->collocated_ref); substream_load(&lc->sub, data, size, sl->qp_y_seed); @@ -3851,7 +3871,7 @@ static int decode_slice_data(HEVCContext *s, const HEVCLayerContext *l, return AVERROR_PATCHWELCOME; } - if (s->sh.dependent_slice_segment_flag) { + if (s->sh.dependent_slice_segment_flag && !slice_is_deferrable(s)) { int ctb_addr_ts = pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; int prev_rs = pps->ctb_addr_ts_to_rs[ctb_addr_ts - 1]; if (l->tab_slice_address[prev_rs] != s->sh.slice_addr) { diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 532f1f2f253..f0b1a7730e9 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -377,6 +377,10 @@ FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += fate-hevc-tile-row-order- fate-hevc-tile-row-order-damaged: CMD = framecrc -tile_interleave 1 -i $(TARGET_SAMPLES)/hevc/tile_row_order_damaged.hevc -pix_fmt yuv420p FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += fate-hevc-tile-row-order-damaged +# One dependent slice segment per tile, without entry points. +fate-hevc-tile-row-order-dependent-slices: CMD = framecrc -tile_interleave 1 -i $(TARGET_SAMPLES)/hevc/tile_row_order_dslice.hevc -pix_fmt yuv420p10le +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += fate-hevc-tile-row-order-dependent-slices + FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes) FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes) diff --git a/tests/ref/fate/hevc-tile-row-order-dependent-slices b/tests/ref/fate/hevc-tile-row-order-dependent-slices new file mode 100644 index 00000000000..e00544af2be --- /dev/null +++ b/tests/ref/fate/hevc-tile-row-order-dependent-slices @@ -0,0 +1,21 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 768x256 +#sar 0: 0/1 +0, 0, 0, 1, 589824, 0x26503124 +0, 1, 1, 1, 589824, 0xbdb02a5f +0, 2, 2, 1, 589824, 0x495fea31 +0, 3, 3, 1, 589824, 0xe739d5dc +0, 4, 4, 1, 589824, 0x4f9e6b44 +0, 5, 5, 1, 589824, 0x3fb61d75 +0, 6, 6, 1, 589824, 0x680c227c +0, 7, 7, 1, 589824, 0xb22de7ac +0, 8, 8, 1, 589824, 0x9d9fc80f +0, 9, 9, 1, 589824, 0x6c0d85c6 +0, 10, 10, 1, 589824, 0xb122d776 +0, 11, 11, 1, 589824, 0xc5033f6f +0, 12, 12, 1, 589824, 0x6db6db6f +0, 13, 13, 1, 589824, 0xdcd40214 +0, 14, 14, 1, 589824, 0x12ba66ab +0, 15, 15, 1, 589824, 0xde4bd453 -- 2.54.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
