From patchwork Sun Aug 11 14:45:34 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: 14413 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 63B65448588 for ; Sun, 11 Aug 2019 17:46:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4811168AC23; Sun, 11 Aug 2019 17:46:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2133168ABF9 for ; Sun, 11 Aug 2019 17:46:32 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id 31so102483431wrm.1 for ; Sun, 11 Aug 2019 07:46:32 -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=Vceb1sAhyVcUWDd8w2BU7qlPW+lxMBsMvBLbZHPUYtE=; b=nLjsQmw9urOEq5S2iqSm47P+S/HdJjdxTRl/nn2H8OOs6R23Ims37y0dhZ0vW7tQXe oAI+VRYLkIoMjEvY+nlLpZMb+kpbCU9PB9fX35xeN7z6BahVAQoeVeVTzNaCQi58/RcV WVOkBZ2NCfYS7sv2VGjYH3KZouQBYU3Xr7RhgfxxgIpM18s4gJy1/7qieSfjMOacnDAT pNamuaeW2w3Lz43+/UmlpeaUE+tSMXU19RzwfwYWAvDX5K0nR2YQExDkE3iCcnbfK50r PNf0llAwqW1WePxouB9t8thxLTvZQYHmxaoqx5ZZLzSWEUgWrxHTBp/OgOtm36OdmXIf WHaw== 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=Vceb1sAhyVcUWDd8w2BU7qlPW+lxMBsMvBLbZHPUYtE=; b=k5EGulnEODjIFL2LfAzceLhqO6mdxleKVchxRprX5G31qoox+e7R01tO8Je9ohv9EB Jmws7pIYwY5Db9NXSmwp/8QSm7bG4Wl+yu+M9k9mtpDvHrHakw4Ft7Zup6KjoG5jLx+o T5If+Woy/TxJB79pW0D2fiwb5f3ESD98y2uo+TKjW5W2B+0gyptZ5ZrdxXu6xRdtnlf9 uFufkq/88LHExmDRy1F1N4A0UQfkA2STenFp7tZZg/fjQiFv0QtsKGQS5Q40zBHJcqaF SqJ66FKJhy+4JnTpoc5bcGoWX1c2tT9MMK5Wm/lukSSwYxtOGzWp+ZjzqbOMzSmCyedw zQOw== X-Gm-Message-State: APjAAAVVZWXuDGX5JA4XDvlSC3wjbX5jtHhA7tEHU7ZvGxTtdeiyUd6F 9/HDzf1ksmXwJLCHzCEUAhNOaWbKriE= X-Google-Smtp-Source: APXvYqyiKvv2rItEq8wnBbUXfX6QkEaq2mBv2LAcgHrBAa4gvX9eWRoiJaNQO3V2CjeOZLoV83dTww== X-Received: by 2002:a5d:50cb:: with SMTP id f11mr13865652wrt.277.1565534791358; Sun, 11 Aug 2019 07:46:31 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:94bc:d60f:d153:ccb1]) by smtp.gmail.com with ESMTPSA id f10sm8376360wrm.31.2019.08.11.07.46.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 07:46:30 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 17:45:34 +0300 Message-Id: <20190811144542.11704-6-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190811144542.11704-1-velocityra@gmail.com> References: <20190811073641.GZ3219@michaelspb> <20190811144542.11704-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 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 040e83ba7c..14928ed3d5 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;