Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -1374,10 +1374,15 @@ static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_dept · 1373 unmodified lines | ||
| 1374 | 1374 | } |
| 1375 | 1375 | } |
| 1376 | 1376 | |
| 1377 | −static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps) | |
| 1377 | +static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPPS *pps) | |
| 1378 | 1378 | { |
| 1379 | − pps->num_cm_ref_layers_minus1 = get_ue_golomb_long(gb); | |
| 1380 | − for (int i = 0; i <= pps->num_cm_ref_layers_minus1; i++) | |
| 1379 | + pps->num_cm_ref_layers = get_ue_golomb(gb) + 1; | |
| 1380 | + if (pps->num_cm_ref_layers > 62) { | |
| 1381 | + av_log(avctx, AV_LOG_ERROR, | |
| 1382 | + "num_cm_ref_layers_minus1 shall be in the range [0, 61].\n"); | |
| 1383 | + return AVERROR_INVALIDDATA; | |
| 1384 | + } | |
| 1385 | + for (int i = 0; i < pps->num_cm_ref_layers; i++) | |
| 1381 | 1386 | pps->cm_ref_layer_id[i] = get_bits(gb, 6); |
| 1382 | 1387 | |
| 1383 | 1388 | pps->cm_octant_depth = get_bits(gb, 2); |
| @@ -1397,6 +1402,8 @@ static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps) · 13 unmodified lines | ||
| 1397 | 1402 | } |
| 1398 | 1403 | |
| 1399 | 1404 | colour_mapping_octants(gb, pps, 0, 0, 0, 0, 1 << pps->cm_octant_depth); |
| 1405 | + | |
| 1406 | + return 0; | |
| 1400 | 1407 | } |
| 1401 | 1408 | |
| 1402 | 1409 | static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, |
| @@ -1439,8 +1446,11 @@ static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, · 36 unmodified lines | ||
| 1439 | 1446 | } |
| 1440 | 1447 | |
| 1441 | 1448 | pps->colour_mapping_enabled_flag = get_bits1(gb); |
| 1442 | − if (pps->colour_mapping_enabled_flag) | |
| 1443 | − colour_mapping_table(gb, pps); | |
| 1449 | + if (pps->colour_mapping_enabled_flag) { | |
| 1450 | + int ret = colour_mapping_table(gb, avctx, pps); | |
| 1451 | + if (ret < 0) | |
| 1452 | + return ret; | |
| 1453 | + } | |
| 1444 | 1454 | |
| 1445 | 1455 | return 0; |
| 1446 | 1456 | } |
| @@ -332,8 +332,8 @@ typedef struct HEVCPPS { · 331 unmodified lines | ||
| 332 | 332 | int8_t phase_hor_chroma[64]; |
| 333 | 333 | int8_t phase_ver_chroma[64]; |
| 334 | 334 | uint8_t colour_mapping_enabled_flag; |
| 335 | − uint16_t num_cm_ref_layers_minus1; | |
| 336 | − uint8_t cm_ref_layer_id[63]; | |
| 335 | + uint8_t num_cm_ref_layers; | |
| 336 | + uint8_t cm_ref_layer_id[62]; | |
| 337 | 337 | uint8_t cm_octant_depth; |
| 338 | 338 | uint8_t cm_y_part_num_log2; |
| 339 | 339 | uint8_t luma_bit_depth_cm_input; |