From patchwork Sat Sep 26 10:27:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22621 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 8BB6B44AF23 for ; Sat, 26 Sep 2020 13:36:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68DFD68B825; Sat, 26 Sep 2020 13:36:29 +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 3247668B765 for ; Sat, 26 Sep 2020 13:36:23 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id k15so6591058wrn.10 for ; Sat, 26 Sep 2020 03:36:23 -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=HOAMOCocwFGbsW4hHsu6G3Vw3nEnkHBoTejpdtmziDg=; b=CGgGZQZP80lTk80B9lctVhaHj7sTRvKNzJtoVWPquQeJ8EmPqLieRrcyj7IHtABcyS eFLCYLXxrGBaamaIRZmUkmlwV/TVJY3FsMhxJd0W7wYULiSw3KBX5CeEmMANfbUz4UUt gwvYSicYQHWDv3BFSBzLh7Q/SnlcmQjViR16cdfT76Fad3sCkxG7Z0O05UKWRSnt3hCl lHt9ZAF76x+tdhHzpoTOke6jRcvYalotXNdqxD9mFedoALzyETHSJh00aBVJiJPW/e0a f330746VwD8ondJWz354X7j5c4GyGg5Z0PYr0acsJFFsFf641rwUMqrq6fZv71I90qtA hsHw== 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=HOAMOCocwFGbsW4hHsu6G3Vw3nEnkHBoTejpdtmziDg=; b=iglk6gVB+/RkY6QfdyTg8GeZeFENmtMpOtZa+e3PZ+oFMjloxBYjEVf3siWkWxyHb9 gejh6s1DAJzkBC4ROZLBTzhLaHUN06rFlRSBwtznCe33pKHpehWrP/Vbm5AcWiZaNh9b jRKGYtGkIa4vq5pRIyMPz7p83wne5bUAUN65LLykmWSo7uxrteXO05AlkTqDkQn6k+7s yilOAG/z3bHgQU8atG0TfmDhJ+f5roeBKM4hvLl1aravOdb4e8OE1moyQz1DVQllPeZ0 Q2Eu0cLj3VI6SzgblBKWxXlG2Lla7BQHrEv1KQHsOCcTWtrudAbsyiLGOCzPu3b+nI2c HnuA== X-Gm-Message-State: AOAM531ZJi3Jts0b3Tv3gbrK0Pu3TlsaeRhpcMgy9rrGzL4fvlcuyeuV /79Im939l20fRzgS+ZnUC+/R37WTuFg= X-Google-Smtp-Source: ABdhPJyDRIb3Y/eIn7IPONK2X77pPBWwO9LVMHOCnWq/R1JYutviZBXPVU62OOc+nYkD+azZFnUBnw== X-Received: by 2002:adf:c5c3:: with SMTP id v3mr9214567wrg.205.1601116093109; Sat, 26 Sep 2020 03:28:13 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k8sm6064867wrl.42.2020.09.26.03.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 03:28:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Sep 2020 12:27:40 +0200 Message-Id: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/25] avcodec/photocd: Simplify parsing Huffman tables a bit 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/photocd.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c index 057c9d33d4..8fd4536a65 100644 --- a/libavcodec/photocd.c +++ b/libavcodec/photocd.c @@ -245,21 +245,20 @@ static av_noinline int decode_huff(AVCodecContext *avctx, AVFrame *frame, int x2, idx; for (; get_bits_left(&g) > 0;) { - if ((show_bits(&g, 24) & 0xfff000) == 0xfff000) + if (show_bits(&g, 12) == 0xfff) break; skip_bits(&g, 8); } - shiftreg = show_bits_long(&g, 32) & 0xffffff00; - while (shiftreg != 0xfffffe00) { + shiftreg = show_bits(&g, 24); + while (shiftreg != 0xfffffe) { if (get_bits_left(&g) <= 0) return AVERROR_INVALIDDATA; skip_bits(&g, 1); - shiftreg = show_bits_long(&g, 32) & 0xffffff00; + shiftreg = show_bits(&g, 24); } - skip_bits(&g, 16); - y = show_bits_long(&g, 23) & 0x1fff; - skip_bits(&g, 8); + skip_bits(&g, 24); + y = show_bits(&g, 15) & 0x1fff; if (y >= height) break; type = get_bits(&g, 2);