From patchwork Sat Jun 11 14:08:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 36160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp341601pzj; Sat, 11 Jun 2022 07:08:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI2cALbz2UCukwMjxgBhPdYx7AjcVXX/+NkD4sf6X3e7AJZ2lz56G1RIiX5aFPIGrKZxCT X-Received: by 2002:a17:906:519c:b0:712:1c90:1c39 with SMTP id y28-20020a170906519c00b007121c901c39mr8361092ejk.620.1654956519093; Sat, 11 Jun 2022 07:08:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654956519; cv=none; d=google.com; s=arc-20160816; b=TRyrh1K2ejELtCDebiaKT8/v2lehV3+MbZlp0wj386d3EUjo1xV+rHEP2e1g0VR9sN WhTPJVZPj+Vv1hxZJasoiCXIiNFUXJHLCYWFPKzlDTGCxIfjfmGidr9HYQLLFLuChrzP O4vbSXw7BTofCIEmK5zxfSNAVuW6+lnl0uJaf6mPjiw23MQhFT3JDKC8IL5TuXBrplPc n5TlN+KHFUjronG7pzJ2rhRKzTf3U5aeJDt2Ba6EHeyVH5GLunuA9/dsZv6ohyGPdRQx lSOqNAgFw04RfQr57O8asn6w/+/VbUwue8hFqUDImfD6RCaFaoA4Idt59TDX1X8724vw WTSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=odi/OV9mA9Lera7znrsUv+WoMFKhSA6ZshkAvvDdJ7o=; b=pEEWmL8pFE38+k2S1Tz5l98+tg/o3giGToqLBV61vPlkp0p+PIMCPTYxhF1a4pwz/t JZfPOmc3o4oaDNhdOgBTAEW69k4vImWt54doIWu0NNsZJFKSY8r8f2R1pXqU0cU9iupv KO+fhuUh06SLLRKRcQwjJceofeViRtrF5W5nZJOA1NhGctoLBmF0/2L1XAeqEXCUCsNz bsr9YkdzBZD1c+fqXdW3GqZk9sTP66vzVQsEsZRyB960wjb2XBy6PFxqzX5T7thgs/Wg 1dDG8Q56xq4WrMd+bKKtyR4/XGvBWT9ruzU4BXJtHDVnTIKKYQvfyuhcYBl1HeNXnf6J pIpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ckla5ByB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y16-20020a17090614d000b006ff05f85ac7si1790275ejc.381.2022.06.11.07.08.38; Sat, 11 Jun 2022 07:08:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ckla5ByB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32A1A68B3AB; Sat, 11 Jun 2022 17:08:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27D2F68B4BC for ; Sat, 11 Jun 2022 17:08:27 +0300 (EEST) Received: by mail-qv1-f48.google.com with SMTP id o43so1462495qvo.4 for ; Sat, 11 Jun 2022 07:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1VGJ6YRI/4aYSXLbVI1lNSV35/zNCw3U620bu2tx79w=; b=Ckla5ByBCA9y1WBmxExW+SXnw9lyGQ66tQIf+MjIilq/4qEtmDoE559Mo53jyeZUmb f2KFrQpQSTtbdAZ/IrKra64IC1D6SKIGUNHaySSUjhVLSp0J4bgmIML5M1LhSdz82Gn7 5z8PRT11/FvO6/H2KTlG3Qdd3RAh3uXRnpoWviO/fwIfUlgVJUA2G3ez9YO4dESNJJa8 zkSdAvgEOBTAJK0YP+isPWVDF/aOC0VwlI5B5onLclCu6bStn1TKo2OVKT81SeCqYemf mPlYowJkVsT1fJet3qZzs2QGds/ztNjByvMCjO7Wl1spNgCFmEljeW+GB2P2+qpC3SeU pdYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1VGJ6YRI/4aYSXLbVI1lNSV35/zNCw3U620bu2tx79w=; b=T56wNkV2Q0jP5tP949ebpgvyy8+dPD+I5f2MSKYDSdEMUNQAUgvQUJcyEJzSKphrIh R9OONPEqimGur9URd2KaNlH6lpUvpgsIMJNtE8dsAU3EF+cS8pIH9q4jIBBcVzfp2c0Q L5B64JZ5VwMTrwFXL1jb42YIzMMfBlJJojWYONE/ZSRArMI0B0n4lpfaPUBJXM2/R9x6 bFRB9rEiOzS34JVIbadICPyw5hEhYXsCphDmx/UT43OqWCxhnU6r4DiMqQkkRLuL2f6k gm5wdVb0a34Dtrt0n94OZx2rWVJL/5qPdwZ3+Do5GYTq7gfDU9Q3b0uABMBsejLtPZyq LGFQ== X-Gm-Message-State: AOAM533C1fjYovC0tYWrBdZbf/UABVBgJjVr1h91LCHG4DQ3VYNHYWhe IYpO2xjvhhQ/rwnKLiksabH7n3coIzc= X-Received: by 2002:a05:6214:b69:b0:467:d42d:370a with SMTP id ey9-20020a0562140b6900b00467d42d370amr35227643qvb.17.1654956505648; Sat, 11 Jun 2022 07:08:25 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id t14-20020a37aa0e000000b006a693e46d5csm1906173qke.11.2022.06.11.07.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jun 2022 07:08:25 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Jun 2022 10:08:20 -0400 Message-Id: <20220611140820.105906-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/get_bits: declare VLC table args as const X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7/bQi1SO/4YJ Declaring the VLC table as const allows a caller to call get_vlc2() with a pre-generated static const table without generating warnings for -Wdiscarded-qualifiers. --- libavcodec/get_bits.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index d4e9276da1..49202b0211 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -775,7 +775,7 @@ static inline const uint8_t *align_get_bits(GetBitContext *s) /* Return the LUT element for the given bitstream configuration. */ static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits, - VLC_TYPE (*table)[2]) + const VLC_TYPE (*table)[2]) { unsigned idx; @@ -795,7 +795,7 @@ static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits, * = (max_vlc_length + bits - 1) / bits * @returns the code parsed or -1 if no vlc matches */ -static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], +static av_always_inline int get_vlc2(GetBitContext *s, const VLC_TYPE (*table)[2], int bits, int max_depth) { #if CACHED_BITSTREAM_READER