From patchwork Fri Sep 4 10:17:04 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: 22085 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 4CA9E44B7F3 for ; Fri, 4 Sep 2020 13:17:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B4EB68AAA0; Fri, 4 Sep 2020 13:17:24 +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 41629680AD6 for ; Fri, 4 Sep 2020 13:17:17 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z9so5569128wmk.1 for ; Fri, 04 Sep 2020 03:17:17 -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=RKKK5N1R95YHufqAj6ydITbtGfFaytQErI3H9ZlcQ6/ZTJQMg60LxwcNUVrO8gmIS0 F+AbE0yw1sdhloP8X8QtDPZtPbKevvJE+IUDgZKbHc3UMz3OlZ5rTgVa/FidwO9SW9aL a3No6iO98orgHjdWOQTTeWErRrTmR3raSAVRvetQkCNZVYUbqWE5bwQGtJphyzaE86Sn CP6m/6MVMvgmTW1CS6jDFniaKrjj4LEe8a+w2ytllULwTDi5hLov/ibOFDwD7dhuFUcO q7zMdjAgg18S+cwCzWupP7Z42pVtvR4ieQNmJBRryL1LegMs6bQ7kdI9mTCt0Wfkpzho M3PQ== 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=EWg/pxY9QyS8ANDW0FeES08TBqyd7Ti+Zv0Ac9f3l8oW/caes09YyMgUyOexvK2FM1 Epc1bZa39lNBxMMfO3tr9mLc01iG6vp2sKafyi8ztH0vy6wKxg/TistuJAhPNfn/Xsy3 73ULrXx5sMDSDLY7hPY3OKUk2Y3ZibaV9fDnbz1iqQjJqYZEUzK3AizNfPPTygibXOX+ z5jRzmmxtoKg8kePX6ZKbj5dAVIxLgQ+tZpNySiRQsy6UhgeiNWzJCKLMec7XdLH8RZK 2y5pmuEn6c/iui8zWZypzmoeuS9N6CTvGJ/1YogV/dNKT/k1E675bV4wllXeAbY15PPE gSmg== X-Gm-Message-State: AOAM532gHHSGEbQOZEb/IPgKoZ25JuxOC+niQ6S9suAGk06zW/wCa6Eq H8VFqLJAesp2dzRtYTUx1GQGJ56d2lG+uQ== X-Google-Smtp-Source: ABdhPJzJSzpi09gSO5y7JQDVflsYptBSOfpfo8+z2Jdbo8YGxEzG9vtPtFlN78YvkFAWizp3j+rEBA== X-Received: by 2002:a1c:1f41:: with SMTP id f62mr7185225wmf.51.1599214636449; Fri, 04 Sep 2020 03:17:16 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id 128sm10095746wmz.43.2020.09.04.03.17.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 03:17:15 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 12:17:04 +0200 Message-Id: <20200904101706.24228-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;