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 1D3D94B878 for ; Thu, 1 May 2025 03:26:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A85DF68B43D; Thu, 1 May 2025 06:26:07 +0300 (EEST) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D602A68B0ED for ; Thu, 1 May 2025 06:26:00 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3015001f862so422603a91.3 for ; Wed, 30 Apr 2025 20:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746069958; x=1746674758; 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=7jicM3QYHcrdGPQm0PqEzpOR+wKPtzrDGnzvu+OPTgg=; b=j/LxTEW7AxVVH37H14yL4xqQOlvteFcQgxFHo1XM6M85aruxh/Y5Fb6xcCkts7rvWx 0m86OGB6oNAQl69/29yTlv6MIH1kcgbWuLx0mHaAR/G7wPi+TEsNVaLRiJEP1cJvWg7i cJAG9TKn5e21Yx15RUnp76pQ5Q9aSg6JKcoK//PmAZGEQYJ/eca8GmBPbNisJqdAkRsp 4NAYoOURDuzKOzcWsZ76dCjqZl0YdJxeMHz5smJhtuFKqgJnxtwAX1lg83JGPmZ0Pfci 8cOkoEd77QJ6XbPSYl0qi0lWL7naYl7YLD7YL96xRcyCkl8v8/KWxIR3nDeyll+NgSl6 K/Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746069958; x=1746674758; 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=7jicM3QYHcrdGPQm0PqEzpOR+wKPtzrDGnzvu+OPTgg=; b=K0+hhzVIpOU7cwfEg66gO9VfAoADkXer+eGUKx/bgB3X/jahCrw5OGaQSWG9yB7W7O 5AznBdl8xBTfQFD/J1WgEHbqZRWM0h+JX3/1HEPA3ICw00LHRSl3zEIYUpGwX2P9g3Ua C1+bE7Tqd0eCyDSkSqFvkBzvC5nVIVSskWkcpQ3ql0Fd1fV4hzPibyEh0krpejgLrjg1 44GcFgMJ0GKznJNT3hozNM3UZYKDt1883542NAgo/Auf26RzbsI/H2hD7zvIEd8+BrZZ HDPiC5f1MO1RroSb8Rah5ZKrFrfBrfo5/ALmlVrEzSsfF0pt015FXgPxo5Ttfq16FpAv S0Wg== X-Gm-Message-State: AOJu0YydeTyjZgl1CvOFspuYawDD1OIYA6ZpgxNipEc615Kk7USLBir6 l03CpoWG7+7Cmh0Ig0u39kZ+qEsWxBzh95mUoEfY5yTiNhV8ktBlOE09/w== X-Gm-Gg: ASbGncvc5wr/1LoTmjG6uzDdAOXgiIrqR7+w+9mTU5iv73JaKBeb3AsusQVupyRF7PQ 9sg3g4Rlyw2NssVVIsUbIPn4/E6SYG/NVGGV3TE1W78hwVazfC2XlySCa0Ktgqj/sfSS5oPESbQ FDSpMy46kC+/CejR/U/EmVJ/4g90bkd8FbiJZSSC52O+IRV4ebZcA0Ko/4cqo8XQ3S2jcve23vw QBeTURmtoyop/OqLW5yvIm1E6E1Z7Iywj9o46L8W4J+O4IJRHc+KCkxCfvrySghSkoGjOCpg+xg GWiHoKUWIaXinKEzuEdOh5QXEPmL55idpHt0XyWDKq521XKnJbheI6xnzwIAqwTz8jNL X-Google-Smtp-Source: AGHT+IEmTDjHnViCpio6oLmHalx3T3rdzt0hWjdDTFY9QOISZKnkFl1tDvsmfVy/aIuxAFGPjIZufA== X-Received: by 2002:a17:90b:5745:b0:2ea:a9ac:eee1 with SMTP id 98e67ed59e1d1-30a332f6c1bmr9320258a91.10.1746069957588; Wed, 30 Apr 2025 20:25:57 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:d15:adb6:a5c9:90e]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a119ffsm2507384a91.21.2025.04.30.20.25.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 20:25:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 May 2025 00:25:37 -0300 Message-ID: <20250501032537.81800-1-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/exr: add support for half-float DWAA/B compression 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: Fixes ticket #11555. Signed-off-by: James Almer --- libavcodec/exr.c | 56 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index a16dd96502..1b3aad96ea 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1129,15 +1129,40 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse { const int o = s->nb_channels == 4; + float *yb = td->block[0]; + float *ub = td->block[1]; + float *vb = td->block[2]; + if (s->pixel_type == EXR_HALF) { + uint16_t *bo = ((uint16_t *)td->uncompressed_data) + + y * td->xsize * s->nb_channels + td->xsize * (o + 0) + x; + uint16_t *go = ((uint16_t *)td->uncompressed_data) + + y * td->xsize * s->nb_channels + td->xsize * (o + 1) + x; + uint16_t *ro = ((uint16_t *)td->uncompressed_data) + + y * td->xsize * s->nb_channels + td->xsize * (o + 2) + x; + + for (int yy = 0; yy < 8; yy++) { + for (int xx = 0; xx < 8; xx++) { + const int idx = xx + yy * 8; + float r, g, b; + + convert(yb[idx], ub[idx], vb[idx], &b, &g, &r); + + bo[xx] = float2half(av_float2int(to_linear(b, 1.f)), &s->f2h_tables); + go[xx] = float2half(av_float2int(to_linear(g, 1.f)), &s->f2h_tables); + ro[xx] = float2half(av_float2int(to_linear(r, 1.f)), &s->f2h_tables); + } + + bo += td->xsize * s->nb_channels; + go += td->xsize * s->nb_channels; + ro += td->xsize * s->nb_channels; + } + } else { float *bo = ((float *)td->uncompressed_data) + y * td->xsize * s->nb_channels + td->xsize * (o + 0) + x; float *go = ((float *)td->uncompressed_data) + y * td->xsize * s->nb_channels + td->xsize * (o + 1) + x; float *ro = ((float *)td->uncompressed_data) + y * td->xsize * s->nb_channels + td->xsize * (o + 2) + x; - float *yb = td->block[0]; - float *ub = td->block[1]; - float *vb = td->block[2]; for (int yy = 0; yy < 8; yy++) { for (int xx = 0; xx < 8; xx++) { @@ -1154,6 +1179,7 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse go += td->xsize * s->nb_channels; ro += td->xsize * s->nb_channels; } + } } } } @@ -1161,6 +1187,16 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse if (s->nb_channels < 4) return 0; + if (s->pixel_type == EXR_HALF) { + for (int y = 0; y < td->ysize && td->rle_raw_data; y++) { + uint16_t *ao = ((uint16_t *)td->uncompressed_data) + y * td->xsize * s->nb_channels; + uint8_t *ai0 = td->rle_raw_data + y * td->xsize; + uint8_t *ai1 = td->rle_raw_data + y * td->xsize + rle_raw_size / 2; + + for (int x = 0; x < td->xsize; x++) + ao[x] = ai0[x] | (ai1[x] << 8); + } + } else { for (int y = 0; y < td->ysize && td->rle_raw_data; y++) { uint32_t *ao = ((uint32_t *)td->uncompressed_data) + y * td->xsize * s->nb_channels; uint8_t *ai0 = td->rle_raw_data + y * td->xsize; @@ -1172,6 +1208,7 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse ao[x] = half2float(ha, &s->h2f_tables); } } + } return 0; } @@ -1387,9 +1424,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata, 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) { + if (s->pixel_type == EXR_FLOAT) { // 32-bit #if FF_API_EXR_GAMMA if (trc_func && (!c || (c < 3 && s->desc->flags & AV_PIX_FMT_FLAG_PLANAR))) { @@ -2039,16 +2074,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, if ((ret = decode_header(s, picture)) < 0) return ret; - if ((s->compression == EXR_DWAA || s->compression == EXR_DWAB) && - s->pixel_type == EXR_HALF) { - s->current_channel_offset *= 2; - for (int i = 0; i < 4; i++) - s->channel_offsets[i] *= 2; - } - switch (s->pixel_type) { case EXR_HALF: - if (!(s->compression == EXR_DWAA || s->compression == EXR_DWAB)) { if (s->channel_offsets[3] >= 0) { if (!s->is_luma) { avctx->pix_fmt = AV_PIX_FMT_GBRAPF16; @@ -2063,7 +2090,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, } } break; - } case EXR_FLOAT: if (s->channel_offsets[3] >= 0) { if (!s->is_luma) { -- 2.49.0 _______________________________________________ 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".