har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hevcdec: remove redundant bits_used_for_short_term_rps field

Browse Source 
It was introduced for Vulkan, but it is equivalent to
short_term_ref_pic_set_size when !short_term_ref_pic_set_sps_flag,
and when !!short_term_ref_pic_set_sps_flag, Vulkan hardcodes a zero
anyway.
This commit is contained in:
Lynne 2023-06-06 12:48:11 +02:00
parent d8c7fea8ef
commit 697382168d
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
3 changed files with 1 additions and 3 deletions

1
libavcodec/hevcdec.c

@ -723,7 +723,6 @@ static int hls_slice_header(HEVCContext *s)
if (ret < 0) if (ret < 0)
return ret; return ret;
sh->bits_used_for_short_term_rps = pos - get_bits_left(gb);
sh->short_term_rps = &sh->slice_rps; sh->short_term_rps = &sh->slice_rps;
} else { } else {
int numbits, rps_idx; int numbits, rps_idx;

1
libavcodec/hevcdec.h

@ -268,7 +268,6 @@ typedef struct SliceHeader {
///< RPS coded in the slice header itself is stored here ///< RPS coded in the slice header itself is stored here
int short_term_ref_pic_set_sps_flag; int short_term_ref_pic_set_sps_flag;
int bits_used_for_short_term_rps;
int short_term_ref_pic_set_size; int short_term_ref_pic_set_size;
ShortTermRPS slice_rps; ShortTermRPS slice_rps;
const ShortTermRPS *short_term_rps; const ShortTermRPS *short_term_rps;

2
libavcodec/vulkan_hevc.c

@ -788,7 +788,7 @@ static int vk_hevc_start_frame(AVCodecContext *avctx,
.NumDeltaPocsOfRefRpsIdx = h->sh.short_term_rps ? h->sh.short_term_rps->rps_idx_num_delta_pocs : 0, .NumDeltaPocsOfRefRpsIdx = h->sh.short_term_rps ? h->sh.short_term_rps->rps_idx_num_delta_pocs : 0,
.PicOrderCntVal = h->poc, .PicOrderCntVal = h->poc,
.NumBitsForSTRefPicSetInSlice = !h->sh.short_term_ref_pic_set_sps_flag ? .NumBitsForSTRefPicSetInSlice = !h->sh.short_term_ref_pic_set_sps_flag ?
h->sh.bits_used_for_short_term_rps : 0, h->sh.short_term_ref_pic_set_size : 0,
}; };
/* Fill in references */ /* Fill in references */