virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/hevc_ps: Constify VPS, SPS pointers when parsing PPS

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2023-06-30 01:35:06 +02:00
parent 96d6990517
commit 686156f366
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/hevc_ps.c
View File

@@ -725,7 +725,8 @@ static void set_default_scaling_list_data(ScalingList *sl)
memcpy(sl->sl[3][5], default_scaling_list_inter, 64); memcpy(sl->sl[3][5], default_scaling_list_inter, 64);
} }
static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingList *sl, HEVCSPS *sps) static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx,
ScalingList *sl, const HEVCSPS *sps)
{ {
uint8_t scaling_list_pred_mode_flag; uint8_t scaling_list_pred_mode_flag;
uint8_t scaling_list_dc_coef[2][6]; uint8_t scaling_list_dc_coef[2][6];
@@ -1412,7 +1413,7 @@ static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPP
} }
static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx,
HEVCPPS *pps, HEVCSPS *sps, HEVCVPS *vps) HEVCPPS *pps, const HEVCSPS *sps, const HEVCVPS *vps)
{ {
pps->poc_reset_info_present_flag = get_bits1(gb); pps->poc_reset_info_present_flag = get_bits1(gb);
pps->pps_infer_scaling_list_flag = get_bits1(gb); pps->pps_infer_scaling_list_flag = get_bits1(gb);
@@ -1483,7 +1484,7 @@ static void delta_dlt(GetBitContext *gb, HEVCPPS *pps)
} }
static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx,
HEVCPPS *pps, HEVCSPS *sps) HEVCPPS *pps, const HEVCSPS *sps)
{ {
unsigned int pps_depth_layers_minus1; unsigned int pps_depth_layers_minus1;
@@ -1507,7 +1508,7 @@ static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx,
} }
static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx,
HEVCPPS *pps, HEVCSPS *sps) HEVCPPS *pps, const HEVCSPS *sps)
{ {
if (pps->transform_skip_enabled_flag) { if (pps->transform_skip_enabled_flag) {
pps->log2_max_transform_skip_block_size = get_ue_golomb_31(gb) + 2; pps->log2_max_transform_skip_block_size = get_ue_golomb_31(gb) + 2;
@@ -1547,7 +1548,7 @@ static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx,
} }
static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx,
HEVCPPS *pps, HEVCSPS *sps) HEVCPPS *pps, const HEVCSPS *sps)
{ {
int num_comps, ret; int num_comps, ret;
@@ -1599,7 +1600,7 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx,
} }
static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb,
HEVCPPS *pps, HEVCSPS *sps) HEVCPPS *pps, const HEVCSPS *sps)
{ {
int log2_diff; int log2_diff;
int pic_area_in_ctbs; int pic_area_in_ctbs;
@@ -1733,8 +1734,8 @@ static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb,
int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
HEVCParamSets *ps) HEVCParamSets *ps)
{ {
HEVCSPS *sps = NULL; const HEVCSPS *sps = NULL;
HEVCVPS *vps = NULL; const HEVCVPS *vps = NULL;
int i, ret = 0; int i, ret = 0;
unsigned int pps_id = 0; unsigned int pps_id = 0;
ptrdiff_t nal_size; ptrdiff_t nal_size;