virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

lavc/hevcdec: always call hevc_frame_end() after successfully decoding an AU

Browse Source 
Currently it is only done if the final CTB address is at the end of the
frame, however that address is not known with hwaccel decoding. As we
only support exactly one AU per packet, and not partial/multiple AUs, we
can just as well call hevc_frame_end() unconditionally.

Fixes hwaccel decoding after d725c737fe2a19091b481d4d115fd939e0a674b2.

Reported-by: llyyr <llyyr.public@gmail.com>
This commit is contained in:
Anton Khirnov 2024-06-12 10:08:02 +02:00
parent 959cb2e2e3
commit 0060a368b1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/hevc/hevcdec.c
View File

@ -3192,11 +3192,6 @@ static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb)
ret = decode_slice_data(s, nal, gb);
if (ret < 0)
return ret;
if (ret >= s->cur_frame->ctb_count) {
ret = hevc_frame_end(s);
if (ret < 0)
return ret;
}
return 0;
}
@ -3370,8 +3365,13 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
}
fail:
if (s->cur_frame && s->avctx->active_thread_type == FF_THREAD_FRAME)
ff_progress_frame_report(&s->cur_frame->tf, INT_MAX);
if (s->cur_frame) {
if (ret >= 0)
ret = hevc_frame_end(s);
if (s->avctx->active_thread_type == FF_THREAD_FRAME)
ff_progress_frame_report(&s->cur_frame->tf, INT_MAX);
}
return ret;
}