From patchwork Tue Aug 20 13:37:45 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: 14622 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 665E1447F6E for ; Tue, 20 Aug 2019 16:45:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D40D68AA08; Tue, 20 Aug 2019 16:45:25 +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 53A54689D14 for ; Tue, 20 Aug 2019 16:45:19 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id c3so12482899wrd.7 for ; Tue, 20 Aug 2019 06:45:19 -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; bh=lCBD8wyvTnoL4zdFBwY77xIbj4dFGB02lzE9Jlm13Ro=; b=vDfWahDdjish7lxfmo5YlvwO0gYB+p6zIzzpTDej06guevm4WYZibliN6/jx0kYqVK F+klNhJcpd30raoJQFoVmtC041QhpaYQcdE1qYEIYiUmLuPPHhPQUXuCOR/I+Vgb5eOl gHCgCZTm91W6DBQ98iyT2iVvOSGno325TQ5tVua8rT4MAwGzJ0dmbh/3tNZbEI1p2cCE B0FB1FCuzjynF2qgSpTnoUumqROrxGlcp6OZm4oKc2uyrjfO4yDI9z2YTNtxfvQAA0pl MDZwLzVbtkvJF0JDDtYDBzWTl+imApALkPPbpWPz+J/yNZH3cfZvkE+GBDkNUx2cntbQ xF3w== 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; bh=lCBD8wyvTnoL4zdFBwY77xIbj4dFGB02lzE9Jlm13Ro=; b=eQz9Mg3Sx3dutf2DmU5GH3MzpmbRMTZKz3luxVcECN0Dzx741BH2g7OOGU1Z48LzK0 yVSOqXEBjVldhWNQryQh0wBTgzvKyVvqRSQvJ7ZV3pBtX79/PHF3jv97NVsdPknfyz/r 0B+4kOLp3WyrPirtzM223+fxyWtZg0nUbFAyCK+A4Sa8LQjVql/L0ScBt5MZHe+zmHH0 x9Q1OdlaLmFm0AdRROxU2KIF+jNllc0/fYK4jcqlf5eElbwLxKtNROlmT4ODEEx1vSld WncwvbMFT3wFKM+hoJYAkaHWaNaxJY4GAX+Bug+BnbmgN+TgE68U1xRO48yiOOKvhkq2 RdPA== X-Gm-Message-State: APjAAAX3eRrV1TKAyu/Tj9W5wQCQbepNDH9WqG1MFvs8Pucl3/ZyjTcL 8Xe/SNxMSfRoNyk/LZv8YIWH5Qn+ X-Google-Smtp-Source: APXvYqxaOelxnmRejmWkxlEJFs6zZYZe1xoUYTBDiFdcS85Glaj7rcAKj5eCNMFF69n/9m4/0G+i8g== X-Received: by 2002:a5d:6681:: with SMTP id l1mr24402683wru.258.1566308314122; Tue, 20 Aug 2019 06:38:34 -0700 (PDT) Received: from localhost.localdomain (ppp-94-66-223-133.home.otenet.gr. [94.66.223.133]) by smtp.gmail.com with ESMTPSA id t14sm11545882wrs.58.2019.08.20.06.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 06:38:33 -0700 (PDT) From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Aug 2019 16:37:45 +0300 Message-Id: <20190820133747.30983-13-velocityra@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820133747.30983-1-velocityra@gmail.com> References: <20190811144542.11704-13-velocityra@gmail.com> <20190820133747.30983-1-velocityra@gmail.com> Subject: [FFmpeg-devel] [PATCH v15 13/15] lavc/tiff: Support DNGs with striped (non-tiled) JPEGs 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" DNG samples here can now be decoded: - https://www.photographyblog.com/previews/pentax_k1_photos Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 61 ++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index d5efd05d7c..df2554be86 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -551,6 +551,8 @@ static int tiff_unpack_fax(TiffContext *s, uint8_t *dst, int stride, return ret; } +static int dng_decode_strip(AVCodecContext *avctx, AVFrame *frame); + static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int stride, const uint8_t *src, int size, int strip_start, int lines) { @@ -666,6 +668,17 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid is_dng = (s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG); + /* Decode JPEG-encoded DNGs with strips */ + if (s->compr == TIFF_NEWJPEG && is_dng) { + if (s->strips > 1) { + av_log(s->avctx, AV_LOG_ERROR, "More than one DNG JPEG strips unsupported\n"); + return AVERROR_PATCHWELCOME; + } + if ((ret = dng_decode_strip(s->avctx, p)) < 0) + return ret; + return 0; + } + for (line = 0; line < lines; line++) { if (src - ssrc > size) { av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n"); @@ -860,8 +873,8 @@ static void dng_blit(TiffContext *s, uint8_t *dst, int dst_stride, } } -static int dng_decode_jpeg_tile(AVCodecContext *avctx, AVFrame *frame, - int tile_byte_count, int x, int y, int w, int h) +static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame, + int tile_byte_count, int dst_x, int dst_y, int w, int h) { TiffContext *s = avctx->priv_data; AVPacket jpkt; @@ -913,7 +926,7 @@ static int dng_decode_jpeg_tile(AVCodecContext *avctx, AVFrame *frame, return AVERROR_PATCHWELCOME; } - dst_offset = x + frame->linesize[0] * y / pixel_size; + dst_offset = dst_x + frame->linesize[0] * dst_y / pixel_size; dst_data = frame->data[0] + dst_offset * pixel_size; src_data = s->jpgframe->data[0]; @@ -932,7 +945,7 @@ static int dng_decode_jpeg_tile(AVCodecContext *avctx, AVFrame *frame, return 0; } -static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame) +static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame, AVPacket *avpkt) { TiffContext *s = avctx->priv_data; int tile_idx; @@ -945,6 +958,12 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame) int pos_x = 0, pos_y = 0; int ret; + s->jpgframe->width = s->tile_width; + s->jpgframe->height = s->tile_length; + + s->avctx_mjpeg->width = s->tile_width; + s->avctx_mjpeg->height = s->tile_length; + has_width_leftover = (s->width % s->tile_width != 0); has_height_leftover = (s->height % s->tile_length != 0); @@ -981,7 +1000,7 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame) bytestream2_seek(&s->gb, tile_offset, SEEK_SET); /* Decode JPEG tile and copy it in the reference frame */ - ret = dng_decode_jpeg_tile(avctx, frame, tile_byte_count, pos_x, pos_y, tile_width, tile_length); + ret = dng_decode_jpeg(avctx, frame, tile_byte_count, pos_x, pos_y, tile_width, tile_length); if (ret < 0) return ret; @@ -994,30 +1013,24 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame) } } - return 0; -} + /* Frame is ready to be output */ + frame->pict_type = AV_PICTURE_TYPE_I; + frame->key_frame = 1; -static int dng_decode(AVCodecContext *avctx, AVFrame *frame, AVPacket *avpkt) { - int ret; + return avpkt->size; +} +static int dng_decode_strip(AVCodecContext *avctx, AVFrame *frame) +{ TiffContext *s = avctx->priv_data; - s->jpgframe->width = s->tile_width; - s->jpgframe->height = s->tile_length; - - s->avctx_mjpeg->width = s->tile_width; - s->avctx_mjpeg->height = s->tile_length; - - /* Decode all tiles in a frame */ - ret = dng_decode_tiles(avctx, frame); - if (ret < 0) - return ret; + s->jpgframe->width = s->width; + s->jpgframe->height = s->height; - /* Frame is ready to be output */ - frame->pict_type = AV_PICTURE_TYPE_I; - frame->key_frame = 1; + s->avctx_mjpeg->width = s->width; + s->avctx_mjpeg->height = s->height; - return avpkt->size; + return dng_decode_jpeg(avctx, frame, s->stripsize, 0, 0, s->width, s->height); } static int init_image(TiffContext *s, ThreadFrame *frame) @@ -1890,7 +1903,7 @@ again: avpriv_report_missing_feature(avctx, "DNG JPG-compressed tiled non-bayer-encoded images"); return AVERROR_PATCHWELCOME; } else { - if ((ret = dng_decode(avctx, (AVFrame*)data, avpkt)) > 0) + if ((ret = dng_decode_tiles(avctx, (AVFrame*)data, avpkt)) > 0) *got_frame = 1; return ret; }