wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lavc/hevcdec: move per-slice local_ctx setup out of hls_slice_header()

Browse source 
Into decode_slice_data(). This is a step towards constifying
HEVCContext in hls_slice_header().
This commit is contained in:
Anton Khirnov 2024-06-02 13:47:13 +02:00
parent efc827bf6f
commit 3bbb5d78c7
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libavcodec/hevc/hevcdec.c
View file

@ -1014,14 +1014,7 @@ static int hls_slice_header(HEVCContext *s, GetBitContext *gb)
return AVERROR_INVALIDDATA;
}
s->local_ctx[0].first_qp_group = !s->sh.dependent_slice_segment_flag;
if (!pps->cu_qp_delta_enabled_flag)
s->local_ctx[0].qp_y = s->sh.slice_qp;
s->slice_initialized = 1;
s->local_ctx[0].tu.cu_qp_offset_cb = 0;
s->local_ctx[0].tu.cu_qp_offset_cr = 0;
return 0;
}
@ -2818,6 +2811,14 @@ static int decode_slice_data(HEVCContext *s, const H2645NAL *nal, GetBitContext
}
}
s->local_ctx[0].first_qp_group = !s->sh.dependent_slice_segment_flag;
if (!pps->cu_qp_delta_enabled_flag)
s->local_ctx[0].qp_y = s->sh.slice_qp;
s->local_ctx[0].tu.cu_qp_offset_cb = 0;
s->local_ctx[0].tu.cu_qp_offset_cr = 0;
if (s->avctx->active_thread_type == FF_THREAD_SLICE &&
s->sh.num_entry_point_offsets > 0 &&
pps->num_tile_rows == 1 && pps->num_tile_columns == 1)