From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C2DAF4E6F3 for <ffmpegdev@gitmailbox.com>; Fri, 14 Mar 2025 02:08:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6825268DFBC; Fri, 14 Mar 2025 04:08:40 +0200 (EET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 738AF68BFED for <ffmpeg-devel@ffmpeg.org>; Fri, 14 Mar 2025 04:08:33 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-225e3002dffso780325ad.1 for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Mar 2025 19:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741918111; x=1742522911; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qQq02ZAiomPtqWu/FNG4cqKpG4gRsfTNw/CimNGDPvA=; b=mfLBQysz4dk6IWfmpdq4uDvbK2Lk48jOQ2qipoCzPwC/HdrUJBy3viV0famQriLijY gLy8rhieXwgEETo4tzhQgSSKeww8VF4qk0JoIErUIEsmuKihnuX/gBj0qoexEOUBELzD jvadfFGhpvNTRYT74LhheTyMh5AdKsOScJRJJzUkd+6oO7JgGzoLPNNKF8oeZCBguyGK KBz5bW6WAW/6ffYHpIK/uu8plE3Jr2DexCzuaJBlJRxRrD+Ea5e4ptEO7Nsdkt3p+NEL bPrqim8rvhSw663kGiIwGbDue/BfZDH3W4kuZmyNsZy+srWPTtcN74o9Y+hHJsMXtdT2 E0CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741918111; x=1742522911; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qQq02ZAiomPtqWu/FNG4cqKpG4gRsfTNw/CimNGDPvA=; b=oupqEt7dZilC8cFzzeQH86SSicVvzfEa1nm9+q/PUN7kbGRXZSmkGES/eELaPjqV7v ku/u5rvw9xv9MEDQf/NWFWJKDtFbajjbVau5Dn3MX+p/bn9XABR3P7NMgbAm7W6Wasz/ mfkUQ6jkEaSPapQD38tmdPPSK9yxDyT4mq+sXyqtjW79OC0PgtJIMqOw4flAXePC5omd h/dO1VS6ZIeKs7/S3f/LHM8rLOpwEljmuwi8NxTqc+7OcnCcm4WnHk2nyF3dkhOjShDG EijkDV9FmVBUt/w9+AmN3lXxcXHm/YSAWQBfnTYkVq3A3PrvNyehteNHRB0lKyy6QnOh v23w== X-Gm-Message-State: AOJu0YzocdwLLx4R7aXZOEe0l8HnVsYZwx3rD25kYlFOZkkUZqqouVS9 KAuIMN9ACZ5TPr+3J35YbdeAQUxL0vZDiN7mu5/RN48tIFGoHmPhR1PjQg== X-Gm-Gg: ASbGncuCagUQCAe3cYUQ27sr5TV03LiyYnidetHIFIZiE3jWZ+N0ZAPxlF8Cza6PlTd 4G7m0UkPlxH6rL/stjyvDqgqA8MvVKuxoXbeamMZoKxDu9adDUtKoWsBT62bpOUvmzKdY6t7bxf 1vQye5NeeUtvgBaSZhmAyWpyUX2qNNH9dEqPwqdZy31AXzcyOP/6I9ExOYmdLlVntAcDH8ax/2D NaCP5HBBYKpFN+v/3NrqOVTHl+7hrKL6Xlo+R0ArVs9ybzJrPk4aTH83RsRmQytzy8ND2yvqmzt Q10r+S4zt0VtLTrhEGRyI2mxETazFcbw7YwdtQD1WC5HCDeHOvhdvNIV7NQFZA== X-Google-Smtp-Source: AGHT+IHjihRySV6BMZ4byvuHIROxj9UQRhB/GBBd/EYK1bXIKKs+YJCjFus2jI0WbYIeNdBp4id/qQ== X-Received: by 2002:a05:6a00:3c88:b0:736:47a5:e268 with SMTP id d2e1a72fcca58-737223665abmr784282b3a.1.1741918109966; Thu, 13 Mar 2025 19:08:29 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b040:c:6c19:320d:5252:fe63]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711559289sm2129610b3a.68.2025.03.13.19.08.28 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 19:08:29 -0700 (PDT) From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 23:08:09 -0300 Message-ID: <20250314020809.14220-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/exrdec: restore applying color transfer characteristics for float16 samples X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250314020809.14220-1-jamrial@gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> Regression since 0e917389fe73c932049635d947bba076f1709589. This change also reverts commit 431805c096738da7661a0baee2b12fe9724dcc95. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/exr.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 4482f104d0..107281e115 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -42,6 +42,7 @@ #include "libavutil/avstring.h" #include "libavutil/mem.h" #include "libavutil/opt.h" +#include "libavutil/float2half.h" #include "libavutil/half2float.h" #include "avcodec.h" @@ -193,7 +194,10 @@ typedef struct EXRContext { uint8_t *offset_table; + uint16_t gamma_table[65536]; + Half2FloatTables h2f_tables; + Float2HalfTables f2h_tables; } EXRContext; static int zip_uncompress(const EXRContext *s, const uint8_t *src, int compressed_size, @@ -1401,8 +1405,13 @@ static int decode_block(AVCodecContext *avctx, void *tdata, } } else if (s->pixel_type == EXR_HALF) { // 16-bit - for (int x = 0; x < xsize; x++, ptr_x += step) - AV_WN16A(ptr_x, bytestream_get_le16(&src)); + if (trc_func && (!c || (c < 3 && s->desc->flags & AV_PIX_FMT_FLAG_PLANAR))) { + for (int x = 0; x < xsize; x++, ptr_x += step) + AV_WN16A(ptr_x, s->gamma_table[bytestream_get_le16(&src)]); + } else { + for (int x = 0; x < xsize; x++, ptr_x += step) + AV_WN16A(ptr_x, bytestream_get_le16(&src)); + } } // Zero out the end if xmax+1 is not w @@ -2212,8 +2221,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, static av_cold int decode_init(AVCodecContext *avctx) { EXRContext *s = avctx->priv_data; + uint32_t i; + union av_intfloat32 t; + float one_gamma = 1.0f / s->gamma; + av_csp_trc_function trc_func = NULL; ff_init_half2float_tables(&s->h2f_tables); + ff_init_float2half_tables(&s->f2h_tables); s->avctx = avctx; @@ -2223,6 +2237,26 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_bswapdsp_init(&s->bbdsp); #endif + trc_func = av_csp_trc_func_from_id(s->apply_trc_type); + if (trc_func) { + for (i = 0; i < 65536; ++i) { + t.i = half2float(i, &s->h2f_tables); + t.f = trc_func(t.f); + s->gamma_table[i] = float2half(av_float2int(t.f), &s->f2h_tables); + } + } else if (one_gamma != 1.0f) { + for (i = 0; i < 65536; ++i) { + t.i = half2float(i, &s->h2f_tables); + /* If negative value we reuse half value */ + if (t.f <= 0.0f) { + s->gamma_table[i] = i; + } else { + t.f = powf(t.f, one_gamma); + s->gamma_table[i] = float2half(t.i, &s->f2h_tables); + } + } + } + // allocate thread data, used for non EXR_RAW compression types s->thread_data = av_calloc(avctx->thread_count, sizeof(*s->thread_data)); if (!s->thread_data) -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".