From patchwork Wed Aug 7 15:27:14 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: 14297 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 8793D4486BD for ; Wed, 7 Aug 2019 18:45:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AC7C68AB33; Wed, 7 Aug 2019 18:45:20 +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 A48FD68A6A0 for ; Wed, 7 Aug 2019 18:45:19 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id x1so41967069wrr.9 for ; Wed, 07 Aug 2019 08: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 :mime-version:content-transfer-encoding; bh=fqlypV4VOYlghbyZfJU1t7EQYJMFB1ZeaovoO8ep228=; b=LivqGr+DqhaWKL3DtvMr6fn/wo6S/aauWlChrbe8sfvQKFy+imATNGVkgS1q4D4gnt V84/D/xVuudNcyeYMOeESuovQalsJkzn1l8xLhXmRg7LsUKSLxosUmaR5w1+fKuLRD3g T5/w2NO83gocOlRBiNr6N3+My0Actbk+jnD3spkvivuZkx3Ubw6EZghA7tHGa0DRqYdZ 6grNtJpszZg3+W/oY3uC7Sdhe4deQ4iwhYRe/lCb8Gcx/5fc4mbguHPlmAMZd9ET/hf4 WQUFBUk+cZrjXOmILnKvJu5riR8XaysmTA3Ib3GnJzy7Tr83UcBdIRRfX/jK5tYppAsi FV8A== 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=fqlypV4VOYlghbyZfJU1t7EQYJMFB1ZeaovoO8ep228=; b=RplKVd3Xx0UxwuvgWFOO8Ii+qNdsLm0DS+Udx37IYtsUyPeHel0ofYkposPmWiWpXk gV+sXwKIcyw4i74JPqVriFaubntuUplTmRGWd/ihehdl1t8kpYjHzPaFwiy+CDjhSczX oLIbA5sU6DMjLr3x6buXXzoi/Mb8qdPqWvuhZOcv4wtMsoU8hBFCslGim4+kp1toCjbY VuHdt7/GAL3SVijxTOfxfSfBTk8qVu6cKzO6cLAtNsrWMGC+n/+hkJXt+r8P7l0/uFsx bxZ/DAWSPLZPrWzbTFt9Ov29HCNhAv+Z5huLnmk+cnLxQIQ4l6zNrgq7fdz/BIrocsaJ dFpw== X-Gm-Message-State: APjAAAXQ8jpAUn1+GIN6g/46d/pJmI8hgWDHkauJO7gOSi8oqxm/X+vp GuVWjbI26khjE8SZcMmNTSG3vdrc X-Google-Smtp-Source: APXvYqxuQoMntEdEdTMtVcV3OBdpviEnxSDAFPwQd2utK7fjDzPQRgCHcosvIl6NiBIWRkm4Kgn+cA== X-Received: by 2002:a5d:63d0:: with SMTP id c16mr6776396wrw.22.1565192308435; Wed, 07 Aug 2019 08:38:28 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:b577:c48f:5aea:bab0]) by smtp.gmail.com with ESMTPSA id 4sm212050375wro.78.2019.08.07.08.38.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Aug 2019 08:38:27 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2019 18:27:14 +0300 Message-Id: <20190807152723.18892-4-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190807152723.18892-1-velocityra@gmail.com> References: <20190807152723.18892-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 04/13] 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 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index c7e2adb3ae..b6f626daca 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -679,6 +679,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: @@ -1950,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++)