From patchwork Wed Aug 7 15:27:16 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: 14300 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 6A226448872 for ; Wed, 7 Aug 2019 18:46:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FD2868AB51; Wed, 7 Aug 2019 18:46:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81E3A68A9DA for ; Wed, 7 Aug 2019 18:46:27 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id z1so91870474wru.13 for ; Wed, 07 Aug 2019 08:46:27 -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=TRTi/Ol1XRolGu2Od2/BqKqCPRchzQ/tnxDJuDVNjUs=; b=g6RqrGZvhqCt6JpWWZJZNheCvl6e/iTBZf//lGNIXOcpr9gSIHN6bfr8DFRUblYElj MxaNlXUkTo/g5yRAy7588NZ3seTCAZ4Oes+nWWIP4WWwkZJqVBfRaxyIHe0DeWR21x80 QrdKcbOCnpoX7EOeWxiKPnuxBKvRhNDp8uy5iC7yKgBcvQ5d+3ZZNMfNn65xZ0+kHdlM M+Z34u8NNcw9z35PRBzWxBZ50SnAu+RMscyBbviqxqYtOiiDu5b2+3ut+bNLsHQ2yTua 35oxoignW8H5OOQ6KvIY0GIFvpUT3xJwGVpeOGKG/AnKyMHIxqFY3BmRCBXRmELKtRkn UBKA== 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=TRTi/Ol1XRolGu2Od2/BqKqCPRchzQ/tnxDJuDVNjUs=; b=ZTK4Kuci6zFk48T5i9FmiKF4YLVzBiZI4YHY+TmxkioCDnKeudY4qjQba64SgPa+xK k3P9PtZoclj4iwaq0UhJQtHi5S+Ld4deLr+s1i8OmpLUE7c5pzTc2C+S6mrm0RWkkjMu e9W7n9y4G5nTj8Lt+pBkGCyPM286WGnBMXMQ0w09n5/AdZgiy25YEjq8T0Adwh5nqNG0 BS1TinBVoppiakziGLrcYZXdmpXz9blCgCo5awvYr75f0hKmFKYDNJEQeRU5wvuFXklj PaWYzf8usRYPTJ/y7LuzyvRoYHblB7BQBwuAie5IqQIEYlT5LgMcmG5W/x+/3LtLCdgC m+HA== X-Gm-Message-State: APjAAAVWvSc8LlkPxPXjiN54q0V4ORMTBTlWZKzfahGSZzqvSocXda0P c30wzgXaWnPe1uLs9Pru1FtnE28l X-Google-Smtp-Source: APXvYqwhLMpygXYjvGCf9cO1YNGgGo2nd90XXoT/X4T4e/p4IjZJ9rnSg+fFsp6IRi4stoWXtpmVHQ== X-Received: by 2002:adf:aac8:: with SMTP id i8mr12329206wrc.56.1565192311346; Wed, 07 Aug 2019 08:38:31 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:b577:c48f:5aea:bab0]) by smtp.gmail.com with ESMTPSA id 4sm212050375wro.78.2019.08.07.08.38.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Aug 2019 08:38:30 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2019 18:27:16 +0300 Message-Id: <20190807152723.18892-6-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190807152723.18892-1-velocityra@gmail.com> References: <20190807152723.18892-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 06/13] 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 b6f626daca..f577639dfa 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -884,10 +884,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; @@ -897,12 +901,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;