|
|
|
@@ -895,11 +895,30 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) |
|
|
|
sps->log2_max_trafo_size = log2_diff_max_min_transform_block_size + |
|
|
|
sps->log2_min_tb_size; |
|
|
|
|
|
|
|
if (sps->log2_min_tb_size >= sps->log2_min_cb_size) { |
|
|
|
if (sps->log2_min_cb_size < 3 || sps->log2_min_cb_size > 30) { |
|
|
|
av_log(s->avctx, AV_LOG_ERROR, "Invalid value %d for log2_min_cb_size", sps->log2_min_cb_size); |
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
goto err; |
|
|
|
} |
|
|
|
|
|
|
|
if (sps->log2_diff_max_min_coding_block_size > 30) { |
|
|
|
av_log(s->avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_coding_block_size", sps->log2_diff_max_min_coding_block_size); |
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
goto err; |
|
|
|
} |
|
|
|
|
|
|
|
if (sps->log2_min_tb_size >= sps->log2_min_cb_size || sps->log2_min_tb_size < 2) { |
|
|
|
av_log(s->avctx, AV_LOG_ERROR, "Invalid value for log2_min_tb_size"); |
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
goto err; |
|
|
|
} |
|
|
|
|
|
|
|
if (log2_diff_max_min_transform_block_size < 0 || log2_diff_max_min_transform_block_size > 30) { |
|
|
|
av_log(s->avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_transform_block_size", log2_diff_max_min_transform_block_size); |
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
goto err; |
|
|
|
} |
|
|
|
|
|
|
|
sps->max_transform_hierarchy_depth_inter = get_ue_golomb_long(gb); |
|
|
|
sps->max_transform_hierarchy_depth_intra = get_ue_golomb_long(gb); |
|
|
|
|
|
|
|
|