From patchwork Fri Aug 9 16:29: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: 14364 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 296B34493ED for ; Fri, 9 Aug 2019 19:39:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C43968AB72; Fri, 9 Aug 2019 19:39:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2D9368AB34 for ; Fri, 9 Aug 2019 19:39:31 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id z23so6167812wmf.2 for ; Fri, 09 Aug 2019 09:39:31 -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=v8GGxWMsP/M6KES8DEzw1MA/FpDJmlRTa1OykEcyc1U=; b=YkymkjeaKLzPVyH8IXE389GlBdwiPJBW+8fNTuMbaJPSeLPllz+6DFJ+O6wiohqjRS vc0sV/i8r2ETiaKwjcp70mvAep9DVpxDclWwSPAQCd770OGcpbMw700XPDt2LDUN255b 2W/j53RVb4miT6YtGmZLgONHM4Vb4bNCJFdtSKpVv7OKWjpHKjVkyjIUV6yYimU+JTHp 7J0kveotDgod3NaFZJIAKAffCvaqAsQzxt6FrLa/ZKOoQw8EypefoJ7xhKpRDTJ/Y6Qb lVh0YjXMOKuQPRFhXetxaYYtfncScKYDcquCkIsumSQP19uDGDvPU43aoD5FWcvss2VV 2nLQ== 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=v8GGxWMsP/M6KES8DEzw1MA/FpDJmlRTa1OykEcyc1U=; b=bdA8MrjUluvQNMqQQx0y+cuB/7WlR17e3i0GrDLzOiyUwEbsJJx9OZaDhsgtPZSRSJ vtuLx9/fkMQP0fohnHhKbS2BsMl2Q9OZIlEaXRfOzuMpm9LvHq4YO2ObsTezs3OP9XzM FH7ayryfX5F0QmWat/CoOclgA4+xo+p+rdjbYjU5XcBIBA0M+KaydMuITwZI7hgoJCTb xFTtf4yWIWojUAlvOa8v5wV5qntVpCtByDWwQECJIva8/y4Q9ifcnCW3PCZcXJXIOF/w sBVBEocO2zhUzvXmehkxBYQwE+npvVfClE43Xf2UIhL461uKW8WfUb7LbBxUdkghfv8d X+5A== X-Gm-Message-State: APjAAAVe0qhRgVJamEHm8EN/TGCXAz3JgoSQlcNfMldjymGMzCic4NCS 5H6rvLXdXGaRRJDSJZ8/1H+iaKyp0vo= X-Google-Smtp-Source: APXvYqzqjL/j1k4w/LM9L3j28b32uE42/wt1SDCO1IubzmZMAHV/EZ32D+8i72/Ix+RY++8eXi/i4Q== X-Received: by 2002:a7b:cb51:: with SMTP id v17mr11676283wmj.20.1565368287859; Fri, 09 Aug 2019 09:31:27 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:e9b3:b00d:2017:357c]) by smtp.gmail.com with ESMTPSA id u6sm6721745wml.9.2019.08.09.09.31.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:27 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:49 +0300 Message-Id: <20190809162959.17924-4-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190809162959.17924-1-velocityra@gmail.com> References: <20190808205233.16368-14-velocityra@gmail.com> <20190809162959.17924-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 04/14] 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 a118c37c41..4620508d53 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, // need to account for [1, 16] bpp + 1, + is_u16); + } + src += width; break; case TIFF_PACKBITS: @@ -1947,7 +1969,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++)