[FFmpeg-devel] [PATCH v2] avcodec/hevc_ps: Remove dead code in vps_id check

[Andriy Gelman]

On Sun, 22. Sep 00:17, Andriy Gelman wrote:
> From: Andriy Gelman <andriy.gelman at gmail.com>
> 
> Since reading 4 bits always returns a value in the range [0, 15], the
> check for vps_id >= HEVC_MAX_VPS_COUNT, where HEVC_MAX_VPS_COUNT = 16, is redundant.
> 
> Signed-off-by: Andriy Gelman <andriy.gelman at gmail.com>
> ---
>  libavcodec/hevc_ps.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
> index abf08b919b..a30b8b8022 100644
> --- a/libavcodec/hevc_ps.c
> +++ b/libavcodec/hevc_ps.c
> @@ -448,10 +448,6 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
>      memcpy(vps->data, gb->buffer, vps->data_size);
>  
>      vps_id = get_bits(gb, 4);
> -    if (vps_id >= HEVC_MAX_VPS_COUNT) {
> -        av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", vps_id);
> -        goto err;
> -    }
>  
>      if (get_bits(gb, 2) != 3) { // vps_reserved_three_2bits
>          av_log(avctx, AV_LOG_ERROR, "vps_reserved_three_2bits is not three\n");
> @@ -883,10 +879,6 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id,
>      // Coded parameters
>  
>      sps->vps_id = get_bits(gb, 4);
> -    if (sps->vps_id >= HEVC_MAX_VPS_COUNT) {
> -        av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", sps->vps_id);
> -        return AVERROR_INVALIDDATA;
> -    }
>  
>      if (vps_list && !vps_list[sps->vps_id]) {
>          av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n",
> -- 
> 2.23.0
> 

ping

-- 
Andriy