Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -856,9 +856,8 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, · 855 unmodified lines | ||
| 856 | 856 | { |
| 857 | 857 | HEVCWindow *ow; |
| 858 | 858 | int ret = 0; |
| 859 | − int log2_diff_max_min_transform_block_size; | |
| 860 | 859 | int bit_depth_chroma, start, vui_present, sublayer_ordering_info, num_comps; |
| 861 | − int i; | |
| 860 | + int i, j; | |
| 862 | 861 | |
| 863 | 862 | // Coded parameters |
| 864 | 863 | |
| @@ -993,12 +992,12 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, · 128 unmodified lines | ||
| 993 | 992 | } |
| 994 | 993 | } |
| 995 | 994 | |
| 996 | − sps->log2_min_cb_size = get_ue_golomb_long(gb) + 3; | |
| 997 | − sps->log2_diff_max_min_coding_block_size = get_ue_golomb_long(gb); | |
| 998 | − sps->log2_min_tb_size = get_ue_golomb_long(gb) + 2; | |
| 999 | − log2_diff_max_min_transform_block_size = get_ue_golomb_long(gb); | |
| 1000 | − sps->log2_max_trafo_size = log2_diff_max_min_transform_block_size + | |
| 1001 | − sps->log2_min_tb_size; | |
| 995 | + sps->log2_min_cb_size = get_ue_golomb_long(gb) + 3; | |
| 996 | + sps->log2_diff_max_min_coding_block_size = get_ue_golomb_long(gb); | |
| 997 | + sps->log2_min_tb_size = get_ue_golomb_long(gb) + 2; | |
| 998 | + sps->log2_diff_max_min_transform_block_size = get_ue_golomb_long(gb); | |
| 999 | + sps->log2_max_trafo_size = sps->log2_diff_max_min_transform_block_size + | |
| 1000 | + sps->log2_min_tb_size; | |
| 1002 | 1001 | |
| 1003 | 1002 | if (sps->log2_min_cb_size < 3 || sps->log2_min_cb_size > 30) { |
| 1004 | 1003 | av_log(avctx, AV_LOG_ERROR, "Invalid value %d for log2_min_cb_size", sps->log2_min_cb_size); |
| @@ -1015,8 +1014,9 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, · 10 unmodified lines | ||
| 1015 | 1014 | return AVERROR_INVALIDDATA; |
| 1016 | 1015 | } |
| 1017 | 1016 | |
| 1018 | − if (log2_diff_max_min_transform_block_size < 0 || log2_diff_max_min_transform_block_size > 30) { | |
| 1019 | − av_log(avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_transform_block_size", log2_diff_max_min_transform_block_size); | |
| 1017 | + if (sps->log2_diff_max_min_transform_block_size > 30) { | |
| 1018 | + av_log(avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_transform_block_size", | |
| 1019 | + sps->log2_diff_max_min_transform_block_size); | |
| 1020 | 1020 | return AVERROR_INVALIDDATA; |
| 1021 | 1021 | } |
| 1022 | 1022 | |
| @@ -237,6 +237,7 @@ typedef struct HEVCSPS { · 236 unmodified lines | ||
| 237 | 237 | unsigned int log2_max_trafo_size; |
| 238 | 238 | unsigned int log2_ctb_size; |
| 239 | 239 | unsigned int log2_min_pu_size; |
| 240 | + unsigned int log2_diff_max_min_transform_block_size; | |
| 240 | 241 | |
| 241 | 242 | int max_transform_hierarchy_depth_inter; |
| 242 | 243 | int max_transform_hierarchy_depth_intra; |