From patchwork Fri Aug 9 16:29:48 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: 14363 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 3CB654493ED for ; Fri, 9 Aug 2019 19:39:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28B8B68AB67; Fri, 9 Aug 2019 19:39:18 +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 C777F68AAEA for ; Fri, 9 Aug 2019 19:39:11 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id u25so6156781wmc.4 for ; Fri, 09 Aug 2019 09:39:11 -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=cVQYAoVkwCMC+/NKWCq1U5iyrfN0aXVDwq6vAFRCTNo=; b=TupPGKzWLtzCZJRrcUqsN3lYTy0iD1r/2ExK9f5ZQhMBifbtRkUI0tP6xGOAx7yTRp 11kflZ8sKVFfTGfj4Jfmgd1Vmha576eTu/1hYS2KPaKZsuwgnjRmC3PoB9sxbcyrA/qi Ra7af/YPMQ5+KFovOjCQPxtni1T2SgIZAW4RU+2zZYtjaBDby0YESEJvaki757HdWPsc 2lRb6e6f7CKEvZjmuodpih014iOE2i2BhWSkMp9mBO861dCFwvCzyQfAjr7EIwwHBv9+ 9iAvExd8DK6/hnYYDxaoF+3SE8FBmwHUH0zthL5cJiIYVs3rj7GjUyJMC3pew9xvbZ17 6g6A== 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=cVQYAoVkwCMC+/NKWCq1U5iyrfN0aXVDwq6vAFRCTNo=; b=D+AzaUhp5kpDi+CGl0eyrkC+XncATKZ3NCz+90SXO409nZa6rhGBjQVIPHrr6aUUSd EdqC6MQaUduSDji1a1jL3JgJsbngLPOmJF0qF0visiV9ben3RVUwE7wUmD3bLB64hvQ7 wnJ9Zt0rhhUIZxbjScGe7BsIt6eJ8K1zQuypyjEhDSzkoGcPqNCsgVDrXsSMTPj+q7Lw 7h5W2J137p5pOM9OR04xX2FHr59gW/A2GT3/Ku+ZFTmDc9gIVWR6sLD/irUQGfc99zt4 x9+x/FP9w9ZvkPLq/zXpQNDzMH8MHq1G2iuMTxq4PYNJWVUy/YyZccEHwxgpMZJ/387a mi3Q== X-Gm-Message-State: APjAAAV2rcujkNnvR7P6ZDIkh8odMU6jM6KuS2qBJbilb0B75eVzLlEQ BFw42AN30QzSmvPzZMo+RX9ZFJLVnGc= X-Google-Smtp-Source: APXvYqxDxeiBLzkUQ60r7Q++2vsO+X8I2rV7IBwSpXv92f3Fu2qcxBFpnVE3Vki8cdxd3FvcApFPGg== X-Received: by 2002:a7b:c40c:: with SMTP id k12mr11028431wmi.122.1565368286716; Fri, 09 Aug 2019 09:31:26 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:26 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:48 +0300 Message-Id: <20190809162959.17924-3-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 03/14] lavc/tiff: Convert DNGs to sRGB color space 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 | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index d5673abb19..a118c37c41 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -731,14 +731,23 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid return 0; } +static float av_always_inline linear_to_srgb(float value) { + if (value <= 0.0031308) + return value * 12.92; + else + return pow(value * 1.055, 1.0 / 2.4) - 0.055; +} + /** - * Map stored raw sensor values into linear reference values. - * See: DNG Specification - Chapter 5 + * Map stored raw sensor values into linear reference values (see: DNG Specification - Chapter 5) + * Then convert to sRGB color space. */ -static uint16_t av_always_inline dng_raw_to_linear16(uint16_t value, - const uint16_t *lut, - uint16_t black_level, - float scale_factor) { +static uint16_t av_always_inline dng_process_color16(uint16_t value, + const uint16_t *lut, + uint16_t black_level, + float scale_factor) { + float value_norm; + // Lookup table lookup if (lut) value = lut[value]; @@ -747,16 +756,19 @@ static uint16_t av_always_inline dng_raw_to_linear16(uint16_t value, value = av_clip_uint16_c((unsigned)value - black_level); // Color scaling - value = av_clip_uint16_c((unsigned)(((float)value * scale_factor) * 0xFFFF)); + value_norm = (float)value * scale_factor; + + // Color space conversion (sRGB) + value = av_clip_uint16_c((uint16_t)(linear_to_srgb(value_norm) * 0xFFFF)); return value; } -static uint16_t av_always_inline dng_raw_to_linear8(uint16_t value, +static uint16_t av_always_inline dng_process_color8(uint16_t value, const uint16_t *lut, uint16_t black_level, float scale_factor) { - return dng_raw_to_linear16(value, lut, black_level, scale_factor) >> 8; + return dng_process_color16(value, lut, black_level, scale_factor) >> 8; } static void dng_blit(TiffContext *s, uint8_t *dst, int dst_stride, @@ -774,7 +786,7 @@ static void dng_blit(TiffContext *s, uint8_t *dst, int dst_stride, uint16_t *src_u16 = (uint16_t *)src; for (col = 0; col < width; col++) - *dst_u16++ = dng_raw_to_linear16(*src_u16++, s->dng_lut, s->black_level, scale_factor); + *dst_u16++ = dng_process_color16(*src_u16++, s->dng_lut, s->black_level, scale_factor); dst += dst_stride * sizeof(uint16_t); src += src_stride * sizeof(uint16_t); @@ -782,7 +794,7 @@ static void dng_blit(TiffContext *s, uint8_t *dst, int dst_stride, } else { for (line = 0; line < height; line++) { for (col = 0; col < width; col++) - *dst++ = dng_raw_to_linear8(*src++, s->dng_lut, s->black_level, scale_factor); + *dst++ = dng_process_color8(*src++, s->dng_lut, s->black_level, scale_factor); dst += dst_stride; src += src_stride;