From patchwork Sat Aug 10 22:19:23 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: 14392 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 723A8448F16 for ; Sun, 11 Aug 2019 01:20:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B33168ABC1; Sun, 11 Aug 2019 01:20:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82D4968AB80 for ; Sun, 11 Aug 2019 01:20:09 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 207so8979480wma.1 for ; Sat, 10 Aug 2019 15:20:09 -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=Cd06938dkjiRP2+7TG1g0fLVE4aUoGXlMkAgMTzCan3JCTG7dQHFkRx6I1STcDeRrK j0nXSF7jO7vaPB4IZvYn0fyJISbyH7uWWYXRbNKpYwulE9idxP0xHqKTTRQZTvCBwjIA s/Zx41/nC3mZyvLrlr6IKtP5yCNXgkZ6ORpRRotz/bcaveA5GTRRYar2RN2xwYru72JM wDtZS9JEjZ/EXrdNjf/oJd9VBEIe5cpYSVTPdw16YpGzrRxlxkvnjgv3HzxxPTbY3azA lhYYyjjjbnpVGUzkLjsNJmBok5qdKBKPvhuCIksrVdRDOdyfnbsuvGyxHZ3YCUyg4SnB gX1w== 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=AJzautMTfzepQu7g0Mg6SrsJ4g/VaNS/6so1oUJ4z1OqMWTpLiw1zk01W7dR7xMfpS /cd4G9JZTCUx/5kVlyYAQq2x4gQtPOASzGcQvgGH9NG88k3/fTe7c1+5QPpPKSEyEN7P cD+Hv1MBteDq5ddLJGOM6ZFmqpuTc3pPuX8ZYfo7MK7qiQu+MoNAy2Z2ZGwXYdDL+V9g ctprNQpMXlquOXkTLr83gTHpUQk6JOwwJ/ny4vU8rlIWm/eZKqmzppOZuUA2g8vr9BAl 8ZoF278LooTrFS6OUUkSIiVEMkPVwngunrXN6ahKCEVUUsBShr08kprnI2yb9ibSWp0j a/Hg== X-Gm-Message-State: APjAAAWXzAVGC2jJKMN7DErVp+xryCXuQUuWGD0nbr6r0NPmshLBAAxK EpozAm3sr7oefMcrwBISCroK4DfCAUc= X-Google-Smtp-Source: APXvYqwZWlUyvuwxnRQLANrK7LLCHf4ApHX6OehQPkifz2Qgk3210otZj0Rf3tPP11Byfg4K+AQJxg== X-Received: by 2002:a1c:3587:: with SMTP id c129mr19556794wma.90.1565475608780; Sat, 10 Aug 2019 15:20:08 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:5c0b:c2fa:5389:82dd]) by smtp.gmail.com with ESMTPSA id q20sm40403233wrc.79.2019.08.10.15.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:08 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:23 +0300 Message-Id: <20190810221934.44996-3-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190810221934.44996-1-velocityra@gmail.com> References: <20190810221934.44996-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 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;