From patchwork Fri Aug 9 16:29:52 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: 14357 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 8810144A01D for ; Fri, 9 Aug 2019 19:31:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 777EC68ABB3; Fri, 9 Aug 2019 19:31:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80FEF68AB6F for ; Fri, 9 Aug 2019 19:31:32 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id z1so98802672wru.13 for ; Fri, 09 Aug 2019 09:31: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=UQXXnChzFnahtfbLB45PvYt/JC/vBH7Tkayn8bnrOgc=; b=l/SJj+Xs/6sVMeMcIpNooqPKDQ93i/NZ4McvNvmszXwU8/nmbj63fXrd3TP8VeelEZ 7Mm8Ou+fPciUfxoNHIwhcEXEcTXuv7sbP8nkU/3e928YynX89nRSoUFjekR+8EqUVRp4 8MkfepPno7YqGcRbtc8MUK+K82NkQPTDf6axpw2l6TzJhW0UQGdN4JUyrGr2xXsUDBnj UBo+8P7pwrcKBTZl25elcbqBECrZ6MiWqPuNnRCJ+grdUhHuYOkiHUvQqbO3LKHStxg1 pBZ9+1tVw/lv075m3A9bARbxli7jyEuw5AfQlNesaCJM72JswTHvBNEB+S0WK2DcXqTI /Z/g== 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=UQXXnChzFnahtfbLB45PvYt/JC/vBH7Tkayn8bnrOgc=; b=kJzq05t+fYcPIi84JZvP24vFZPAJ3tmlH8BsdGHJbw5HL1zOq1zQYB6SFuXz/VbQw8 B5V8etNfrTgd7TOEcDEjfo9xkvpsiM/IM2jW1rkEFjucZkZ91cRO1U3RYLqOlajHeP9X 8Rww0JEY/1OcJImLNNUbduLmBXSWfrm8D2momuve9K2dyc6ebtO+wCSAcQOYEm3aB3Ud k2f7Tl8C3QpaioTi6r8Out+WEVUD0S83dgFQRlQRdnEaXzAgw8veHfZsR4CAcqwYsUF4 z3H3k/L+WJH6sU/4Nrjmn5QHKkNsYlk7KXio0Pl8vUHngGPTYKPYrmFOWUVW0+mXGsTb fYKw== X-Gm-Message-State: APjAAAWxYVLQUTuWdiMsxT7glhmrehN7cBVCjFr8nfy3f6DZyxN1BIz8 K2KhJEJfkqNsmJ/WZ8k/rhWOV2IT+Sg= X-Google-Smtp-Source: APXvYqzRNmRJeV+KIXuWzDvtr08OguiKYzP1bfoPhv40tFEX7KkL+7NfF1vGKr5mxnIkwoZSKyqwDQ== X-Received: by 2002:adf:e912:: with SMTP id f18mr4464108wrm.46.1565368291752; Fri, 09 Aug 2019 09:31:31 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:e9b3:b00d:2017:357c]) by smtp.gmail.com with ESMTPSA id u6sm6721745wml.9.2019.08.09.09.31.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:31 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:52 +0300 Message-Id: <20190809162959.17924-7-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190809162959.17924-1-velocityra@gmail.com> References: <20190808205233.16368-14-velocityra@gmail.com> <20190809162959.17924-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 07/14] lavc/tiff: Don't apply strips-related logic to tiled images 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 Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 37fda15162..174ca168c6 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1780,7 +1780,7 @@ again: } } - if (!s->strippos && !s->stripoff) { + if (!s->is_tiled && !s->strippos && !s->stripoff) { av_log(avctx, AV_LOG_ERROR, "Image data is missing\n"); return AVERROR_INVALIDDATA; } @@ -1788,27 +1788,29 @@ again: if ((ret = init_image(s, &frame)) < 0) return ret; - if (s->strips == 1 && !s->stripsize) { - av_log(avctx, AV_LOG_WARNING, "Image data size missing\n"); - s->stripsize = avpkt->size - s->stripoff; - } + if (!s->is_tiled) { + if (s->strips == 1 && !s->stripsize) { + av_log(avctx, AV_LOG_WARNING, "Image data size missing\n"); + s->stripsize = avpkt->size - s->stripoff; + } - if (s->stripsizesoff) { - if (s->stripsizesoff >= (unsigned)avpkt->size) - return AVERROR_INVALIDDATA; - bytestream2_init(&stripsizes, avpkt->data + s->stripsizesoff, - avpkt->size - s->stripsizesoff); - } - if (s->strippos) { - if (s->strippos >= (unsigned)avpkt->size) - return AVERROR_INVALIDDATA; - bytestream2_init(&stripdata, avpkt->data + s->strippos, - avpkt->size - s->strippos); - } + if (s->stripsizesoff) { + if (s->stripsizesoff >= (unsigned)avpkt->size) + return AVERROR_INVALIDDATA; + bytestream2_init(&stripsizes, avpkt->data + s->stripsizesoff, + avpkt->size - s->stripsizesoff); + } + if (s->strippos) { + if (s->strippos >= (unsigned)avpkt->size) + return AVERROR_INVALIDDATA; + bytestream2_init(&stripdata, avpkt->data + s->strippos, + avpkt->size - s->strippos); + } - if (s->rps <= 0 || s->rps % s->subsampling[1]) { - av_log(avctx, AV_LOG_ERROR, "rps %d invalid\n", s->rps); - return AVERROR_INVALIDDATA; + if (s->rps <= 0 || s->rps % s->subsampling[1]) { + av_log(avctx, AV_LOG_ERROR, "rps %d invalid\n", s->rps); + return AVERROR_INVALIDDATA; + } } /* Handle DNG images with JPEG-compressed tiles */