virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

lavc/hevcdec: track local context count separately from WPP thread count

Browse Source 
The latter can be lowered while decoding, which would lead to memleaks.
This commit is contained in:
Anton Khirnov 2024-04-07 11:49:04 +02:00
parent a1471ec8ad
commit 25ce44efa5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/hevcdec.c
View File

@ -2697,11 +2697,13 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal)
}
for (i = 1; i < s->threads_number; i++) {
if (s->local_ctx[i])
if (i < s->nb_local_ctx)
continue;
s->local_ctx[i] = av_mallocz(sizeof(HEVCLocalContext));
if (!s->local_ctx[i])
return AVERROR(ENOMEM);
s->nb_local_ctx++;
s->local_ctx[i]->logctx = s->avctx;
s->local_ctx[i]->parent = s;
s->local_ctx[i]->common_cabac_state = &s->cabac;
@ -3473,7 +3475,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx)
av_freep(&s->sh.size);
if (s->local_ctx) {
for (i = 1; i < s->threads_number; i++) {
for (i = 1; i < s->nb_local_ctx; i++) {
av_freep(&s->local_ctx[i]);
}
}
@ -3502,6 +3504,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx)
s->HEVClc->logctx = avctx;
s->HEVClc->common_cabac_state = &s->cabac;
s->local_ctx[0] = s->HEVClc;
s->nb_local_ctx = 1;
s->output_frame = av_frame_alloc();
if (!s->output_frame)

2
libavcodec/hevcdec.h
View File

@ -446,6 +446,8 @@ typedef struct HEVCContext {
AVCodecContext *avctx;
HEVCLocalContext **local_ctx;
unsigned nb_local_ctx;
HEVCLocalContext *HEVClc;
uint8_t threads_type;