ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-20 07:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/hevcdec: Pass HEVCLocalContext** via execute2

Browse Source 
Right now the code passes a list of ints whose entry #i
is just i as opaque parameter to hls_decode_entry_wpp
via execute2; said list is even constantly allocated and freed.

This commit stops doing so and instead passes the list of
HEVCLocalContext* instead, so that the main HEVCContext
can be avoided in accessing the HEVCLocalContext.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-06-30 18:38:34 +02:00
parent 05b763a4a4
commit 09393130a0
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/hevcdec.c
View File

@ -2544,22 +2544,20 @@ static int hls_slice_data(HEVCContext *s)
s->avctx->execute(s->avctx, hls_decode_entry, arg, ret , 1, sizeof(int)); s->avctx->execute(s->avctx, hls_decode_entry, arg, ret , 1, sizeof(int));
return ret[0]; return ret[0];
} }
static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int job, int self_id) static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *hevc_lclist,
int job, int self_id)
{ {
HEVCContext *s1 = avctxt->priv_data, *s; HEVCLocalContext *lc = ((HEVCLocalContext**)hevc_lclist)[self_id];
HEVCLocalContext *lc; const HEVCContext *const s = lc->parent;
HEVCContext *s1 = avctxt->priv_data;
int ctb_size = 1<< s1->ps.sps->log2_ctb_size; int ctb_size = 1<< s1->ps.sps->log2_ctb_size;
int more_data = 1; int more_data = 1;
int *ctb_row_p = input_ctb_row; int ctb_row = job;
int ctb_row = ctb_row_p[job];
int ctb_addr_rs = s1->sh.slice_ctb_addr_rs + ctb_row * ((s1->ps.sps->width + ctb_size - 1) >> s1->ps.sps->log2_ctb_size); int ctb_addr_rs = s1->sh.slice_ctb_addr_rs + ctb_row * ((s1->ps.sps->width + ctb_size - 1) >> s1->ps.sps->log2_ctb_size);
int ctb_addr_ts = s1->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs]; int ctb_addr_ts = s1->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs];
int thread = ctb_row % s1->threads_number; int thread = ctb_row % s1->threads_number;
int ret; int ret;
s = s1->sList[self_id];
lc = s->HEVClc;
if(ctb_row) { if(ctb_row) {
ret = init_get_bits8(&lc->gb, s->data + s->sh.offset[ctb_row - 1], s->sh.size[ctb_row - 1]); ret = init_get_bits8(&lc->gb, s->data + s->sh.offset[ctb_row - 1], s->sh.size[ctb_row - 1]);
if (ret < 0) if (ret < 0)
@ -2631,16 +2629,12 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal)
int length = nal->size; int length = nal->size;
HEVCLocalContext *lc = s->HEVClc; HEVCLocalContext *lc = s->HEVClc;
int *ret = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int)); int *ret = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int));
int *arg = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int));
int64_t offset; int64_t offset;
int64_t startheader, cmpt = 0; int64_t startheader, cmpt = 0;
int i, j, res = 0; int i, j, res = 0;
if (!ret || !arg) { if (!ret)
av_free(ret);
av_free(arg);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
if (s->sh.slice_ctb_addr_rs + s->sh.num_entry_point_offsets * s->ps.sps->ctb_width >= s->ps.sps->ctb_width * s->ps.sps->ctb_height) { if (s->sh.slice_ctb_addr_rs + s->sh.num_entry_point_offsets * s->ps.sps->ctb_width >= s->ps.sps->ctb_width * s->ps.sps->ctb_height) {
av_log(s->avctx, AV_LOG_ERROR, "WPP ctb addresses are wrong (%d %d %d %d)\n", av_log(s->avctx, AV_LOG_ERROR, "WPP ctb addresses are wrong (%d %d %d %d)\n",
@ -2714,18 +2708,16 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal)
ff_reset_entries(s->avctx); ff_reset_entries(s->avctx);
for (i = 0; i <= s->sh.num_entry_point_offsets; i++) { for (i = 0; i <= s->sh.num_entry_point_offsets; i++) {
arg[i] = i;
ret[i] = 0; ret[i] = 0;
} }
if (s->ps.pps->entropy_coding_sync_enabled_flag) if (s->ps.pps->entropy_coding_sync_enabled_flag)
s->avctx->execute2(s->avctx, hls_decode_entry_wpp, arg, ret, s->sh.num_entry_point_offsets + 1); s->avctx->execute2(s->avctx, hls_decode_entry_wpp, s->HEVClcList, ret, s->sh.num_entry_point_offsets + 1);
for (i = 0; i <= s->sh.num_entry_point_offsets; i++) for (i = 0; i <= s->sh.num_entry_point_offsets; i++)
res += ret[i]; res += ret[i];
error: error:
av_free(ret); av_free(ret);
av_free(arg);
return res; return res;
} }