avcodec/exr: add support for half-float DWAA/B compression

Fixes ticket #11555.

James Almer committed 1 year ago

Commit d08c5521 parent 0cabfdc2 files · +42 −16Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files

libavcodec/exr.c +41 −15
libavcodec/version.h +1 −1

             {
                 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 b, g, r;
+                            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++) {
                     go += td->xsize * s->nb_channels;
                     ro += td->xsize * s->nb_channels;
                 }
+                }
             }
         }
     }
     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;
             ao[x] = half2float(ha, &s->h2f_tables);
         }
     }
+    }
     return 0;
 }
                 if (s->desc->flags & AV_PIX_FMT_FLAG_PLANAR || !c)
                     memset(ptr, 0, bxmin);
-                if (s->pixel_type == EXR_FLOAT ||
+                if (s->pixel_type == EXR_FLOAT) {
-                    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))) {
     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;
                 }
             }
             break;
-        }
     case EXR_FLOAT:
         if (s->channel_offsets[3] >= 0) {
             if (!s->is_luma) {

libavcodec/version.h+1−1

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	#include "version_major.h"	30	#include "version_major.h"
31		31
32	#define LIBAVCODEC_VERSION_MINOR 3	32	#define LIBAVCODEC_VERSION_MINOR 3
33	#define LIBAVCODEC_VERSION_MICRO 100	33	#define LIBAVCODEC_VERSION_MICRO 101
34		34
35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
36	LIBAVCODEC_VERSION_MINOR, \	36	LIBAVCODEC_VERSION_MINOR, \

avcodec/exr: add support for half-float DWAA/B compression

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code