From patchwork Wed Aug 28 12:27:15 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: 14744 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 27D4A448FAF for ; Wed, 28 Aug 2019 15:35:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B756680060; Wed, 28 Aug 2019 15:35:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 472E268AB43 for ; Wed, 28 Aug 2019 15:35:37 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id q12so2307393wrj.12 for ; Wed, 28 Aug 2019 05:35:37 -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=lS0pjolDQhPPxR5PPgNjqUf7I94PGAfpKl7xAjrCvco=; b=QBLA7Wzg9eWPv05gmYaxMm8XfTxbWLj9jmdJ0HAkDc774Nd53MG0tPeNhLGj2StlR9 e52H7S+VxZ/HShKFgNXfPKtfWdyfezM/uvQHiaIztAVHcgsAdof65HcyQiZ6OFLmgs7t NGuYFjxaX0AGvX3UiIYbGZhqNfGcxN3XL7+I5Q4taNXuFybWWir5D6yOqRkacYBEth+3 8svWS3fThB7CCxYvwnGBTEFgdV0u/QFCdeBPKmxVwi1nQd26SHUst9Vwqk/Tiy2u+P+R ZTI7ro4MHlqLfJPcys8MLJVDNUrqtWc59wje/YjDetwXRsTjnuGsCMusWXh8ifkpq4YY I5xw== 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=lS0pjolDQhPPxR5PPgNjqUf7I94PGAfpKl7xAjrCvco=; b=FGW30+GmaFIkdeUxmPHG9q2sCnSwlYjbjeTuzMbMQkt1gJwwhIzL1EnQhqsNhB78kF YKnw/KwUSO1UQZzrFs/I3FNnGh9ebuwn3u7s3E7hbwFij2Y2dmgmvxklXPj7LIk9kVWm sZ2pV2ZmA7vtOQ4PxNh5Yv5ELiy2+HGRx+HwP2jOEc2K/1vLV/ykDGynqsCK72t0dJGn otaxQGOf912PbKrRkL6Zk0QG8TvpHnTUZppByZCIghpS8FIlwFgMZHlSRYtTeBCXEYl1 +Yf6DxEoYoeLjo/OQY8fBPNEiFqv7oVRLFIhyOYIotyS4PShrfNDtv0ne1sJlZiUZUd5 EnEQ== X-Gm-Message-State: APjAAAXtp/AvX/UTcBVHPdTkUdQLTSMxj8qQI2jq1Vc5PlQxn+m6eQmk 8N0w/HYLmnGUWdwsHVXKO7N+P2Mu X-Google-Smtp-Source: APXvYqy93BUeMEwGpdCeq/eMwdXwdf8mGg8rSA7aGaLwESUhcfPkA2yGBchxrT6RtDjY3YVWY+mIvw== X-Received: by 2002:adf:f801:: with SMTP id s1mr4483258wrp.320.1566995301134; Wed, 28 Aug 2019 05:28:21 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:f046:3e76:1fc3:c038]) by smtp.gmail.com with ESMTPSA id a17sm2588958wmm.47.2019.08.28.05.28.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2019 05:28:20 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Aug 2019 15:27:15 +0300 Message-Id: <20190828122723.19640-7-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190828122723.19640-1-velocityra@gmail.com> References: <20190822125635.GD23202@sunshine.barsnick.net> <20190828122723.19640-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v16 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 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 3bf2b3e557..28b8f42edd 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 */