From patchwork Fri Oct 23 20:54:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23185 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 3960344B5CA for ; Fri, 23 Oct 2020 23:55:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E3A36899EB; Fri, 23 Oct 2020 23:55:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4ED7689257 for ; Fri, 23 Oct 2020 23:55:07 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id v5so3197541wmh.1 for ; Fri, 23 Oct 2020 13:55:07 -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=xssfbe5HkdReWpDJ4NVcjAl+aG7VQTb9AreLb75/11g=; b=WcL/XFURdVSc4BXqke6trPx4RoEit+hAUHEBxbPYDvnDRxzf5M+eiFpUDzp0URWt6t 35Oio9KIQ69+OyazgCNMDAafLtzpQaqC/cRrSVX22X59nI5fX1DNyLHyAx7hlywFemmx InIvNe2tOIJ2lO4Z6gkjUxnjShZeIiugOrEqX0p4AS9RzT0qpvgTL9/rpYOQ9mi1bRFQ A8nv7aVUDXnHVRQzg53IDycie4yi3S4HNP7lY6W8MpFS/SAGl5ect9C7s11us2L2VWy5 f3PWY7zFXQsjAjjL98eTwn9sdTspAxIfgEAVC0V0ERbDLWyR8IVwaxRsGlEC9OyimY8m yfnw== 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=xssfbe5HkdReWpDJ4NVcjAl+aG7VQTb9AreLb75/11g=; b=i6246AlCRi7cTTJQ/Ktm2Lzx2TNR68MIRq7kNrjQJLVvA41DNkdaoI2ZH5S8FES6AH TprYFPfIhvQM7XjxeWXXc7RLn++7KA00akd0d7f/ViFaQWu4D7kdDgbpgtRYhrR1gp/a UCBIFxiFByFNk+iEWHZcwxHGFikqUYfsp66T8db/WAFdvAJgKcTdTuXFeiN3pJpeOT8K PUUroI241MLmbJhV1hLX4X1dNdgB4jIRptRu4eiucUKsVKtbNPbmWz02c3CWLxm8E5iq 0gupDwIQ9CV1IrG5VsrhRh+w91HkZjPiLaY/lzgxSob7XzRxQdafkR863MgxCiyFWuWf JOGg== X-Gm-Message-State: AOAM530+OJrSo8TIpX8qGqeFYlZgegvQZN6xSiSVXt1DfMZHU76Wkkgj xQ4ldjurwALuzfJLLrU6M3afBr8eJqw= X-Google-Smtp-Source: ABdhPJwjx+fzvIHZVcL2GokLxtyHMBg36yzhTNN/vmKWUftxXgfND+f4w305r7Kbn0eu7q8XTp/nMQ== X-Received: by 2002:a7b:c858:: with SMTP id c24mr4065608wml.176.1603486506781; Fri, 23 Oct 2020 13:55:06 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z6sm5153350wmi.28.2020.10.23.13.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 13:55:05 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 22:54:51 +0200 Message-Id: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/atrac3plus: Perform reusing of VLCs during init 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/atrac3plus.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/atrac3plus.c b/libavcodec/atrac3plus.c index 8d17889582..6b046a887e 100644 --- a/libavcodec/atrac3plus.c +++ b/libavcodec/atrac3plus.c @@ -192,12 +192,12 @@ av_cold void ff_atrac3p_init_vlcs(void) /* build huffman tables for spectrum decoding */ for (i = 0; i < 112; i++) { - if (atrac3p_spectra_tabs[i].cb) + if (atrac3p_spectra_tabs[i].redirect < 0) build_canonical_huff(atrac3p_spectra_tabs[i].cb, atrac3p_spectra_tabs[i].xlat, &tab_offset, &spec_vlc_tabs[i]); - else - spec_vlc_tabs[i].table = 0; + else /* Reuse already initialized VLC table */ + spec_vlc_tabs[i] = spec_vlc_tabs[atrac3p_spectra_tabs[i].redirect]; } /* build huffman tables for gain data decoding */ @@ -880,10 +880,6 @@ static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx, tab_index = (chan->table_type * 8 + codetab) * 7 + wordlen - 1; tab = &atrac3p_spectra_tabs[tab_index]; - /* this allows reusing VLC tables */ - if (tab->redirect >= 0) - tab_index = tab->redirect; - decode_qu_spectra(gb, tab, &spec_vlc_tabs[tab_index], &chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]], num_specs); From patchwork Fri Oct 23 20:54:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23186 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 3FDB044B5CA for ; Fri, 23 Oct 2020 23:55:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20CD168A0C3; Fri, 23 Oct 2020 23:55:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B469680932 for ; Fri, 23 Oct 2020 23:55:26 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id a72so3193367wme.5 for ; Fri, 23 Oct 2020 13:55: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=hbeh8olRGaiDp0xbVCrtAntWzsAOdX+1OV5nl5HPTuw=; b=sSmP/8uBjmXMoo7W8SttuDyMRL1cmdJvzetPDR1pN6FsBW08QNbChwuCWoukH+SR+Z SwlREsu4NnUFggWOG5C5e/hjVIUjz72w58ZbrOF1h/8o7saSW+lAOSY32JaUBqmNsnt6 WikeJztT2b+L6Z/YKUy/6+aSEV74WNZc1veLpw13U/76Gdlk+3nYYDoZ0SVQCeQfndT4 CADcbtqnDgGtSbsPy/aSMNhjO+U77DMkl9fdM9hotte8E9j+Rl/CHp3mlnXb8TINCBOc FK7qIS9BfRuQAjeMtJEJqYc67xr2tdLIDgmintynD3wZTU8mlR0JRfsACiiIM9dfFHti uwKg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=hbeh8olRGaiDp0xbVCrtAntWzsAOdX+1OV5nl5HPTuw=; b=Vesdmo4+b7XMMOUuqvR5B9xOCHJ8ng3fyTAVt2m1eT0W75j5tZ5iEsMBVKEpikOO9H low3YxaIIkoquGtxe/aM1w1C48YXoCnNVQFNlcaxlVKxqwtn46mWTaRC1ZssmbL3mNIu TdyX4TjlXvuC72HDd2UPH2Sy60fIHqi4Dp8OSuDNh9qiED5H+bvIrmly7a1zPzTBwyKb Fi0ng9Imj+yItu/o2iqqCjz78AGdgaJurdxq17f15Ivzuj7HmOOGM4zlBOoKjXfb83w/ 7soKUOsVdKFDhlHYiK80lr5beWfAeTe261kgZYIj1DZMWjFe+vcpilLoq2Vpgs/chNXv zmrg== X-Gm-Message-State: AOAM531M9BhOGGjBcWMBe6L4JLBTF+8DmRiWUzu+ex71/RGB3Z315oUH p6OJFPWem3xxSwhP7ifcSLNIF2ypKpQ= X-Google-Smtp-Source: ABdhPJxmzTwcKJjnRa+kry32onSpkKLn1zF8VoBFt1tD+tbC3XeEGkkBCgStMFEFT8MRySGk5PUWrw== X-Received: by 2002:a1c:7214:: with SMTP id n20mr4093072wmc.93.1603486525261; Fri, 23 Oct 2020 13:55:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z6sm5153350wmi.28.2020.10.23.13.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 13:55:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 22:54:52 +0200 Message-Id: <20201023205454.851696-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> References: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/imc: Inline constants 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/imc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 6766d53643..70ad5b1dbd 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -110,6 +110,7 @@ typedef struct IMCContext { static VLC huffman_vlc[4][4]; +#define IMC_VLC_BITS 9 #define VLC_TABLES_SIZE 9512 static const int vlc_offsets[17] = { @@ -238,7 +239,7 @@ static av_cold int imc_decode_init(AVCodecContext *avctx) for (j = 0; j < 4; j++) { huffman_vlc[i][j].table = &vlc_tables[vlc_offsets[i * 4 + j]]; huffman_vlc[i][j].table_allocated = vlc_offsets[i * 4 + j + 1] - vlc_offsets[i * 4 + j]; - init_vlc(&huffman_vlc[i][j], 9, imc_huffman_sizes[i], + init_vlc(&huffman_vlc[i][j], IMC_VLC_BITS, imc_huffman_sizes[i], imc_huffman_lens[i][j], 1, 1, imc_huffman_bits[i][j], 2, 2, INIT_VLC_USE_NEW_STATIC); } @@ -348,7 +349,7 @@ static void imc_read_level_coeffs(IMCContext *q, int stream_format_code, levlCoeffs[0] = get_bits(&q->gb, 7); for (i = start; i < BANDS; i++) { levlCoeffs[i] = get_vlc2(&q->gb, hufftab[cb_sel[i]]->table, - hufftab[cb_sel[i]]->bits, 2); + IMC_VLC_BITS, 2); if (levlCoeffs[i] == 17) levlCoeffs[i] += get_bits(&q->gb, 4); } From patchwork Fri Oct 23 20:54:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23187 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 5F12F44B5CA for ; Fri, 23 Oct 2020 23:55:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B1C968A3EE; Fri, 23 Oct 2020 23:55:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECA49689A91 for ; Fri, 23 Oct 2020 23:55:26 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id c16so3526745wmd.2 for ; Fri, 23 Oct 2020 13:55: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=AbhKhOdlcDD5vAKMntBa53JiD6uICIsnR2w0RlcT+34=; b=YxVaey1cp5bCniXNTcUs9bTn9lZpCsPwLxVhPh+lTlk1OAJI4q6/BUxZQECYSHp5Pu 0FJtbaDcTOMKNHRkPR7YDgVvI1jC3gpACMscMkvt/Fi5lVD6yDohaMd2IpMD2CO4t9T1 +nGra9+ORzCjY1xoyxTqJ39de8Ov79HZZm/B8Q22bNdtzG9HLXFTyzVbTBwgiZxbZ1Xo m3b4lb9PD7b1ZV/9N2bbgvTkk8WLFdQtbzd/UayJw5kOoj4+9PTfLm7eWJC26w0QzjEx WIfjtPj+w00TZJzUyQcFi52ufkMYBUO4wK0OECDSmiL+hYTzW9TMQ4YZ+gwAiqWLuFhd EBXA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AbhKhOdlcDD5vAKMntBa53JiD6uICIsnR2w0RlcT+34=; b=hLGXsZHcyJflXJM2vlysDinXVkOkqg9xHbMEEGQKIY5cnBdKly3JfaVXbb4Iy3nIrO Tb1/Yp46BvwCkX0D5dCDKVGRl8QmUrbGW8FTXJ2ipljr8cLJhplYgE9khBBigZ9hJc/s 7L4IDnm3sHntrAfcCrewdnCBIIXQO6AtaSwr1HZFhJvxraWYFhGY+VXy3Tx/l/W6nQ2I t1mI5gc27V/GeKkE8TgOEG54AIlexSGS1y7ghrltKCICxv1A1wLrPuuhTVeUAZ/IAHyb tKJtpLOr3BYhOgarCX2tqKvE9oonBZpshT315pQl6BVBBX6ZSuWJaUsB6BLpQwgBGYYK qYBA== X-Gm-Message-State: AOAM532zbOkN54RQYAG0v1Jm8TUCyx7Wp8t4wwtjVyskC4tTWw2YRjSJ Z2rxCJMC0BYqCnMDkOJ/OZE2NPtMVug= X-Google-Smtp-Source: ABdhPJyTx0C7THSyHPU5tsRER5xz0M/edcuOIOnfYSy0pYQvFoXFTutNwPvBw5VY5mvy2IX5FMCdGA== X-Received: by 2002:a05:600c:2115:: with SMTP id u21mr3921522wml.2.1603486526179; Fri, 23 Oct 2020 13:55:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z6sm5153350wmi.28.2020.10.23.13.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 13:55:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 22:54:53 +0200 Message-Id: <20201023205454.851696-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> References: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpeg4videodec: Use smallest max_depth in get_vlc2() 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" The longest code here is 12 bits long and can be read in two attempts. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 95a0e63a29..c26ad616b8 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -203,14 +203,14 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g int length; int x = 0, y = 0; - length = get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3); + length = get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 2); if (length > 0) x = get_xbits(gb, length); if (!(ctx->divx_version == 500 && ctx->divx_build == 413)) check_marker(s->avctx, gb, "before sprite_trajectory"); - length = get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3); + length = get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 2); if (length > 0) y = get_xbits(gb, length); From patchwork Fri Oct 23 20:54:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23188 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 5EDEA441C30 for ; Fri, 23 Oct 2020 23:55:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46E2E68A2B6; Fri, 23 Oct 2020 23:55:36 +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 1147E687F40 for ; Fri, 23 Oct 2020 23:55:28 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id n6so3738203wrm.13 for ; Fri, 23 Oct 2020 13:55:28 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=gvOokysJKLDy8f+7MJJvmRz1uq5EENmc1KlmGUVVPEg=; b=COw6ToPC51sK/S12xLuvNSfvnvDDlErI+KL45rqLssTiaX8HL6J+5aK20Rl32o/xs8 Bwy5rQVDUCWLfAOMXluzWJhv+bv3+OMhBb53u8ezYdG4qnmDtPDOcWRtGzJWjwjZWM9W Wlhe3hH/AdEQvJnIZPK5VqxEWrdO1POqCvB7IBwWRi9giTKX75CNOx1+UK3otBieK2lq D3Y486Rt9B0/aS84m7LTAgTqlUcE8ACTxJcs6sa4vbg48IgKdBV1g0EcfdeoIEEAotnU msh32gMO+knyRqOvAAWLTPZ8FWPZnRz0gCuNpjPbarFOQa4/X1MlE6kehyCFZ5L9KBmA 1osQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gvOokysJKLDy8f+7MJJvmRz1uq5EENmc1KlmGUVVPEg=; b=Ns6a+EBDPK+t4mLQWyn4xPOHU4qXVkAD1lUse+7gTc8/Bcwf6CbOVpQ0mIBZZ5lQSi g/TNJeqWOSoRB+WmiXv0o3V+9qrpLuV5kQZ5QKNMSEr+xcmys+Xz88X01kM/Ld+jcNa4 l41wH72nxXZlF1IoTz1C4PL0QOEOFq29C63E6F208wY3q6usNQ/7i8GRElHz7pVn+zQV eSP6ADBaGfl/AeSivmQpfBRSOyt5Ny0KXbZcMlYz4RLwFEx2Aj9/VduNr31DFbtmPwm/ njgVRDnM9gK1Q1DnIGR3rvG1+s/rNaiHh2bmYxTqxp//7HOO0wOeNxNf5ft7O8EDoEWF QtFg== X-Gm-Message-State: AOAM533zPELnKVcv45NjjkoJySHvCSoWu1v+q2ZBzQbtyFiIhgf6MvXw kpfbIGD8Qk+qu7WIGLPaxvqoyQC9hwk= X-Google-Smtp-Source: ABdhPJzEpTpAXuxaxvk80Fk+MEe9xwXzkx7jeoMZ9QtQ1YWIaGzOCkoZDFBjet+3nXqou5lWANgAEA== X-Received: by 2002:a5d:6591:: with SMTP id q17mr4445214wru.173.1603486527191; Fri, 23 Oct 2020 13:55:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z6sm5153350wmi.28.2020.10.23.13.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 13:55:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 22:54:54 +0200 Message-Id: <20201023205454.851696-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> References: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mpeg4videodec: Don't check for errors for complete 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/mpeg4videodec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index c26ad616b8..ff5c6acf67 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1845,10 +1845,7 @@ static int mpeg4_decode_studio_block(MpegEncContext *s, int32_t block[64], int n quant_matrix = s->chroma_intra_matrix; } - if (dct_dc_size < 0) { - av_log(s->avctx, AV_LOG_ERROR, "illegal dct_dc_size vlc\n"); - return AVERROR_INVALIDDATA; - } else if (dct_dc_size == 0) { + if (dct_dc_size == 0) { dct_diff = 0; } else { dct_diff = get_xbits(&s->gb, dct_dc_size);