From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1694C4BE1D for ; Wed, 5 Mar 2025 21:34:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9325768ECC2; Wed, 5 Mar 2025 23:34:12 +0200 (EET) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B50968E5B5 for ; Wed, 5 Mar 2025 23:34:06 +0200 (EET) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2fea795bafeso2498406a91.1 for ; Wed, 05 Mar 2025 13:34:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741210444; x=1741815244; 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=hxf0Xp+Xd3JJPbd3zxffBwJQKloFDPaZCyZ9+W2BS7E=; b=TivhFX+BlsCHtW9+EpNOyGFB1fgsCmEPYliAvnygR1lGuXVSF/lrOOjP5ad9tPLzvt kzb8FfI+QwypWJf2+AwiKJP9xEyp7TM9Pcqs3EwniWHO8U3kkP7Oxnmmz8+D6KAaabRg zyCcP7QsJdnaAXa0UeLRZZcvWPTpyNZmCVc34ZsT7Y+8PxIGazKjJINiqL6ToNAO2RdQ 4wxa3SZcF3rMXobdv/0ImUS1+mEZWQ0qzERYoWIrRrp0T/PQvBDPiWsLbqezp9+8ne4G l9syquQVz/hAICpg3o6AWN3OMFnGxnKFT/CAgD/VlxH4QtuKRCrjeXh8gf8ierWGFvQ2 ONoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741210444; x=1741815244; 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=hxf0Xp+Xd3JJPbd3zxffBwJQKloFDPaZCyZ9+W2BS7E=; b=fObsemzEwxbbnkSYyLxPlg2ylndr6aY5IDQ7PXeiWWtL35RN4GmtMqRsDikmJHxDm2 KA5Zn7SYlpW2qXlCsPoePMS5PbnnMNpuDjQB1D7Y3oUz6e+vSKL8EG0lymJQWnNylTlw XEtnBhmZOIIF5ilIuspxM/fwQ3CHaI1IURIXiHyr/9C4BkglB+ALnAt6RzNrVjCTwHBq P1LKrN2rAL00OBhJtda7mYFQczJBpCqh4Io+NMV0/1ApHj4J0ghzElAaIoL+d8QNfH6T scNBE6ESpMsjA7yxQFV/mNFlTHU5Fp/ShiFzh6bXDCUr7fW1QPwqXVUoF1TwSsnbqzBt LxMw== X-Gm-Message-State: AOJu0Ywnch5/5c/uv1zwe+opdzYqUvYMYFnY/gT0jnXB0cHzyBofaN4o CJIc7bLaD38pPJlzxrWksgJaqrzya3N5hGt3ok/Y+spYfSJ38hXA1lxx1A== X-Gm-Gg: ASbGncuFcpr0cSIhMEW37/ZRShYTjSAx3fgmY66dfNr4t2leEmuWaCSpWy61XddHq4B AmiSXGjWLX982PhnvItuLZ/hL6KhljHMBFrtvf5aNYLHySRlYV59JSaw5HOvGIEf3wQm6Uyxudp I4t3bbxDWY/Z/+3obweMBoKQZ6NRHVT2jeFwpxa+xAICYlH59oohPhKSqj0P3+3Tead0PRUqvxK ufSBf7asfJdzOw30YjcB8p2LcWVYlS+zRE98MlW38hE+C6ZxvwxXwZ1Wom59RqwaUm2Uzi1gMzU bqBZAxSUZKuRloN1a5eQKfIqCFm+ma2xxDxg0yJ+D2kcu3q/hXtvAddAV7k/ X-Google-Smtp-Source: AGHT+IEMCL+Xb+tfwnk2+pHCxAywm+jQBTU+qv1urSi4M9e22/9epGwBKatVZSk/IPanJJdqSuJV9Q== X-Received: by 2002:a17:90b:1d90:b0:2fa:4926:d18d with SMTP id 98e67ed59e1d1-2ff617d8274mr1349251a91.13.1741210443556; Wed, 05 Mar 2025 13:34:03 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:d959:d427:c88a:cc02]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e760dadsm1833034a91.8.2025.03.05.13.34.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 13:34:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Mar 2025 18:33:47 -0300 Message-ID: <20250305213347.40999-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305204413.36950-3-jamrial@gmail.com> References: <20250305204413.36950-3-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec/exr: use luma+alpha float pixel formats X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- Updated for the latest git master changes. libavcodec/exr.c | 55 ++++++++------------ tests/ref/fate/exr-ya-scanline-zip-half-12x8 | 2 +- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index b25e9ef397..fe5f62c3b5 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1352,33 +1352,32 @@ static int decode_block(AVCodecContext *avctx, void *tdata, data_yoffset = FFABS(FFMIN(0, line)); data_window_offset = (data_yoffset * td->channel_line_size) + data_xoffset; + if (s->channel_offsets[3] >= 0) + channel_buffer[3] = src + (td->xsize * s->channel_offsets[3]) + data_window_offset; if (!s->is_luma) { channel_buffer[0] = src + (td->xsize * s->channel_offsets[0]) + data_window_offset; channel_buffer[1] = src + (td->xsize * s->channel_offsets[1]) + data_window_offset; channel_buffer[2] = src + (td->xsize * s->channel_offsets[2]) + data_window_offset; rgb_channel_count = 3; - } else { /* put y data in the first channel_buffer */ + } else { /* put y data in the first channel_buffer and if needed, alpha in the second */ channel_buffer[0] = src + (td->xsize * s->channel_offsets[1]) + data_window_offset; + if (!(s->desc->flags & AV_PIX_FMT_FLAG_PLANAR)) + channel_buffer[1] = channel_buffer[3]; rgb_channel_count = 1; } - if (s->channel_offsets[3] >= 0) - channel_buffer[3] = src + (td->xsize * s->channel_offsets[3]) + data_window_offset; - - if (s->desc->flags & AV_PIX_FMT_FLAG_PLANAR || s->desc->nb_components == 1 ) { - /* todo: change this when a floating point pixel format with luma with alpha is implemented */ - int channel_count = s->channel_offsets[3] >= 0 ? 4 : rgb_channel_count; - if (s->is_luma) { - channel_buffer[1] = channel_buffer[0]; - channel_buffer[2] = channel_buffer[0]; - } - for (c = 0; c < channel_count; c++) { + if (s->desc->flags & AV_PIX_FMT_FLAG_FLOAT) { + for (c = 0; c < s->desc->nb_components; c++) { int plane = s->desc->comp[c].plane; - ptr = p->data[plane] + window_ymin * p->linesize[plane] + (window_xmin * step); + ptr = p->data[plane] + window_ymin * p->linesize[plane] + (window_xmin * step) + s->desc->comp[c].offset; for (i = 0; i < ysize; i++, ptr += p->linesize[plane]) { const uint8_t *src; + // Zero out the start if xmin is not 0 + if (s->desc->flags & AV_PIX_FMT_FLAG_PLANAR || !c) + memset(ptr, 0, bxmin); + if (s->pixel_type == EXR_FLOAT || s->compression == EXR_DWAA || s->compression == EXR_DWAB) { @@ -1387,42 +1386,36 @@ static int decode_block(AVCodecContext *avctx, void *tdata, src = channel_buffer[c]; - // Zero out the start if xmin is not 0 - memset(ptr_x, 0, bxmin); - ptr_x += 4 * window_xoffset; + ptr_x += window_xoffset * step; if (trc_func && c < 3) { - for (int x = 0; x < xsize; x++, ptr_x += 4) { + for (x = 0; x < xsize; x++, ptr_x += step) { float f = av_int2float(bytestream_get_le32(&src)); AV_WN32A(ptr_x, av_float2int(trc_func(f))); } } else if (one_gamma != 1.f) { - for (int x = 0; x < xsize; x++, ptr_x += 4) { + for (x = 0; x < xsize; x++, ptr_x += step) { float f = av_int2float(bytestream_get_le32(&src)); if (f > 0.0f && c < 3) /* avoid negative values */ f = powf(f, one_gamma); AV_WN32A(ptr_x, av_float2int(f)); } } else { - for (int x = 0; x < xsize; x++, ptr_x += 4) + for (x = 0; x < xsize; x++, ptr_x += step) AV_WN32A(ptr_x, bytestream_get_le32(&src)); } - memset(ptr_x, 0, axmax); } else if (s->pixel_type == EXR_HALF) { src = channel_buffer[c]; - // Zero out the start if xmin is not 0 - memset(ptr, 0, bxmin); - // 16-bit for (x = window_xoffset; x < xsize + window_xoffset; x++) { int v = bytestream_get_le16(&src); - AV_WN16(ptr + x * sizeof(uint16_t), v); + AV_WN16(ptr + x * step, v); } - memset(ptr + x * sizeof(uint16_t), 0, axmax); } // Zero out the end if xmax+1 is not w + memset(ptr + x * step, 0, axmax); channel_buffer[c] += td->channel_line_size; } } @@ -2054,8 +2047,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, if (!s->is_luma) { avctx->pix_fmt = AV_PIX_FMT_GBRAPF16; } else { - /* todo: change this when a floating point pixel format with luma with alpha is implemented */ - avctx->pix_fmt = AV_PIX_FMT_GBRAPF16; + avctx->pix_fmt = AV_PIX_FMT_YAF16; } } else { if (!s->is_luma) { @@ -2071,8 +2063,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, if (!s->is_luma) { avctx->pix_fmt = AV_PIX_FMT_GBRAPF32; } else { - /* todo: change this when a floating point pixel format with luma with alpha is implemented */ - avctx->pix_fmt = AV_PIX_FMT_GBRAPF32; + avctx->pix_fmt = AV_PIX_FMT_YAF32; } } else { if (!s->is_luma) { @@ -2151,11 +2142,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, if (!s->desc) return AVERROR_INVALIDDATA; - if (s->desc->flags & AV_PIX_FMT_FLAG_PLANAR) { - planes = s->desc->nb_components; - } else { - planes = 1; - } + planes = av_pix_fmt_count_planes(avctx->pix_fmt); out_line_size = avctx->width * s->desc->comp[0].step; if (s->is_tile) { diff --git a/tests/ref/fate/exr-ya-scanline-zip-half-12x8 b/tests/ref/fate/exr-ya-scanline-zip-half-12x8 index 97ea715962..6c07f19846 100644 --- a/tests/ref/fate/exr-ya-scanline-zip-half-12x8 +++ b/tests/ref/fate/exr-ya-scanline-zip-half-12x8 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 12x8 #sar 0: 1/1 -0, 0, 0, 1, 1536, 0x2b457bd2 +0, 0, 0, 1, 1536, 0xa33f5f69 -- 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".