From patchwork Wed Aug 7 15:27:17 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: 14292 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 1E0DB448560 for ; Wed, 7 Aug 2019 18:44:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07B6E68AAF6; Wed, 7 Aug 2019 18:44:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6799E68A9DA for ; Wed, 7 Aug 2019 18:44:11 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id r1so91821988wrl.7 for ; Wed, 07 Aug 2019 08:44:11 -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=51Cjf/x059PZqHm4idgeWd1F16lLuRKuS/ONKolV6aU=; b=rnOv4cRjhjHu+5TD1DubdZmY2f4Eo7bYGr3WiUIHKcAzpWvPYxYNa9i3hP4bzpaoat 8mvsbjnaNgxcBk807/Bq5qf9Vybs7mxtvrse2DnVPDEA3CVo9FSrcCXcG4V2HgBkCPtK TycIyRJVlIRw230PYzj1wK9VV6YZJ6FWab918Pt0JSCbFWk9LNBomQPYKEosiEE5Aacy t2CtFEtd16HoAuFn5+CubrTz5ANlhFT4kVZb+kaj/Q6S5gUbz43BaKEa4Sexu76r31eY 63QX6cgnNwB9CNKkUciR2saNo3SMKczxttYWL4FHdWqfTxKrO3QvujjoVHb7c3cQhVgq nFHw== 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=51Cjf/x059PZqHm4idgeWd1F16lLuRKuS/ONKolV6aU=; b=oWEFYlHaH9xjOiiGD/wNllJnla1/bxhAQj0mJZ2DR90iySFZPTxKD1GhDW4B5i0cTO Va1+cbpBOwUB2xqc2W+nqS/xGfw4Sogf2DZh+nsrl/fTPNb7JrWBzI5l719dQ+paHa2+ 5hWIJq/H2hTg4ZwWKzs4JowLubcRp6WRHVsI0YvMXyySdwtpVPfNNWlw3mxTOo9jDxXv z5Qwahay2rz4JFU9Q8+4vwVxF+kAaMkcKfEHwhXIL7zqDrJCMrK3FnOLWiSzNUjsgNzG x+SyPPIGD/Ahnh+Y//mm9/T/vLvo05d8ASP/JIj/9qcAS6sXXM30XZZEmMM8vvVwWJFN G1QQ== X-Gm-Message-State: APjAAAWcHUoeO5mVi8hjLhPQ751rp5B6qWsmm85NMO8GoU5yqvideA6M v7UEyDfIcUrLLsGBjxekeBy1l3n1 X-Google-Smtp-Source: APXvYqymIx5vad7coBnlpHcvH7YiM/V6z3dM+FOYwDFidMo/IB5AdXEG3clIhY0hLWfk3zb2QL9Ljg== X-Received: by 2002:adf:d081:: with SMTP id y1mr12222665wrh.34.1565192312732; Wed, 07 Aug 2019 08:38:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Aug 2019 08:38:32 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2019 18:27:17 +0300 Message-Id: <20190807152723.18892-7-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 07/13] 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 f577639dfa..8db42d2bc5 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 */