From patchwork Thu Oct 22 14:56:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23150 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 70F5144A593 for ; Thu, 22 Oct 2020 17:56:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4643968A494; Thu, 22 Oct 2020 17:56:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E472689DBD for ; Thu, 22 Oct 2020 17:56:35 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id g12so2811510wrp.10 for ; Thu, 22 Oct 2020 07:56:35 -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=qPsIyZJN15Oer8olIc2hnVqOPNMm0FAGEDicK7rt4I8=; b=X5vdb5TpWz0E1lqOtc3ANpKeBflat0b6zaooJIiRBPonOnqad/ldnGDHKOIqaCxOvb /lkQA4MnjWCvc6con8ZJuwxlrzPihsyZSLepd0ZPvyppu1mTA7ThYg8HVTpvtkCv8ECe A6hH/hFeA+SJimFTggvGHgW6++F9sO1SkQNT0uAo1gir14931urtDog9BoEFpyHmGLXR eFmH1X5aNPNDtXkeCtPFffdLMVRfMJpCdndjpxbCrZch4TaqldmXRCpLjheHzdVs+iqN jid6DOkWedosvLQiUrjrwmsS0nTdLnkbZUXErnhPfv1ao+rEFjhzGrRk1EJ7HW3K4632 JVww== 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=qPsIyZJN15Oer8olIc2hnVqOPNMm0FAGEDicK7rt4I8=; b=IoV0LRAbyDaGmfPOd/RqAY2wup8XMEVLnrIKvfq1yzOwGx6zdNdB5N1DHP8Amm/XTS qDYuDeyZ6Jy/qrxXx0IoBOFubCVrOAMJREf5QQg/KylcSBP2ltVt7BH/CTE8CLwESAaD EGTtQi4NJSLXuvjnknaGQKNoCQOwEo1/sUFq9py5lfOGegTcXVeoEnScc9d3ee7KgXw5 7d+PBGnagdD7rqnOFOS0EOAl9F7s8eQFsLOOk/9McU8A8RLk/GGfU8SPIAxPBjnR/xdN /2+sZGIDy+6Kt/exW5aSgIbh2oJ6YsEZX39G2rfK3U9rayZ+UOl1w35PjPhtarDzHreF E25Q== X-Gm-Message-State: AOAM530A6XLNzj7PL3iVMPwUXFonITKqn8kF+6cMx12HOcVcI9AC1WpG DaB8ls67DLdVY8a6sCljuBHma+ziqUI= X-Google-Smtp-Source: ABdhPJy4P51ULY+H2/N4PBAs4pJGw8V7CY2Tbk1tETzuDhikJkeM3cTRUbs0lCnFGCAGvxen3HHTpg== X-Received: by 2002:adf:fb8b:: with SMTP id a11mr3097351wrr.407.1603378594138; Thu, 22 Oct 2020 07:56:34 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id a3sm4711652wrh.94.2020.10.22.07.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 07:56:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Oct 2020 16:56:22 +0200 Message-Id: <20201022145624.657457-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/webp: Use uint8_t for code lengths 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" They are always in the range 0..15, so using an int is not necessary. Furthermore, using an int would not work if sizeof(int) == 4 as ff_init_vlc_sparse() can only handle uint8_t, uint16_t and uint32_t lengths. Signed-off-by: Andreas Rheinhardt --- libavcodec/webp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 6140c7ea4a..6b53a7f17c 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -243,7 +243,7 @@ static int huff_reader_get_symbol(HuffReader *r, GetBitContext *gb) return get_vlc2(gb, r->vlc.table, 8, 2); } -static int huff_reader_build_canonical(HuffReader *r, int *code_lengths, +static int huff_reader_build_canonical(HuffReader *r, const uint8_t *code_lengths, int alphabet_size) { int len = 0, sym, code = 0, ret; @@ -324,8 +324,8 @@ static int read_huffman_code_normal(WebPContext *s, HuffReader *hc, int alphabet_size) { HuffReader code_len_hc = { { 0 }, 0, 0, { 0 } }; - int *code_lengths = NULL; - int code_length_code_lengths[NUM_CODE_LENGTH_CODES] = { 0 }; + uint8_t *code_lengths = NULL; + uint8_t code_length_code_lengths[NUM_CODE_LENGTH_CODES] = { 0 }; int i, symbol, max_symbol, prev_code_len, ret; int num_codes = 4 + get_bits(&s->gb, 4); @@ -340,7 +340,7 @@ static int read_huffman_code_normal(WebPContext *s, HuffReader *hc, if (ret < 0) goto finish; - code_lengths = av_mallocz_array(alphabet_size, sizeof(*code_lengths)); + code_lengths = av_mallocz(alphabet_size); if (!code_lengths) { ret = AVERROR(ENOMEM); goto finish;