From patchwork Tue Oct 13 09:10:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22908 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 0806B44AFB2 for ; Tue, 13 Oct 2020 12:10:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBB6868B82F; Tue, 13 Oct 2020 12:10:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4B0C68AF32 for ; Tue, 13 Oct 2020 12:10:26 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id h7so23094857wre.4 for ; Tue, 13 Oct 2020 02:10:26 -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=nk+70u5yJDFejNNUr2VqQfoi05U9CvVtDbHXOtejT7c=; b=E+yAhr0wsdmTtAKLY+/NEFzaKsk4SuCzEtdz7vLPQMpGzT7j9JbfhdpwHIh75H3iHq 4VdujI7BAJiKuq8eJTd8J8bcSBqqeP5fu5c1pwnawXNFC7tAPxBIohYOdSvbqBlTgDs9 040GJ1lxw90m4aUTCUWKKGe/0P/Xjs7pbq4lI1OaPza/SEOXpk+J7g4Dn6+q8GsPfBY+ fMIt2rz4NX1H+xk96rJrOL21wl7n7unRiXlP89VTabAPbBLyPkR5Uh8CQxcEaIGpiWMf Uump5SaaaMhTyJmlq4ovdxq7gMF5Acce+0MdSJE9uTV5b5PooOkulnJxu4K3Vbkq1JOO NcNg== 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=nk+70u5yJDFejNNUr2VqQfoi05U9CvVtDbHXOtejT7c=; b=JgMzlNwxz7hIJ3JEIn6FzH5pmoX6komSlt9W2yYz5SQwJbWfOka1vSyfQSAyREJm3+ o2w01mUkXD4z/d6uNknmwgnVQYMBwvIVSf2dJia9v0WAxNETHMYlyqyi++2lbjAUxDeW f8Tf97OE8HQqNrP3jduc5epbkE/wYztkCopkhlZh+NFdjmLkZNDLw9kZPwdDC0TdAsuY /1GsIbW1zGyz3qH7E5FqP/qGl2eNAE5na2qlsdCsCM7YPzW1SkWhXkQXzkYKDXXSRarP ivCudw9oDYcHD5hWAgASaZZQAYTPb/akrpq8YxZn/AQikB5fw7M6jQ/almEF9X6+CfQX 37Nw== X-Gm-Message-State: AOAM533YWoCy758fnzGJSUVcGyDDSPspmn7DCXAFUDPjRrz4ceMN8EZ/ FZ0qiOew1hjgsZ+/lL/BRGUDMOzOzyI= X-Google-Smtp-Source: ABdhPJz5XEh6GUwPx7VRXAv4WLg9myweurQonaeFGLZM2yxgfcH+nNZNs55Vm+qNGhO9B5UN6VAFug== X-Received: by 2002:adf:94c6:: with SMTP id 64mr12850534wrr.8.1602580225735; Tue, 13 Oct 2020 02:10:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g83sm25913159wmf.15.2020.10.13.02.10.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 02:10:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 11:10:09 +0200 Message-Id: <20201013091017.1899676-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] avcodec/asvdec: Reduce the size of some VLCs 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/asvdec.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 9a11446f52..a21e4277b3 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -34,7 +34,10 @@ #include "mathops.h" #include "mpeg12data.h" -#define VLC_BITS 6 +#define CCP_VLC_BITS 5 +#define DC_CCP_VLC_BITS 4 +#define AC_CCP_VLC_BITS 6 +#define ASV1_LEVEL_VLC_BITS 4 #define ASV2_LEVEL_VLC_BITS 10 static VLC ccp_vlc; @@ -50,18 +53,18 @@ static av_cold void init_vlcs(ASV1Context *a) if (!done) { done = 1; - INIT_VLC_STATIC(&ccp_vlc, VLC_BITS, 17, + INIT_VLC_STATIC(&ccp_vlc, CCP_VLC_BITS, 17, &ff_asv_ccp_tab[0][1], 2, 1, - &ff_asv_ccp_tab[0][0], 2, 1, 64); - INIT_VLC_STATIC(&dc_ccp_vlc, VLC_BITS, 8, + &ff_asv_ccp_tab[0][0], 2, 1, 32); + INIT_VLC_STATIC(&dc_ccp_vlc, DC_CCP_VLC_BITS, 8, &ff_asv_dc_ccp_tab[0][1], 2, 1, - &ff_asv_dc_ccp_tab[0][0], 2, 1, 64); - INIT_VLC_STATIC(&ac_ccp_vlc, VLC_BITS, 16, + &ff_asv_dc_ccp_tab[0][0], 2, 1, 16); + INIT_VLC_STATIC(&ac_ccp_vlc, AC_CCP_VLC_BITS, 16, &ff_asv_ac_ccp_tab[0][1], 2, 1, &ff_asv_ac_ccp_tab[0][0], 2, 1, 64); - INIT_VLC_STATIC(&level_vlc, VLC_BITS, 7, + INIT_VLC_STATIC(&level_vlc, ASV1_LEVEL_VLC_BITS, 7, &ff_asv_level_tab[0][1], 2, 1, - &ff_asv_level_tab[0][0], 2, 1, 64); + &ff_asv_level_tab[0][0], 2, 1, 16); INIT_VLC_STATIC(&asv2_level_vlc, ASV2_LEVEL_VLC_BITS, 63, &ff_asv2_level_tab[0][1], 2, 1, &ff_asv2_level_tab[0][0], 2, 1, 1024); @@ -76,7 +79,7 @@ static inline int asv2_get_bits(GetBitContext *gb, int n) static inline int asv1_get_level(GetBitContext *gb) { - int code = get_vlc2(gb, level_vlc.table, VLC_BITS, 1); + int code = get_vlc2(gb, level_vlc.table, ASV1_LEVEL_VLC_BITS, 1); if (code == 3) return get_sbits(gb, 8); @@ -101,7 +104,7 @@ static inline int asv1_decode_block(ASV1Context *a, int16_t block[64]) block[0] = 8 * get_bits(&a->gb, 8); for (i = 0; i < 11; i++) { - const int ccp = get_vlc2(&a->gb, ccp_vlc.table, VLC_BITS, 1); + const int ccp = get_vlc2(&a->gb, ccp_vlc.table, CCP_VLC_BITS, 1); if (ccp) { if (ccp == 16) @@ -133,7 +136,7 @@ static inline int asv2_decode_block(ASV1Context *a, int16_t block[64]) block[0] = 8 * asv2_get_bits(&a->gb, 8); - ccp = get_vlc2(&a->gb, dc_ccp_vlc.table, VLC_BITS, 1); + ccp = get_vlc2(&a->gb, dc_ccp_vlc.table, DC_CCP_VLC_BITS, 1); if (ccp) { if (ccp & 4) block[a->scantable.permutated[1]] = (asv2_get_level(&a->gb) * a->intra_matrix[1]) >> 4; @@ -144,7 +147,7 @@ static inline int asv2_decode_block(ASV1Context *a, int16_t block[64]) } for (i = 1; i < count + 1; i++) { - const int ccp = get_vlc2(&a->gb, ac_ccp_vlc.table, VLC_BITS, 1); + const int ccp = get_vlc2(&a->gb, ac_ccp_vlc.table, AC_CCP_VLC_BITS, 1); if (ccp) { if (ccp & 8)