From patchwork Thu Aug 29 13:10:45 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: 14786 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 864E644A068 for ; Thu, 29 Aug 2019 16:12:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D9D3687F3B; Thu, 29 Aug 2019 16:12:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C780F687F25 for ; Thu, 29 Aug 2019 16:12:18 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id s18so3412170wrn.1 for ; Thu, 29 Aug 2019 06:12:18 -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=/BQHcPF480yjhYt8fCv+7d0HcHe/pbqJ/obzTQCngBU=; b=nvX21NGkUdroLLXzGJDN+ta7kwy792UwD6/RhRwW0dyh1gq/LARZSMW5NDuQj2U8L8 nQdIBwlepOaE9fd5YXIhZ9YuZPIq6GnDNQpwvxGJfh20fX2BDQSHL3JfzRqmkqvNED31 FbW/GYSqATCyC7X/01U4MYKPsiuFmiXW5oOZ0XZR2HL6XmQwd1HnbLSpXV0cHS7RBHez eo/6aDr6d1Lf6C5BF1BrlOWlO7QSHS4UuJsdmpUxvdRKp1LDc+oq2FVGVVud/KtuFnl2 xtT2HdhqKhCFgnXiNfBhq+3ai/u3N+4bNiSqXPJIwzyLjkImihSgl79Rw9nNMvMSjwPG nUkA== 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=/BQHcPF480yjhYt8fCv+7d0HcHe/pbqJ/obzTQCngBU=; b=bxOoBseWqz9WKQ0meHsjXcKRp/1CjQ6fhU5YkSbBl5m7zyqM74gj2igw1oj3+HXBcK uEp0P2+b1Y6LSTqDKlXDHhIZqEvjNvkuxf9UH6xu4gLutimEjD6k4DQbXkT0MYcslOjN o9ImnzPuiHVf8j+jw/7U6VzGdpMtMdrDB24YfdWStMJeGBkrcGr/MNNTgqIeCHpCbRoS STqfn6xtDCORZDhLo8o3CluAHb1oYTdPzn5rCr3fpmbaxoEfOM7e99hWlpY6Y8lVtbjh QpqmwUzOYFcPLSGj0DIoKBSDrRhemerGDcQnPkH4C5nZ7BRfaPID+sIcwk9CqmTyBKDy 2tUw== X-Gm-Message-State: APjAAAV9jLd1M9bsw+kSxM6zfQxPxNMQgnDQDbj7ppv3gb6tbO7cNgNJ dvaqgvwzq/BnYrL0R7dXb5f7igPO X-Google-Smtp-Source: APXvYqw5LAfPAb/vU37irsLFBG0UFm4uFzk6tGf1geJOlAkGsO+8aWUsNxHgxbvhPecuDI6iZOaKqA== X-Received: by 2002:a5d:5444:: with SMTP id w4mr86550wrv.180.1567084338110; Thu, 29 Aug 2019 06:12:18 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:4ca1:2ce9:2e6c:c246]) by smtp.gmail.com with ESMTPSA id m17sm1676644wrs.9.2019.08.29.06.12.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 06:12:17 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Aug 2019 16:10:45 +0300 Message-Id: <20190829131054.16404-6-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190829131054.16404-1-velocityra@gmail.com> References: <20190829131054.16404-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v17 06/15] 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 When the height is equal to the tile length (full-height tile) after `height % tile_length` is applied with the current code, it results 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 78b4bd5301..3bf2b3e557 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;