From patchwork Wed Aug 28 12:27:11 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: 14745 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 31C81448FAF for ; Wed, 28 Aug 2019 15:35:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C37B68AB27; Wed, 28 Aug 2019 15:35:58 +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 23E64689AD1 for ; Wed, 28 Aug 2019 15:35:51 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id b16so2319881wrq.9 for ; Wed, 28 Aug 2019 05:35:51 -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=ISiB7eBn6bA7bpD5MHDCTrTIT97zEZasJPObvUwxFi8=; b=MQzMgwE9dTYf2+zVpsfpAN8qZCIgP5DCVMT6mIfv3m4UEuQU1JSWUH4jbB9zY1jU09 QjB408b/KTF7HDp8hNsIyfn+LujH8DDWeOUap/w39uACkbFXjpcMnjYWDG+9DI+VzAKI s/RVRAwTSgpbwYhXrkAJtKy/JGtr2N+UzWqITZYvwV98iQbsxvCOFStPYh67eQ+AM5KA 7S57CnuIN3gFKGc9Jwg55BNR7VkuD00nGhJnsIO5c382lZhBfKXGCNvBMq6+Vr4AJSsg /wyKfNU+kHg0TsjyAuk/Dczuvb4ykC5uzShjkaL1s0zYp55zLlk8WZeBokcyb5o3yxxo GEYQ== 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=ISiB7eBn6bA7bpD5MHDCTrTIT97zEZasJPObvUwxFi8=; b=iExd0ZitjXfxCqPLQfNGVm7/S/anhuPpYjOyakarq77ZT+S5MKfLZ5KK3waTuNM05h tm1JdTxK3HsMlrIsMxPbYub3Umrld09yS0DSOGfxKKuQPz/kbWJ8fvGM4+QSpYizr/QS ZcRs74nzhR7D5ixCxgY/g05LteUwq3yDnTa8mwPQlBcxxTvqyPkav8skwFA7cHYUOnTn xfPNs/I7+147ILzVfkFEGMKV+e233bDQbdaW0eIwTv0q+FX+lKgeO9QAjbjho6URmNxI S8u34gbOHS/3llooxFEDkabdwb65Bv/QDuskytL/iSLh4te2tANc8DSc2jGKSN1sAJA2 WQIg== X-Gm-Message-State: APjAAAVSeUVNNL/XQWgHgUrGfB3e18mrJMUcNOn+vVPGNsFYUH0se+R8 5GURJqSAU7p8OEG4VHlDmHJ1QA18 X-Google-Smtp-Source: APXvYqyz2wDDDfBbFPwhwi6K5xNatZYQfny0AT+yWB6Qy763CHYx8SDqM1LYs1Yyjpnq6PjfeHnNYw== X-Received: by 2002:a5d:568e:: with SMTP id f14mr4259219wrv.167.1566995296594; Wed, 28 Aug 2019 05:28:16 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2019 05:28:16 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Aug 2019 15:27:11 +0300 Message-Id: <20190828122723.19640-3-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 03/15] 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 4c6b835afe..a2102f32b5 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;