From patchwork Wed Aug 28 12:27:12 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: 14743 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 3D5C244A4E3 for ; Wed, 28 Aug 2019 15:35:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2581368AC11; Wed, 28 Aug 2019 15:35:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82B4868ABD0 for ; Wed, 28 Aug 2019 15:35:02 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id y8so2315193wrn.10 for ; Wed, 28 Aug 2019 05:35:02 -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=bqab0Dl8Qir7fy0e74RVkGahjUBVYKuS3m5Bts2nbXU=; b=Ws6imCj/Hx+HvyFpx6HCIWNsG2LnSZRYhRGD1D75lrzcQVVxY98RXANkCq5Jge2eoQ 9rzXQFxCZt2lGZyckt0+vrkKdL/28A5sY5oAqLGDFCCoKRgM4x/ohHSBJ+zO9Z+8/AEr Q06dqxb5HvfI96orjjfZ/jXYVilBqWZpzvJB2oK/BJBpc6zFl5U6kfAfpnZMe0ruq/oD WquAMfEj2OW1tk6dzIEV7wLHYyPIm4uHgWdSx36337jL6a1MvwYZ3zdK2erVqzOkhSA0 gq9VqGYLqHT22snOC2k4rJ9iXMdaXzma9MHDbvycHT3PSA+WCY3zukZ4nNX44tpAev++ El6w== 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=bqab0Dl8Qir7fy0e74RVkGahjUBVYKuS3m5Bts2nbXU=; b=SHZS/G6GGqEqCdP5CXvUJFcSue3HA1dXMEH4mzuDrg8W5SvezfyT2rcWKH73T74zK2 mR8Kqqb/S8fjyPFu1TRmamWjGKHmlvfvpYkwj0efjsr/Xmqyv7ycAnIXpN5EL5s8YVWm X029bnCIDB0Md/dP9mstNayIX8NTZJB+jadYjGe9ToD4e7G4aeVB7hW+9rgK3DWJYNBD jPeex5r8P9VdMqNvIvppUd5RhTms5ZC+C++hJsVznWRMnKMqjcxsw2HXns8T+IqrNd1r KTxIIIgxuqB5HOvCH/aH5Qzb3psUHY6HTUCKjsXjLVsNGF5GEODTm2b7VjJQbS1rOeKK AsVA== X-Gm-Message-State: APjAAAVx8eC/641scaPp9M2g2gTvlgZOipKRai6ppM0hUco4BNCAdyAS HgPHq944EEj2w7Z9UsC7r8J6cdbP X-Google-Smtp-Source: APXvYqzsL3OLExyFslsm4xCBOLBxpM/mDtY7b/IibrWgiHO4gY8cNst80KyRG9k422OOB1ZN3Nx6rA== X-Received: by 2002:adf:a415:: with SMTP id d21mr620959wra.94.1566995297607; Wed, 28 Aug 2019 05:28:17 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:f046:3e76:1fc3:c038]) by smtp.gmail.com with ESMTPSA id a17sm2588958wmm.47.2019.08.28.05.28.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2019 05:28:17 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Aug 2019 15:27:12 +0300 Message-Id: <20190828122723.19640-4-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190828122723.19640-1-velocityra@gmail.com> References: <20190822125635.GD23202@sunshine.barsnick.net> <20190828122723.19640-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v16 04/15] lavc/tiff: Apply color scaling to uncompressed DNGs 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 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index a2102f32b5..dd1295fad6 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -556,6 +556,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid int is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && (desc->flags & AV_PIX_FMT_FLAG_PLANAR) && desc->nb_components >= 3; + int is_dng; if (s->planar) width /= s->bppcount; @@ -657,6 +658,8 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid bytestream2_init(&s->gb, src, size); bytestream2_init_writer(&pb, dst, is_yuv ? s->yuv_line_size : (stride * lines)); + is_dng = (s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG); + for (line = 0; line < lines; line++) { if (src - ssrc > size) { av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n"); @@ -679,6 +682,25 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid for (i = 0; i < width; i++) dst[i] = ff_reverse[src[i]]; } + + /* Color processing for DNG images with uncompressed strips (non-tiled) */ + if (is_dng) { + int is_u16, pixel_size_bytes, pixel_size_bits; + + is_u16 = (s->bpp > 8); + pixel_size_bits = (is_u16 ? 16 : 8); + pixel_size_bytes = (is_u16 ? sizeof(uint16_t) : sizeof(uint8_t)); + + dng_blit(s, + dst, + 0, // no stride, only 1 line + dst, + 0, // no stride, only 1 line + width / pixel_size_bytes * pixel_size_bits / s->bpp * s->bppcount, // need to account for [1, 16] bpp + 1, + is_u16); + } + src += width; break; case TIFF_PACKBITS: @@ -1945,7 +1967,8 @@ again: FFSWAP(int, p->linesize[0], p->linesize[1]); } - if (s->is_bayer && s->white_level && s->bpp == 16) { + if (s->is_bayer && s->white_level && s->bpp == 16 && + !(s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG)) { uint16_t *dst = (uint16_t *)p->data[0]; for (i = 0; i < s->height; i++) { for (j = 0; j < s->width; j++)