From patchwork Sun Aug 11 14:45:35 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: 14415 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 0C819448588 for ; Sun, 11 Aug 2019 17:46:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB61468AC42; Sun, 11 Aug 2019 17:46:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C7EB68ABBE for ; Sun, 11 Aug 2019 17:46:33 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id r1so3351549wrl.7 for ; Sun, 11 Aug 2019 07:46: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=vOwih4Vo6Jw/Y6rnJ6DkRSJvvQgkXEQk149zTwrr1jw=; b=VPuBH66vI7eTl3PPp4JtfT1bYieXRS0nGL4QibWYi0Dvp8u1ZJ0/5nV57bHdo0mUD3 Stu4FEUxVmtEy1x7BYJ+aFOjAyvsrRbce+v6GDuR5ggQi1F+qHxQsRlSLKlmFng1O0/D 2aet9FZJt+LmHu5EkFckCttYhYIPFyk0Onzt7V+EPD2DULTrJCvUkiQfg5Ko7/kp+3Id ipSR/kLPkc6OYTlNRqs4D2GuFUBtI+gWuKiE00TbM2ThCbrH96hyoebTqnm4cQ0/TIki cgjuCLIHglg2yn3j3p5qlfTidU/V5kWf//kAngschm2eoKLFBc9plW09IGbsgn2+VqeE icdw== 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=vOwih4Vo6Jw/Y6rnJ6DkRSJvvQgkXEQk149zTwrr1jw=; b=EmEWOIwdsTIKpApQTVnsussvEFVvQOGgMVB8q8rIeiLzuqWKzlFDgvlhvqA/ZqIN7E NI8A5gnyRmFVI4cG1Tvbc3HGZm4k2xAF3kpsMYq/NE7C1BTvUBThNEZt4Pao64UHc3rM WNo9BJ78tQTNnu4q0oh8ku6+9Wn6XDzAoKkyTSq4mlstycAawaTGLG25/pxnfB94TM7V 3QCCdQrnDphq5lQJNpEHKtvbESRp5fZWisrp00nrjGmmo2WLCLriCCyxMmh/lVuGsdcf QgN6oZqSnq0e5ENGHp+xW9vD7KjgghG8ruX/SyofZfFmhe5X9QO8xAQvoeveokXA2FM5 ioVA== X-Gm-Message-State: APjAAAWS0vwaSA99bvCGUDen7inT2aoz0J8dvxdhWayHtibcFBV3u+/b FJYS7qVpWOugrcPigo8q8uEox+OEPG8= X-Google-Smtp-Source: APXvYqwV+yeAxj51WHlpMT0po0LiCVC0l/ySRk3KjC0cJjSlFNJWGyiFbjmsEjbiu7SeKMpXGe4yjQ== X-Received: by 2002:a05:600c:40f:: with SMTP id q15mr6998723wmb.88.1565534792377; Sun, 11 Aug 2019 07:46:32 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:94bc:d60f:d153:ccb1]) by smtp.gmail.com with ESMTPSA id f10sm8376360wrm.31.2019.08.11.07.46.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 07:46:31 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 17:45:35 +0300 Message-Id: <20190811144542.11704-7-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190811144542.11704-1-velocityra@gmail.com> References: <20190811073641.GZ3219@michaelspb> <20190811144542.11704-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 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 14928ed3d5..ff9ac30b3f 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 */