From patchwork Sun Sep 22 04:17:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 15223 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 963854486D7 for ; Sun, 22 Sep 2019 07:17:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 705C9688197; Sun, 22 Sep 2019 07:17:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D84A688193 for ; Sun, 22 Sep 2019 07:17:43 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id p10so11758765qkg.8 for ; Sat, 21 Sep 2019 21:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Qa8S0wS3zj0goZSH6+tkPRvnkEL5ehoEQtvKd3oeGnI=; b=a4oVRjKfAxpl9/sVlRyU3EeKCneEu/zR1Ps6qgLCdKHzMpKVrrRU3/mDR2fmRKtvyW okMsY6aSGL+9CLcmUzIo8YBQEFGVw5jnj14iA2PM/a9tx+673JhSiytSRbPheDrVA/xR quIPv+VF2j2UcNpO/yWcFqNskAOLdSTyKgOL9xHzUWvteSwkG9XLJExMV05WgZujU4dO XpiDwwwf673sraHGh6Gi0M/uQQOsPvFV6Pq1J4M1QQyfB9xr7nJJxDW1fGwcD3lws29I hnld4mZnZ+CdooEmg2Vz/1sUcsao/hx5Da/tCLdGBqdc1imtdTDw/kee/L2WCaV5ZhXZ MmvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Qa8S0wS3zj0goZSH6+tkPRvnkEL5ehoEQtvKd3oeGnI=; b=YA4ctTJ8xrZGQ6ZD9t2bVl9Iupp13D5/55ClkrnzFd1rnSu+hUEMTx3MgLcUFQaC69 u2GKDZVL8tZ+A0WI4VhsoKwqmVNDfG+Mz6UYIa3dTAJ+ySvobPlcLRMinOIBdRFvaWqr 1lcc/N4pKCoNXTow/xzFJJVgC9C99SztinScJVF0tLmgv/bMvrzOTxKHjlEMjrSlRUJo DUUYoTzTZnrD7tmbG9x3yUovCTl9FhsdPK3ZOB1XJ2klj2ZrEGNNAbLmB7n7JJY7UnIL MMkBiL/QBC/Gu9dCoYB6Kdsnq3u+sKeRn2ZDxZ+M7fJU19vnBubx1SW/jWY74zM04nu+ 4ozQ== X-Gm-Message-State: APjAAAUhC7VLy7ug2ETOMFdGBSDY4+YGmK9MJCI8t9MXEL545k9ljBTN nYo79WOOYRhTFjEMa8chbybA+MU/ X-Google-Smtp-Source: APXvYqwKrEihP4NhoztN0ftlYIswKdO9WFM1vjINLhyOoCADfROl9X68ihxY7lVLxRCvODTsjLhm0w== X-Received: by 2002:a37:313:: with SMTP id 19mr11668260qkd.356.1569125861836; Sat, 21 Sep 2019 21:17:41 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id g3sm3384150qkb.117.2019.09.21.21.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2019 21:17:41 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2019 00:17:29 -0400 Message-Id: <20190922041729.6778-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/hevc_ps: Remove dead code in vps_id check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman 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 --- 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",