From d1a59c3fa3101192256bf67484b0cc9d5f2967b2 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 5 Mar 2025 13:57:16 +0100 Subject: [PATCH 1/2] avcodec/exr: Remove write-only gamma_table Forgotten in 0e917389fe73c932049635d947bba076f1709589. Signed-off-by: Andreas Rheinhardt --- libavcodec/exr.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 7e8020a0ff..8b673046c1 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -190,7 +190,6 @@ typedef struct EXRContext { enum AVColorTransferCharacteristic apply_trc_type; float gamma; - union av_intfloat32 gamma_table[65536]; uint8_t *offset_table; @@ -2240,10 +2239,6 @@ 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); @@ -2255,32 +2250,6 @@ 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] = t; - } - } else { - if (one_gamma > 0.9999f && one_gamma < 1.0001f) { - for (i = 0; i < 65536; ++i) { - s->gamma_table[i].i = half2float(i, &s->h2f_tables); - } - } else { - 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] = t; - } else { - t.f = powf(t.f, one_gamma); - s->gamma_table[i] = t; - } - } - } - } - // 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.45.2