RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/hevcdec: do not pass HEVCContext to decode_lt_rps() 

Pass the two numbers needed from it explicitly.

Makes it clear that HEVCContext is not modified by this function.
This commit is contained in:
Anton Khirnov 2024-06-01 16:04:14 +02:00
parent 0892ec947c
commit 5e438511ab
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/hevc/hevcdec.c
View File

@ -260,8 +260,8 @@ static int pred_weight_table(SliceHeader *sh, void *logctx,
return 0;
}
static int decode_lt_rps(HEVCContext *s, const HEVCSPS *sps, LongTermRPS *rps,
GetBitContext *gb)
static int decode_lt_rps(const HEVCSPS *sps, LongTermRPS *rps,
GetBitContext *gb, int cur_poc, int poc_lsb)
{
int max_poc_lsb = 1 << sps->log2_max_poc_lsb;
int prev_delta_msb = 0;
@ -306,7 +306,7 @@ static int decode_lt_rps(HEVCContext *s, const HEVCSPS *sps, LongTermRPS *rps,
if (i && i != nb_sps)
delta += prev_delta_msb;
poc = rps->poc[i] + s->poc - delta * max_poc_lsb - s->sh.pic_order_cnt_lsb;
poc = rps->poc[i] + cur_poc - delta * max_poc_lsb - poc_lsb;
if (poc != (int32_t)poc)
return AVERROR_INVALIDDATA;
rps->poc[i] = poc;
@ -744,7 +744,7 @@ static int hls_slice_header(HEVCContext *s, GetBitContext *gb)
sh->short_term_ref_pic_set_size = pos - get_bits_left(gb);
pos = get_bits_left(gb);
ret = decode_lt_rps(s, sps, &sh->long_term_rps, gb);
ret = decode_lt_rps(sps, &sh->long_term_rps, gb, s->poc, sh->pic_order_cnt_lsb);
if (ret < 0) {
av_log(s->avctx, AV_LOG_WARNING, "Invalid long term RPS.\n");
if (s->avctx->err_recognition & AV_EF_EXPLODE)