if (s->HEVClc == s->HEVClcList[0])
s->HEVClc = NULL;
av_freep(&s->HEVClcList[0]);
+ av_freep(&s->HEVClcList);
+ av_freep(&s->sList);
ff_h2645_packet_uninit(&s->pkt);
s->avctx = avctx;
s->HEVClc = av_mallocz(sizeof(HEVCLocalContext));
- if (!s->HEVClc)
+ s->HEVClcList = av_mallocz(sizeof(HEVCLocalContext*) * s->threads_number);
+ s->sList = av_mallocz(sizeof(HEVCContext*) * s->threads_number);
+ if (!s->HEVClc || !s->HEVClcList || !s->sList)
goto fail;
s->HEVClcList[0] = s->HEVClc;
s->sList[0] = s;
HEVCContext *s = avctx->priv_data;
int ret;
+ if(avctx->active_thread_type & FF_THREAD_SLICE)
+ s->threads_number = avctx->thread_count;
+ else
+ s->threads_number = 1;
+
+ if((avctx->active_thread_type & FF_THREAD_FRAME) && avctx->thread_count > 1)
+ s->threads_type = FF_THREAD_FRAME;
+ else
+ s->threads_type = FF_THREAD_SLICE;
+
ret = hevc_init_context(avctx);
if (ret < 0)
return ret;
atomic_init(&s->wpp_err, 0);
- if(avctx->active_thread_type & FF_THREAD_SLICE)
- s->threads_number = avctx->thread_count;
- else
- s->threads_number = 1;
-
if (!avctx->internal->is_copy) {
if (avctx->extradata_size > 0 && avctx->extradata) {
ret = hevc_decode_extradata(s, avctx->extradata, avctx->extradata_size, 1);
}
}
- if((avctx->active_thread_type & FF_THREAD_FRAME) && avctx->thread_count > 1)
- s->threads_type = FF_THREAD_FRAME;
- else
- s->threads_type = FF_THREAD_SLICE;
-
return 0;
}
#include "thread.h"
#include "videodsp.h"
-#define MAX_NB_THREADS 16
#define SHIFT_CTB_WPP 2
//TODO: check if this is really the maximum
const AVClass *c; // needed by private avoptions
AVCodecContext *avctx;
- struct HEVCContext *sList[MAX_NB_THREADS];
+ struct HEVCContext **sList;
- HEVCLocalContext *HEVClcList[MAX_NB_THREADS];
+ HEVCLocalContext **HEVClcList;
HEVCLocalContext *HEVClc;
uint8_t threads_type;