History

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

Andreas Rheinhardt committed 3 years ago

Commit 686156f1 parent 96d69901 file · +9 −8Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/hevc_ps.c+9−8
@@ -725,7 +725,8 @@ static void set_default_scaling_list_data(ScalingList *sl) · 724 unmodified lines
725725 memcpy(sl->sl[3][5], default_scaling_list_inter, 64);
726726 }
727727
728−static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingList *sl, HEVCSPS *sps)
728+static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx,
729+ ScalingList *sl, const HEVCSPS *sps)
729730 {
730731 uint8_t scaling_list_pred_mode_flag;
731732 uint8_t scaling_list_dc_coef[2][6];
@@ -1412,7 +1413,7 @@ static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPP · 680 unmodified lines
14121413 }
14131414
14141415 static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx,
1415− HEVCPPS *pps, HEVCSPS *sps, HEVCVPS *vps)
1416+ HEVCPPS *pps, const HEVCSPS *sps, const HEVCVPS *vps)
14161417 {
14171418 pps->poc_reset_info_present_flag = get_bits1(gb);
14181419 pps->pps_infer_scaling_list_flag = get_bits1(gb);
@@ -1483,7 +1484,7 @@ static void delta_dlt(GetBitContext *gb, HEVCPPS *pps) · 64 unmodified lines
14831484 }
14841485
14851486 static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx,
1486− HEVCPPS *pps, HEVCSPS *sps)
1487+ HEVCPPS *pps, const HEVCSPS *sps)
14871488 {
14881489 unsigned int pps_depth_layers_minus1;
14891490
@@ -1507,7 +1508,7 @@ static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, · 17 unmodified lines
15071508 }
15081509
15091510 static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx,
1510− HEVCPPS *pps, HEVCSPS *sps)
1511+ HEVCPPS *pps, const HEVCSPS *sps)
15111512 {
15121513 if (pps->transform_skip_enabled_flag) {
15131514 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, · 33 unmodified lines
15471548 }
15481549
15491550 static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx,
1550− HEVCPPS *pps, HEVCSPS *sps)
1551+ HEVCPPS *pps, const HEVCSPS *sps)
15511552 {
15521553 int num_comps, ret;
15531554
@@ -1599,7 +1600,7 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, · 45 unmodified lines
15991600 }
16001601
16011602 static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb,
1602− HEVCPPS *pps, HEVCSPS *sps)
1603+ HEVCPPS *pps, const HEVCSPS *sps)
16031604 {
16041605 int log2_diff;
16051606 int pic_area_in_ctbs;
@@ -1733,8 +1734,8 @@ static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, · 127 unmodified lines
17331734 int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
17341735 HEVCParamSets *ps)
17351736 {
1736− HEVCSPS *sps = NULL;
1737− HEVCVPS *vps = NULL;
1737+ const HEVCSPS *sps = NULL;
1738+ const HEVCVPS *vps = NULL;
17381739 int i, ret = 0;
17391740 unsigned int pps_id = 0;
17401741 ptrdiff_t nal_size;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t