From patchwork Sat Aug 10 22:19:27 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: 14397 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 CB610448F16 for ; Sun, 11 Aug 2019 01:20:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B85B868AC00; Sun, 11 Aug 2019 01:20:22 +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 ED8EA68ABD0 for ; Sun, 11 Aug 2019 01:20:14 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id r3so7646812wrt.3 for ; Sat, 10 Aug 2019 15:20:14 -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=g09ybzs6IQs8LeUvLp6Ytld+QRWQkb3KHd0mUN/OcqvEr4NBMsfiY3RlR5GdGgHtGT TNNaqHLq3LAshKWnUUkiwmKXxYBzIeqXKwOzQ27yG07AQlATdTAORHBgRLiMOqEyaiKE R49SNMGx9JkEWZ/FYM+a50vdrsxDqgpTFe34qxb7RI+utwcYL1gskG+V/ZJrFz9fX2Ze iA/POFfV7GwfvqbRW/Wyij5jZKHfh/RHX4PWOlf9QixXvlw3ys2tGVsWMNtB3h07Pt+Y HzrLO/D1sTwv+T909tISuoRJ6W0RKNBpAkPRzHmZAoeeQqCuo5FXi6aPIHZcHHYYmCqB hwWA== 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=aaB57Ev4+LU6bvHH2RzAttr3AJNZO2SmIzKIo78mluHQlxAFkgD8V+wVO1kFwNsGlT wahPhpecKi4EI0d4RaEzDMv9opEHosfNlvcnuuwk20TPSJ5A41ltC4TSJ0eKLBaDYjq2 oRXz4hJWhXvb39oQV79y/rQC2+gH5h2FmRd3RsEpKIcyPgUb11pEHmaLM7UiR9EuCRJ/ yesndPonkDWvAWJdAXBUeJdxn95BEEbezy8olif0J83zHEuD9Mnl5R1lsh6DIeLCvwBr Fqsd2CL1wjC+FUaNfkpds67tZUpt9t/8TPLKUkH7DoUoIAuWA2iVsfyVfw5+6BE9HdxY w3NQ== X-Gm-Message-State: APjAAAX9NYpXwL/l4iB8cxSKr6+1zxMqYSjcuitqU46TDv60fh4GvtHD VrXgjAadMxx+jZnWDg2aEhXb9XnPiqU= X-Google-Smtp-Source: APXvYqxJqFgqtzCYQJ+yEm+/Y2UeyKqn/tfhVunoHLvywhGeX/Y6smaQW5RF7llxz/GKiCX0UKHcdQ== X-Received: by 2002:a5d:56cb:: with SMTP id m11mr31684670wrw.255.1565475614246; Sat, 10 Aug 2019 15:20:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:5c0b:c2fa:5389:82dd]) by smtp.gmail.com with ESMTPSA id q20sm40403233wrc.79.2019.08.10.15.20.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:13 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:27 +0300 Message-Id: <20190810221934.44996-7-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190810221934.44996-1-velocityra@gmail.com> References: <20190810221934.44996-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 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 */