From patchwork Tue Aug 20 13:37:39 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: 14623 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 42092447F6E for ; Tue, 20 Aug 2019 16:45:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A2D368AAF2; Tue, 20 Aug 2019 16:45:37 +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 0935768AAF0 for ; Tue, 20 Aug 2019 16:45:31 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id z1so12456411wru.13 for ; Tue, 20 Aug 2019 06:45:31 -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; bh=199BPM7xfVE/BIgmwEWnke2UEYPayUQQA/KHY+RIKM8=; b=nNjPON7UpNciL24wC5P3bYYo8VadghcGG22zqmrTMr2nK8Nxto/lOHnoJyi83N6r8f tbEidFzHdzKyAyKPCajgbcjzWgdkQDhi41UYFzbUlvrHWWpLGZRj+O0QdRNjUtiFjXfS zoh6kTNmMq+9gM1ims9befjnYffOfBl8RVm5H8NQ/8XAn1bBTjJsGsreOLNvQom4KfiA KUfy/T2OA4R5qNvGS/ZEEoq1sFksNr2qvizCl74JMBc65cQKInCkCDMooAshc7ZUFg19 wO39SgjNvIadqW3Bgu1cm5lmveAYH5Ckj6GL83FXGwzGljC0s2ox2SNMULpXuIjrIMuh Ldyw== 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; bh=199BPM7xfVE/BIgmwEWnke2UEYPayUQQA/KHY+RIKM8=; b=eAHbYTfJO9bdnLFNN0H5TnDWFsQH+KAGIUxf5X7JodeFTkQNZt67C2FsWM7yYcPT4w kDUiohMxwN0F0WkgItXo3Q1xLjCMqDeeM5r/pTi527qH9lEUUiPQeTp5gaM1Em5Mqdfo VYAvuAtNjMFpQQPxUGOy1HBhqLqF/GbGvPbSevvfrdi9EsWpG4qR2H3BQA3sUfGT8Bct 9kVVyO+7kDQq8O1OXstdBDjCPWi6bOL//o9gj1flRiXJynP3G/Ls28Cr/LEJhyNj5EPK 0g/YncaYE01qPf+Y6uWoN6mcCe7ygLS+RJPBKHIJB59Jvq/UxAnscSHgS6srzgCdpzTu I1pQ== X-Gm-Message-State: APjAAAUpPjaqOuSXKtxfJVIweFRza/6XvJDFwICiDODQC8nuTBjNr/dK hicwS7KNFT7xO13pHgwlPFUt6dqV X-Google-Smtp-Source: APXvYqzQ4dVQPV2LohsG7AkIcgSE5I670Msn2EfF9TcdjoeSWLSQEI9D/sDSzP9+0tx14cNF4snRbQ== X-Received: by 2002:a5d:470c:: with SMTP id y12mr34288383wrq.136.1566308305515; Tue, 20 Aug 2019 06:38:25 -0700 (PDT) Received: from localhost.localdomain (ppp-94-66-223-133.home.otenet.gr. [94.66.223.133]) by smtp.gmail.com with ESMTPSA id t14sm11545882wrs.58.2019.08.20.06.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 06:38:24 -0700 (PDT) From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Aug 2019 16:37:39 +0300 Message-Id: <20190820133747.30983-7-velocityra@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820133747.30983-1-velocityra@gmail.com> References: <20190811144542.11704-13-velocityra@gmail.com> <20190820133747.30983-1-velocityra@gmail.com> Subject: [FFmpeg-devel] [PATCH v15 07/15] 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 257230c386..1ca9a59dbf 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 */