From patchwork Thu Aug 8 20:52:32 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: 14332 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 9413644A056 for ; Thu, 8 Aug 2019 23:55:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8008C68ABC0; Thu, 8 Aug 2019 23:55:44 +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 9713868ABB7 for ; Thu, 8 Aug 2019 23:55:39 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id g17so96221641wrr.5 for ; Thu, 08 Aug 2019 13:55:39 -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=r7lZt950ZDghSqhkj7ag2Use3SsZ+elnkkK9xl5IkXw=; b=r6D7kJGEc0DiE2FpL3/mTMy+9p0ziCHQFwKQKUiRiI43h6D/7s6FivmGzXLAtK3ZEj OYt+fuMWVozpv9KO8LLkKnAglPwG7jTpdnwkKcZBGPUak7nr5kYsbirHGZjfP8HeHqZC Va1A2SfltJUaNwHAMdjvZMnr2PH3apwPbsym3gdnk1HbGPc8ISKdy6IHcvf1tkxRqWBv u8iFsPFdIQ3V9NrllsgrGJWbvtjZcR4ILrflYie0gLYQ+ApOMQSS4slSo4NWRWlE8RJD GD8xeBgao2Zr9ovUBUPzWoi6KXB7xIE62xTP8fFqmd+t4O4RJH97lsHsUDSR4qzI2b6S 3n7g== 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=r7lZt950ZDghSqhkj7ag2Use3SsZ+elnkkK9xl5IkXw=; b=o/Y0nAFXj2mhpawQCI80pRpjEwH4FrZMfQ8sARGW5/Hn9wyk0yUfYGXB5y/fteHhN+ HAro1EaOI/E7grkfZ8719rzUS9MBMS+7mNJLBrGYMn9QvJwppvu2mBMYzpyPu+lf9ZyH Yln/jNP0QnLWg+JO6M0BVmqEuA+OLb0KAjBftSUn2wLIeqDbPKR107Kiv9e9iZmJwqju eKNhVWgb8Nc1LEzp6cPG+om+ZqCZWAWue1qJBdPLPE66qaYBSlnWaUwhu04QY0qE+WcW cGHh2zibcEC14EeFlkn16oeky4xN8lqJ+vdyq/De+y2i77GSIYcJ7rkCj5riQyxYc7Fm RMqw== X-Gm-Message-State: APjAAAXMbVhsMmMaomxe6PCIsILRbEZKoLDfmPsDt6YXb0Ie+KrSRihE QJWxChKo1gGqx2jzsW1/2Ji3DfJ5Np8= X-Google-Smtp-Source: APXvYqxJTp/ROK/iHp7JYq4/yOAXn7N9ouUaDhT+etDqZnvNAW/Amii3M2Rwfqf29q3Up7dqBYQOVA== X-Received: by 2002:adf:ee87:: with SMTP id b7mr7898777wro.61.1565297738772; Thu, 08 Aug 2019 13:55:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 13:55:38 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 23:52:32 +0300 Message-Id: <20190808205233.16368-13-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 13/14] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris DNG samples here can now be decoded: - https://www.photographyblog.com/previews/pentax_k1_photos Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 73 +++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 7855c36aa7..47140cddbc 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -550,6 +550,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) { @@ -665,6 +667,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"); @@ -859,8 +872,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; @@ -905,7 +918,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]; @@ -924,7 +937,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; @@ -937,6 +950,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); @@ -973,7 +992,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; @@ -986,30 +1005,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) @@ -1873,17 +1886,15 @@ again: /* Handle DNG images with JPEG-compressed tiles */ - if (s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG) { - if (!s->is_jpeg && s->is_tiled) { + if ((s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG) && s->is_tiled) { + if (!s->is_jpeg) { avpriv_report_missing_feature(avctx, "DNG uncompressed tiled images"); return AVERROR_PATCHWELCOME; - } - if (s->is_jpeg && !s->is_bayer) { - avpriv_report_missing_feature(avctx, "DNG JPG-compressed non-bayer-encoded images"); + } else if (!s->is_bayer) { + avpriv_report_missing_feature(avctx, "DNG JPG-compressed tiled non-bayer-encoded images"); return AVERROR_PATCHWELCOME; - } - if (s->is_jpeg && s->is_bayer) { - if ((ret = dng_decode(avctx, (AVFrame*)data, avpkt)) > 0) + } else { + if ((ret = dng_decode_tiles(avctx, (AVFrame*)data, avpkt)) > 0) *got_frame = 1; return ret; }