From patchwork Mon Oct 12 08:12:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22862 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 38A9544B947 for ; Mon, 12 Oct 2020 11:12:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12AB068BB64; Mon, 12 Oct 2020 11:12:34 +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 0BD7B68BB55 for ; Mon, 12 Oct 2020 11:12:28 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id y12so12679372wrp.6 for ; Mon, 12 Oct 2020 01:12: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:reply-to:mime-version :content-transfer-encoding; bh=1Uq75cNhPsRAlHZY7Fcr9eyepLPlKP4TahlSJhvT4Vg=; b=jiV3bwtdpi7VkhUFAl/1A6lLI6AbHEimsZdR/OqE9N7GAOcVHTZAL0SIxD4i6vXnwm s0GRazhHO2QS1Q0lYOK4VQXf4cSD1+J2a9saN1G2Orlt6bbfmOnBAW+N5Xu6DXroMeOL Wm60Ypa5Rk48ZUNS5aetUavOOEwjact8bOOX8MQBRWXb2tgPOoAj7B9Wc9ysLAgPvETI 5vTkubiwlxm7zz59bhytKyDK8EQnwfr00isB/z8O5CWX0iJ97ViYJfrsOjk4rZVt7uqT JWAJuGr2dEHLkvVZ3453bzWGN6AwIllJqBRAUB9Fh1rbkS6BWZqHNV401WVFVqoAy0gM 3y8A== 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:reply-to :mime-version:content-transfer-encoding; bh=1Uq75cNhPsRAlHZY7Fcr9eyepLPlKP4TahlSJhvT4Vg=; b=m+cu5fO0YK0NhXkmA/d69i+ECEHjq3EDMDdtNor17nxe8kpgZgWskWhnEuQUIKSa+R 2fHwN46DMq39eI/mubiDhEOYgw163tnFd5t+YCxy/HQOqz3LZOMOvlJ2yLxiIBxgOInm Snuym+p335gab1eW5HMOU0jNBty8XtIfGQT+MFWPXGRHsxZAvKEZJ+y6VGWSJ0LTQxyT Wa/e/WYGBS7Z47XqweA5jvw4GkvltecNkMu96+LUIKopdEZWXYxVpea1CwDFWL7GiN1Y TEfDof9A6cAUA3u81qZBgOd64TfitMZfTEq3cQaGm6KJkDji0rcN2rlAsLvw3j/SYhai WJqg== X-Gm-Message-State: AOAM530epb1AFchyrOpXCsPYBITPKjA6Ap1lhjx5DJiRm2uGiQEstFYs 9Nro/lThCSAep6+8A1uPT8HE6y/1AvA= X-Google-Smtp-Source: ABdhPJx8NGaWDBvX682W8krSIN+LIyPqK76g5LYDkL96tyJXVpCKQyJZVIYVaO1sIkG0Zn3BNzKgqQ== X-Received: by 2002:adf:d850:: with SMTP id k16mr28319238wrl.259.1602490347124; Mon, 12 Oct 2020 01:12:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id j7sm2247928wmc.7.2020.10.12.01.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 01:12:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Oct 2020 10:12:11 +0200 Message-Id: <20201012081217.1643833-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/indeo2: Remove #ifdef BITSTREAM_READER_LE cruft 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" Before the LE bitstream reader was used in the Indeo 2 decoder, a standard BE bitstream reader with swapped bits was used; when the LE bitstream reader was added, the old code was only #ifdef'ed away and not removed. Said code has several problems: It modifies the input packet without ensuring that the packet is indeed writable; and it doesn't work since 09c4e5c5988c0037d108c5fc2a137d9ad488f7f4 because said commit removed the BE table used to initialize the VLC table. So just remove this cruft from the actual decoder, too. Also use INIT_LE_VLC_STATIC while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/indeo2.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index ccf6cd84cb..7a568bfbc4 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -174,10 +174,6 @@ static int ir2_decode_frame(AVCodecContext *avctx, s->decode_delta = buf[18]; /* decide whether frame uses deltas or not */ -#ifndef BITSTREAM_READER_LE - for (i = 0; i < buf_size; i++) - buf[i] = ff_reverse[buf[i]]; -#endif if ((ret = init_get_bits8(&s->gb, buf + start, buf_size - start)) < 0) return ret; @@ -232,7 +228,6 @@ static int ir2_decode_frame(AVCodecContext *avctx, static av_cold int ir2_decode_init(AVCodecContext *avctx) { Ir2Context * const ic = avctx->priv_data; - static VLC_TYPE vlc_tables[1 << CODE_VLC_BITS][2]; ic->avctx = avctx; @@ -242,17 +237,9 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx) if (!ic->picture) return AVERROR(ENOMEM); - ir2_vlc.table = vlc_tables; - ir2_vlc.table_allocated = 1 << CODE_VLC_BITS; -#ifdef BITSTREAM_READER_LE - init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES, - &ir2_codes[0][1], 4, 2, - &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE); -#else - init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES, - &ir2_codes[0][1], 4, 2, - &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC); -#endif + INIT_LE_VLC_STATIC(&ir2_vlc, CODE_VLC_BITS, IR2_CODES, + &ir2_codes[0][1], 4, 2, + &ir2_codes[0][0], 4, 2, 1 << CODE_VLC_BITS); return 0; }