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 487EE4E7B1
for <ffmpegdev@gitmailbox.com>; Sun, 16 Mar 2025 00:30:53 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8588068DDF8;
Sun, 16 Mar 2025 02:30:49 +0200 (EET)
Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com
[209.85.214.178])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B954068C10C
for <ffmpeg-devel@ffmpeg.org>; Sun, 16 Mar 2025 02:30:42 +0200 (EET)
Received: by mail-pl1-f178.google.com with SMTP id
d9443c01a7336-2239c066347so65490025ad.2
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 17:30:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742085040; x=1742689840; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=OGs5XsgQrwGoeAEvIiYa1DKGlm2+S9P22yozZWHZv3c=;
b=iCsD7k5cUVhRboVd9xiT5O9sUJtGHZTXElYtmU/88zpQdAH3kfX/ruZqYJ5M/jhFix
tdO4w6gOQPwu0RqkCX/HJ4cb7Mi3K4goB7WCMPUejNZWH/sIYev+xbAsnVgjhIRkgFt+
xYEuW0fMB14eovgswRKsPkJBkKEClNKa2wDJAZh5PNZ/PffTCuLCxrhM7hBXdz4O+BwE
d+8Ltr/0Ls3Neq4KnbEc3CbQnm4AATs+cMS9eUztpLJGI1mzgK0rXT6BWgLTOmPgHqj3
3sZnnevMOl1yyArKUDh7KCE5zgDRaOi3L2kxWvnJkcIzliVKjsL6eqjpo9Sm7lr/nAbM
LHkQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742085040; x=1742689840;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=OGs5XsgQrwGoeAEvIiYa1DKGlm2+S9P22yozZWHZv3c=;
b=uKpIyvAPUrzKRnClbm7TPMXvr1wqMDrsIBWq03C/ZiOQBzB2iU8yvv9yu7Ga5cL2WE
O64IOVkUpU4L5FpuNBVrZNpOUlM4BEp5hj8KpZhq/1HAa9ED6TrTGOfnbZ2uVhjXoSs9
IJ6y24v+M4Sm1VoP5LoBDbFKf6S5KLPfrzD61rIu5/HquHzKvGGqEPJhJKF5aQmDwLiZ
2Ct/e8JUKpYR2MLfk38tCDI2HhazpT0xLtaEvO1BBfiKUYimcJFOvD/Q78J1PMJR4zcZ
kT2wEbeGXnnIwcYHhN76MYkXU+D4Fpe1UUPYML1t+fZh2un6lDkgZwXfiJjeEMwj60ob
YtdQ==
X-Gm-Message-State: AOJu0YxV9bu2Cu5IlW7Q5et442Jq6dKoNw/7PmluukvBCnu2KMeKsQv9
F4kY+8UBtpOl0/EjxtBrCka6Q6Pg2zQsAwwjcoMPBQEn+eIPw3b2QhmQVw==
X-Gm-Gg: ASbGncv9dhwjS55q30unrPRMZg8nTHntmIy9Fc/hOJxizEmTVdYZY6uMy/AmsLBSlru
amADvABNrHBQNMCp72CoSk/a7/lMaUmNjuP2n/ogg4ljvHkINJmkBRAEANMUOLYnX69Q7F10XEl
/n/pnkLhNbewJVJgc2AMWj1SXXK8blhkOUE14jhRUSOoBX+omHMm8uQ+vsHkxJ1jRKAhjBu5pIp
lYecjfSA3RQwazc/Q+hPXPaxQVNUvglnOAsiyvASh4IFihjBkzOoVh1h3DoFUZBiz1OR1jqSedP
uM5zE/QrCWV4AHPGma5q6Ro2pUkL5lUeaHDveg7rEEAHtVcNy/9kBbFOrBQc
X-Google-Smtp-Source: AGHT+IEovKjHiYMxvg98zEWftA4g4EKzB+7I2GZ7xITZgSdOUps8nV/qtRNKPG0vyIzGeasJfhh2kw==
X-Received: by 2002:a05:6a20:4306:b0:1f5:769a:a4be with SMTP id
adf61e73a8af0-1f5c13165bdmr11589118637.36.1742085040255;
Sat, 15 Mar 2025 17:30:40 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b040:c:f8e2:8e9:5ef0:d6db])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-7371167dafasm4979651b3a.86.2025.03.15.17.30.39
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 15 Mar 2025 17:30:39 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sat, 15 Mar 2025 21:30:26 -0300
Message-ID: <20250316003026.1192-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250314020809.14220-1-jamrial@gmail.com>
References: <20250314020809.14220-1-jamrial@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avcodec/exr: deprecate gamma and apply_trc
options
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/20250316003026.1192-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Decoders should not modify sample values, as that's the job of a library like swscale.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/exr.c | 38 ++++++++++++++++++++++++++------------
libavcodec/version_major.h | 1 +
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index e1e05902c6..0bd9ce9ebe 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -189,15 +189,17 @@ typedef struct EXRContext {
const char *layer;
int selected_part;
- enum AVColorTransferCharacteristic apply_trc_type;
- float gamma;
uint8_t *offset_table;
+#if FF_API_EXR_GAMMA
+ enum AVColorTransferCharacteristic apply_trc_type;
+ float gamma;
uint16_t gamma_table[65536];
+ Float2HalfTables f2h_tables;
+#endif
Half2FloatTables h2f_tables;
- Float2HalfTables f2h_tables;
} EXRContext;
static int zip_uncompress(const EXRContext *s, const uint8_t *src, int compressed_size,
@@ -1194,8 +1196,10 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
int data_xoffset, data_yoffset, data_window_offset, xsize, ysize;
int i, x, buf_size = s->buf_size;
int c, rgb_channel_count;
+#if FF_API_EXR_GAMMA
float one_gamma = 1.0f / s->gamma;
av_csp_trc_function trc_func = av_csp_trc_func_from_id(s->apply_trc_type);
+#endif
int ret;
line_offset = AV_RL64(s->gb.buffer + jobnr * 8);
@@ -1387,6 +1391,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
s->compression == EXR_DWAA ||
s->compression == EXR_DWAB) {
// 32-bit
+#if FF_API_EXR_GAMMA
if (trc_func && (!c || (c < 3 && s->desc->flags & AV_PIX_FMT_FLAG_PLANAR))) {
for (int x = 0; x < xsize; x++, ptr_x += step) {
float f = av_int2float(bytestream_get_le32(&src));
@@ -1399,19 +1404,20 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
f = powf(f, one_gamma);
AV_WN32A(ptr_x, av_float2int(f));
}
- } else {
+ } else
+#endif
for (int x = 0; x < xsize; x++, ptr_x += step)
AV_WN32A(ptr_x, bytestream_get_le32(&src));
- }
} else if (s->pixel_type == EXR_HALF) {
// 16-bit
+#if FF_API_EXR_GAMMA
if (one_gamma != 1.f || (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 {
+ } else
+#endif
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
@@ -2093,10 +2099,12 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture,
return AVERROR_INVALIDDATA;
}
+#if FF_API_EXR_GAMMA
if (s->apply_trc_type != AVCOL_TRC_UNSPECIFIED)
avctx->color_trc = s->apply_trc_type;
else if (s->gamma > 0.9999f && s->gamma < 1.0001f)
avctx->color_trc = AVCOL_TRC_LINEAR;
+#endif
switch (s->compression) {
case EXR_RAW:
@@ -2221,13 +2229,15 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture,
static av_cold int decode_init(AVCodecContext *avctx)
{
EXRContext *s = avctx->priv_data;
+#if FF_API_EXR_GAMMA
uint32_t i;
union av_intfloat32 t;
float one_gamma = 1.0f / s->gamma;
av_csp_trc_function trc_func = NULL;
+ ff_init_float2half_tables(&s->f2h_tables);
+#endif
ff_init_half2float_tables(&s->h2f_tables);
- ff_init_float2half_tables(&s->f2h_tables);
s->avctx = avctx;
@@ -2237,6 +2247,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
ff_bswapdsp_init(&s->bbdsp);
#endif
+#if FF_API_EXR_GAMMA
trc_func = av_csp_trc_func_from_id(s->apply_trc_type);
if (trc_func) {
for (i = 0; i < 65536; ++i) {
@@ -2256,6 +2267,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
}
}
+#endif
// allocate thread data, used for non EXR_RAW compression types
s->thread_data = av_calloc(avctx->thread_count, sizeof(*s->thread_data));
@@ -2298,12 +2310,13 @@ static const AVOption options[] = {
AV_OPT_TYPE_STRING, { .str = "" }, 0, 0, VD },
{ "part", "Set the decoding part", OFFSET(selected_part),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD },
- { "gamma", "Set the float gamma value when decoding", OFFSET(gamma),
- AV_OPT_TYPE_FLOAT, { .dbl = 1.0f }, 0.001, FLT_MAX, VD },
+#if FF_API_EXR_GAMMA
+ { "gamma", "Set the float gamma value when decoding (deprecated, use a scaler)", OFFSET(gamma),
+ AV_OPT_TYPE_FLOAT, { .dbl = 1.0f }, 0.001, FLT_MAX, VD | AV_OPT_FLAG_DEPRECATED },
// XXX: Note the abuse of the enum using AVCOL_TRC_UNSPECIFIED to subsume the existing gamma option
- { "apply_trc", "color transfer characteristics to apply to EXR linear input", OFFSET(apply_trc_type),
- AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, AVCOL_TRC_NB-1, VD, .unit = "apply_trc_type"},
+ { "apply_trc", "color transfer characteristics to apply to EXR linear input (deprecated, use a scaler)", OFFSET(apply_trc_type),
+ AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, AVCOL_TRC_NB-1, VD | AV_OPT_FLAG_DEPRECATED, .unit = "apply_trc_type"},
{ "bt709", "BT.709", 0,
AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT709 }, INT_MIN, INT_MAX, VD, .unit = "apply_trc_type"},
{ "gamma", "gamma", 0,
@@ -2336,6 +2349,7 @@ static const AVOption options[] = {
AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST2084 }, INT_MIN, INT_MAX, VD, .unit = "apply_trc_type"},
{ "smpte428_1", "SMPTE ST 428-1", 0,
AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST428_1 }, INT_MIN, INT_MAX, VD, .unit = "apply_trc_type"},
+#endif
{ NULL },
};
diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h
index 35df5eb779..55e79d5505 100644
--- a/libavcodec/version_major.h
+++ b/libavcodec/version_major.h
@@ -50,6 +50,7 @@
#define FF_API_QUALITY_FACTOR (LIBAVCODEC_VERSION_MAJOR < 62)
#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 62)
#define FF_API_CODEC_PROPS (LIBAVCODEC_VERSION_MAJOR < 63)
+#define FF_API_EXR_GAMMA (LIBAVCODEC_VERSION_MAJOR < 63)
// reminder to remove the OMX encoder on next major bump
#define FF_CODEC_OMX (LIBAVCODEC_VERSION_MAJOR < 62)
--
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".