From patchwork Sat Aug 10 22:19:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: velocityra@gmail.com X-Patchwork-Id: 14395 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 15584448F16 for ; Sun, 11 Aug 2019 01:20:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2FC268ABDD; Sun, 11 Aug 2019 01:20:19 +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 26F8B68ABBF for ; Sun, 11 Aug 2019 01:20:13 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id n9so101503428wru.0 for ; Sat, 10 Aug 2019 15:20:13 -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=UJPb3AAjz6L9+J7IdFgkvRqGSYh+RGWaxML2wbIvqw0=; b=u72iUm/Mq6UW2XP1pykh0gFhcmKvnhr28yANiF8bPWE+jMnbr8GsGEwXAYCQ4fbXY4 EgZG7SjSGZDohomG3XkFqyJHK0RwvFXUv1h1G4YZaqsMBi44utJeZEWd3/SZJUfKbzHk aRL06MPCMg0+UMvGW2G5LFg76rKu3RYbS+lpcGJlYKVS9RDu7ZOohzkzEjSj4Pkyt5Hs BUWeIw6zYe6HZ8Gf/5UcI0POHvdeP1YWEeiVO46oTBLBqK4K1VeVIpZEi/ADVasnRYtg eKsDbOMB+mwZfdx30w8vrrPJPdKwBwsTrBGtmZIp0liSX+j5vR2gEDIdAb9BQCLn3ZCY +X8w== 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=UJPb3AAjz6L9+J7IdFgkvRqGSYh+RGWaxML2wbIvqw0=; b=Snm+LLROhrbEFjtWOaVkjWrxtBeFsJA7zJ9ftQ0YiXmiPSTc+//0sboBxe2TaoruYN n4BtDYx4CVCtTQAI0NbbkRY2H3RMsomieq5bbXOgDFuzG2OBVnoiGp9NejyywEpZRSo7 wVUqc5xusT3REKPzefzN9K5sVhsDbq/dHXhHM4wWNwYgLgHX5nHxXQkwIG4HSvsRi2/3 M4lhpNnxTPtBTwh42uYJYCjbj26uPBeBUCzQ/cTiqE6ubSdEnvVGv4VBEZbkbfgu5Eeh Os3OdEd7r0pkJB6oAHonAJ5+QPznPvlnhMP585W8fJG6Zwhb1QvYiggSQcuTGROBd704 xoSg== X-Gm-Message-State: APjAAAVRIO38a2A5p7nwQ0ko3JRZN98+rmbEJNW0i80WWLT5ly8LMkSC TFX+lZ/2yQFarCuFLiHWomRtC5I8ldI= X-Google-Smtp-Source: APXvYqwoH5HZkWGXevkOnPfm3+4a27Wx4lBtpWD/NPCwjBh3IHk5LRcxR1EaS7WKTbqF/mG4ygMXDQ== X-Received: by 2002:a05:6000:14b:: with SMTP id r11mr32274034wrx.196.1565475612467; Sat, 10 Aug 2019 15:20:12 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:5c0b:c2fa:5389:82dd]) by smtp.gmail.com with ESMTPSA id q20sm40403233wrc.79.2019.08.10.15.20.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:12 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:26 +0300 Message-Id: <20190810221934.44996-6-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190810221934.44996-1-velocityra@gmail.com> References: <20190810221934.44996-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 06/14] lavc/tiff: Fix edge case with full-length/width tiles 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: Nick Renieris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris In an image [1], the height was equal to the tile length (full-height tile) and after `height % tile_length` was applied to them with the current code, it resulted in the operating tile_length to be 0. This commit makes this leftover logic only applies if it's necessary. Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 4620508d53..37fda15162 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -887,10 +887,14 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame) int tile_byte_count_offset, tile_byte_count; int tile_count_x, tile_count_y; int tile_width, tile_length; + int has_width_leftover, has_height_leftover; int tile_x = 0, tile_y = 0; int pos_x = 0, pos_y = 0; int ret; + has_width_leftover = (s->width % s->tile_width != 0); + has_height_leftover = (s->height % s->tile_length != 0); + /* Calculate tile counts (round up) */ tile_count_x = (s->width + s->tile_width - 1) / s->tile_width; tile_count_y = (s->height + s->tile_length - 1) / s->tile_length; @@ -900,12 +904,12 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame) tile_x = tile_idx % tile_count_x; tile_y = tile_idx / tile_count_x; - if (tile_x == tile_count_x - 1) // If on the right edge + if (has_width_leftover && tile_x == tile_count_x - 1) // If on the right-most tile tile_width = s->width % s->tile_width; else tile_width = s->tile_width; - if (tile_y == tile_count_y - 1) // If on the bottom edge + if (has_height_leftover && tile_y == tile_count_y - 1) // If on the bottom-most tile tile_length = s->height % s->tile_length; else tile_length = s->tile_length;