From patchwork Fri Mar 22 14:50:49 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: 12392 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 50DD4448002 for ; Fri, 22 Mar 2019 17:00:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E790689A12; Fri, 22 Mar 2019 17:00:02 +0200 (EET) 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 A2BEE6882B7 for ; Fri, 22 Mar 2019 16:59:55 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id y13so2730083wrd.3 for ; Fri, 22 Mar 2019 07:59:55 -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=5O9Yscx9GThEcQg1jxffK0VzzOpA32LCoTKjxp9Ylmg=; b=qrUxq8o4ASkR8wSliAZfhaBw5VbN4hiNJHmmTDhVfc7KHPD/FxBaIAa3lBEWxiCygG zXgmhKL/ljCFED3bR7V3ZLde5JESAdZsuaXIzDAUpNmwLa5Rji//5xeP+fiETn6A0Vdk CGqGQjDVOpMoFaReoG8Ym/4ewrGlC8lTaHeZbe78PkMLvcet2YgwKFWnSufQ42vyRaY+ nAxauuaEeB58njakvY/atDN9TeNTYrqKJPPpaU9BGxBZdNEUXVe6qh7bD5EyNlHoA4lL D23ZbuR9Jde8XxGTR+qjnGgsg6g+Mhyh4Xw2oY7HzEJdq3RTtNrU+VOEZ5QCD8MhNsrf S2Cg== 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=5O9Yscx9GThEcQg1jxffK0VzzOpA32LCoTKjxp9Ylmg=; b=bD3BIFoy9RAeOpQBRW5liHF/MQawpmpB0HrvO10QBK4QvQxbJ/BXHGyTZTJnbTjJji LU0305bsYstHSWs+SikFwNc91v4AQRS4IVBOeBVVUF+ZUYLMCUpCd4/Srkn+bp4M34uV gqoRJgaDq1wutNNzXcfONHePiUDkPTHIoiLJf5AhEiMgzbjmG6cJSz8wd3mPMBJj+jAR yeCbeIoHcusrqMFFGSaizf2RJI6ofwErjHpg8I30LxndUk2ipsXthEqe4QnDfrT3BtUG 23QOAOHs4AUSvJDFuSZCQDtrFUemnitMKtS+5s9GACDsqWkPKVhE5MKnFg06Pi/oU0MN 4RkQ== X-Gm-Message-State: APjAAAVF/fJHXNF6LGNo2+VBAvXZgfOkO0LrNQnvzV9j30hwV9r/fJGi qnUYdB2x23t7rgNUovyeafQs4u8q X-Google-Smtp-Source: APXvYqw6wA/LpvMzSN1Qkj102c/qlLoZ4XgsCJObWR3QK4Exj4SdB1Z0lsivW1bJ26XCxZLVm0Cptw== X-Received: by 2002:adf:dd0f:: with SMTP id a15mr5539664wrm.221.1553266401019; Fri, 22 Mar 2019 07:53:21 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240c:1200:fdc2:c133:edbe:3d2c]) by smtp.gmail.com with ESMTPSA id k14sm6280389wmj.26.2019.03.22.07.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 07:53:20 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2019 16:50:49 +0200 Message-Id: <20190322145049.25432-2-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190322145049.25432-1-velocityra@gmail.com> References: <20190322145049.25432-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/tiff: Multi-page support 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 Option "-page N" (page index N starts from 1) can now be used to specify which TIFF page/subfile to decode. Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 29a80a6892..94ff4bd394 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -55,6 +55,7 @@ typedef struct TiffContext { GetByteContext gb; int get_subimage; + uint16_t get_page; int width, height; unsigned int bpp, bppcount; @@ -75,6 +76,7 @@ typedef struct TiffContext { unsigned white_level; uint32_t sub_ifd; + uint16_t cur_page; int strips, rps, sstype; int sot; @@ -1322,6 +1324,12 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) break; case TIFF_PAGE_NUMBER: ADD_METADATA(count, "page_number", " / "); + // need to seek back to re-read the page number + bytestream2_seek(&s->gb, -count * sizeof(uint16_t), SEEK_CUR); + // read the page number + s->cur_page = ff_tget(&s->gb, TIFF_SHORT, s->le); + // get back to where we were before the previous seek + bytestream2_seek(&s->gb, count * sizeof(uint16_t) - sizeof(uint16_t), SEEK_CUR); break; case TIFF_SOFTWARE_NAME: ADD_METADATA(count, "software", NULL); @@ -1359,6 +1367,7 @@ static int decode_frame(AVCodecContext *avctx, uint8_t *dst; GetByteContext stripsizes; GetByteContext stripdata; + int retry_for_subifd, retry_for_page; bytestream2_init(&s->gb, avpkt->data, avpkt->size); @@ -1379,6 +1388,7 @@ again: s->fill_order = 0; s->white_level = 0; s->is_bayer = 0; + s->cur_page = 0; free_geotags(s); // Reset these offsets so we can tell if they were set this frame @@ -1393,8 +1403,20 @@ again: return ret; } - if (s->sub_ifd && s->get_subimage) { + /** whether we should look for this IFD's SubIFD */ + retry_for_subifd = s->sub_ifd && s->get_subimage; + /** whether we should look for this multi-page IFD's next page */ + retry_for_page = s->get_page && s->cur_page + 1 < s->get_page; // get_page is 1-indexed + + if (retry_for_page) { + // set offset to the next IFD + off = ff_tget_long(&s->gb, le); + } else if (retry_for_subifd) { + // set offset to the SubIFD off = s->sub_ifd; + } + + if (retry_for_subifd || retry_for_page) { if (off >= UINT_MAX - 14 || avpkt->size < off + 14) { av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n"); return AVERROR_INVALIDDATA; @@ -1643,6 +1665,7 @@ static av_cold int tiff_end(AVCodecContext *avctx) #define OFFSET(x) offsetof(TiffContext, x) static const AVOption tiff_options[] = { { "subimage", "decode subimage instead if available", OFFSET(get_subimage), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM }, + { "page", "page number of multi-page image to decode (starting from 1)", OFFSET(get_page), AV_OPT_TYPE_UINT16, {.i64=0}, 0, UINT16_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM }, { NULL }, };