From patchwork Thu Aug 8 20:52:26 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: 14328 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 4893344A056 for ; Thu, 8 Aug 2019 23:55:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DC6A68ABBA; Thu, 8 Aug 2019 23:55:41 +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 454EE68AB9D for ; Thu, 8 Aug 2019 23:55:33 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id x1so46326703wrr.9 for ; Thu, 08 Aug 2019 13:55:33 -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=P7gqVrZkQJiU8FV3r8YZOUIvnZqO7ZonLIb0UG7YsFt2tNFAIbCWDWEPcQ7pOeYZ+P Kgl5q73RhWtKn3sxgou9irdmlGBq6ChYGtAMKy2fKi0v7umFhPzIWPzm2WPo4p1nLsZ2 ZYdqOJC0D07hszbDqsjjj4rnaArmds8yV/xQ7dGDjIOLwAs5atN5T+WHoXNhTZ2aVkLz QTp+AhtsnYFElCstQMlzj5Js4sqeuqsIURt2KnmcBQSO1P8XXdlAXzZRzW2lZPAWroGf bSezM+tUK6jN35H9NC3yyUQ8VCyW0cidW/TqXrRaEwH8rTXnFaOGHbuawhLpQMjFw5bj hVrw== 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=nhiRpy5adWB5HzCNnlJT1N0cxKpuRiLvv4m9fgWFdmHFojG/slIyLQYz7LwN07kROx vZf2AxkXgh58CifF6Wf8imX6WOerbSZjxQ7Hc77l2yKIq/SwGQeqP4wo6SGnLmqqdiTX VP26a1iOv/1/4HijSo3zlMU3U2Dhya84xd/4G5Till0uFpkPgYvTcRUQaVdF/q51qrU1 pDA34qYBwpqIV72+CuxZdeGU1P0qLjxQTVNgVFqt+kFzhdZb3ffs+7ldjA20VFiJeodV 30dDaK6wGyNgu94DoLnESrC7sORvKheQHl+dBC6K7KxmaLWDxh8q6rLlpxNgKpNERlM2 JMyg== X-Gm-Message-State: APjAAAWdkmxInY6teVv4DirsXMyuZlkSlJvCZ696b2ch1MDS8jCj0i0r unZejguKHqUdm33Oe/WlnhTtg2qyXPk= X-Google-Smtp-Source: APXvYqxsHL5bPD7TjLge+0aSEhZgkoPoiT8aYpQy7jljw64EdHjYVED5YbcvI55kb40DMKmz+IZx9Q== X-Received: by 2002:a5d:54c7:: with SMTP id x7mr19479518wrv.39.1565297731745; Thu, 08 Aug 2019 13:55:31 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:1de8:6b2e:8289:ee0e]) by smtp.gmail.com with ESMTPSA id g25sm3446686wmk.18.2019.08.08.13.55.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 13:55:31 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 23:52:26 +0300 Message-Id: <20190808205233.16368-7-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190808205233.16368-1-velocityra@gmail.com> References: <20190808205233.16368-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 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 */