From patchwork Thu Sep 3 22:30:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22081 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 83ADA44B502 for ; Fri, 4 Sep 2020 01:31:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6811D68A9AA; Fri, 4 Sep 2020 01:31:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0197E680867 for ; Fri, 4 Sep 2020 01:30:54 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id o21so4375553wmc.0 for ; Thu, 03 Sep 2020 15:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fhs7EuwlPfRWNV4qS7IPKCJ5w6vML4Hd0ocF+gwqQD8=; b=jtwjx8d5V1nzRgpEX4FpMR/9148x8fEbK1Uga2Ha379GfFVL6aDI992Fa65qBQWGkc 2pbJSXdFCaxVOqF6fBEFNpYiXiaeadd3BrMf9JTIsCnk03tlEJ4HRk0JTkUxL2Dfzrky hdDi5k3/41FFoQJbkqrcLetdl1vTjhjPuJLHPmPxW93EJP4fmsFSGAxlT0i4W+bt3tiS /2+FR7ndWDNpmfXozyPWoD6IehDNmP6l0QE+wt0k6QxEiAlYw81h9W4pV3xNl5lVx1xf +5L9zp3sVFhEqUVpJR9cizH/VzxM7DhbygIR5jfr8KKI2u5uyJB9HpAAid0HuWEJGJXx 1X2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=fhs7EuwlPfRWNV4qS7IPKCJ5w6vML4Hd0ocF+gwqQD8=; b=AJjH2FgypJEyiqGQbxYE7QtMZZHd4KqJwnE6lbG20iR+jYzqvsIlcIP5diWMh27wih 7WZdfe66I7D3ztOIvB322trmSm+WLx8WEt0WGompmcc9EULVDKifngU9Mk4o/OLjU9pH EAsCg1OKWPtjhpikJr8cFAodsnnldlHyBKYDG3aS7mrHRNNrVBdIJSnAB4bvGyMM4/WF iacxqfKHOSrMT9tlPo8Qum/mH43r60ZsgHoDFgwRMPeYjqEDGN/86Fz2P5Z0kI52Y9TL IEDUhplXNpxSkLXAlzfqE40G7l3di3pA8xPbG/a98awv5TX2hyVDijn/7229HjHsyjjF vPgQ== X-Gm-Message-State: AOAM531sFWo7yNhgg9MKqaNJa4JJaoTQvWaozOQIzl0LYLJM/wVQBV8Z r2+PqiO+6P4yYZ6jBU9IcBL+uXdorcbhyQ== X-Google-Smtp-Source: ABdhPJzcdrQQngX0PVXJ4nvglAynvuilgNO3PtzN4aYCdRPbf5ZohJ+FtLVq5KbFpcr2Ti9s5V5RUA== X-Received: by 2002:a1c:7314:: with SMTP id d20mr3479074wmb.164.1599172254220; Thu, 03 Sep 2020 15:30:54 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id o9sm6949052wrw.58.2020.09.03.15.30.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 15:30:53 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 00:30:41 +0200 Message-Id: <20200903223043.30596-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dxtory: unbreak decoding after 6e1a167c556 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" get_unary() takes at minimum only 1 bit. Signed-off-by: Paul B Mahol --- libavcodec/dxtory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index bc19f27951..3cd95afe80 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -395,7 +395,7 @@ static int dx2_decode_slice_5x5(GetBitContext *gb, AVFrame *frame, int stride = frame->linesize[0]; uint8_t *dst = frame->data[0] + stride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { b = decode_sym_565(gb, lru[0], 5); g = decode_sym_565(gb, lru[1], is_565 ? 6 : 5); @@ -462,7 +462,7 @@ static int dx2_decode_slice_rgb(GetBitContext *gb, AVFrame *frame, int stride = frame->linesize[0]; uint8_t *dst = frame->data[0] + stride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { dst[x * 3 + 0] = decode_sym(gb, lru[0]); dst[x * 3 + 1] = decode_sym(gb, lru[1]); @@ -508,7 +508,7 @@ static int dx2_decode_slice_410(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + (ustride >> 2) * line; uint8_t *V = frame->data[2] + (vstride >> 2) * line; - for (y = 0; y < left - 3 && get_bits_left(gb) > 9 * width; y += 4) { + for (y = 0; y < left - 3 && get_bits_left(gb) >= 4 * width; y += 4) { for (x = 0; x < width; x += 4) { for (j = 0; j < 4; j++) for (i = 0; i < 4; i++) @@ -553,7 +553,7 @@ static int dx2_decode_slice_420(GetBitContext *gb, AVFrame *frame, uint8_t *V = frame->data[2] + (vstride >> 1) * line; - for (y = 0; y < left - 1 && get_bits_left(gb) > 6 * width; y += 2) { + for (y = 0; y < left - 1 && get_bits_left(gb) >= 3 * width; y += 2) { for (x = 0; x < width; x += 2) { Y[x + 0 + 0 * ystride] = decode_sym(gb, lru[0]); Y[x + 1 + 0 * ystride] = decode_sym(gb, lru[0]); @@ -597,7 +597,7 @@ static int dx2_decode_slice_444(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + ustride * line; uint8_t *V = frame->data[2] + vstride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { Y[x] = decode_sym(gb, lru[0]); U[x] = decode_sym(gb, lru[1]) ^ 0x80;