avcodec/exr: output float pixels in float pixel format

changes since v1
- default behavior, no longer hidden behind decoder parameter
- updated tests to reflect change

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 73419eadb1759f9607c8a7cbc4e71798b0a88146..68d5befa400c07464b99e8732440eaa12e5adfdf 100644 (file)
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -30,7 +30,6 @@
  * For more information on the OpenEXR format, visit:
  *  http://openexr.com/
  *
- * exr_flt2uint() and exr_halflt2uint() is credited to Reimar Döffinger.
  * exr_half2float() is credited to Aaftab Munshi, Dan Ginsburg, Dave Shreiner.
  */
 
@@ -160,7 +159,7 @@ typedef struct EXRContext {
 
     enum AVColorTransferCharacteristic apply_trc_type;
     float gamma;
-    uint16_t gamma_table[65536];
+    union av_intfloat32 gamma_table[65536];
 } EXRContext;
 
 /* -15 stored using a single precision bias of 127 */
@@ -225,47 +224,6 @@ static union av_intfloat32 exr_half2float(uint16_t hf)
     return f;
 }
 
-
-/**
- * Convert from 32-bit float as uint32_t to uint16_t.
- *
- * @param v 32-bit float
- *
- * @return normalized 16-bit unsigned int
- */
-static inline uint16_t exr_flt2uint(int32_t v)
-{
-    int32_t exp = v >> 23;
-    // "HACK": negative values result in exp<  0, so clipping them to 0
-    // is also handled by this condition, avoids explicit check for sign bit.
-    if (exp <= 127 + 7 - 24) // we would shift out all bits anyway
-        return 0;
-    if (exp >= 127)
-        return 0xffff;
-    v &= 0x007fffff;
-    return (v + (1 << 23)) >> (127 + 7 - exp);
-}
-
-/**
- * Convert from 16-bit float as uint16_t to uint16_t.
- *
- * @param v 16-bit float
- *
- * @return normalized 16-bit unsigned int
- */
-static inline uint16_t exr_halflt2uint(uint16_t v)
-{
-    unsigned exp = 14 - (v >> 10);
-    if (exp >= 14) {
-        if (exp == 14)
-            return (v >> 9) & 1;
-        else
-            return (v & 0x8000) ? 0 : 0xffff;
-    }
-    v <<= 6;
-    return (v + (1 << 16)) >> (exp + 1);
-}
-
 static int zip_uncompress(EXRContext *s, const uint8_t *src, int compressed_size,
                           int uncompressed_size, EXRThreadData *td)
 {
@@ -1035,14 +993,14 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
     const uint8_t *channel_buffer[4] = { 0 };
     const uint8_t *buf = s->buf;
     uint64_t line_offset, uncompressed_size;
-    uint16_t *ptr_x;
     uint8_t *ptr;
     uint32_t data_size;
     uint64_t line, col = 0;
     uint64_t tile_x, tile_y, tile_level_x, tile_level_y;
     const uint8_t *src;
-    int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components; /* nb pixel to add at the right of the datawindow */
-    int bxmin = s->xmin * 2 * s->desc->nb_components; /* nb pixel to add at the left of the datawindow */
+    int step = s->desc->flags & AV_PIX_FMT_FLAG_FLOAT ? 4 : 2 * s->desc->nb_components;
+    int axmax = (avctx->width - (s->xmax + 1)) * step; /* nb pixel to add at the right of the datawindow */
+    int bxmin = s->xmin * step; /* nb pixel to add at the left of the datawindow */
     int i, x, buf_size = s->buf_size;
     int c, rgb_channel_count;
     float one_gamma = 1.0f / s->gamma;
@@ -1175,69 +1133,89 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
     if (s->channel_offsets[3] >= 0)
         channel_buffer[3] = src + td->xsize * s->channel_offsets[3];
 
-    ptr = p->data[0] + line * p->linesize[0] + (col * s->desc->nb_components * 2);
+    if (s->desc->flags & AV_PIX_FMT_FLAG_FLOAT) {
 
-    for (i = 0;
-         i < td->ysize; i++, ptr += p->linesize[0]) {
-
-        const uint8_t * a;
-        const uint8_t *rgb[3];
-
-        for (c = 0; c < rgb_channel_count; c++) {
-            rgb[c] = channel_buffer[c];
+        /* 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];
         }
 
-        if (channel_buffer[3])
-            a = channel_buffer[3];
+        for (c = 0; c < channel_count; c++) {
+            int plane = s->desc->comp[c].plane;
+            ptr = p->data[plane] + line * p->linesize[plane] + (col * 4);
 
-        ptr_x = (uint16_t *) ptr;
+            for (i = 0; i < td->ysize; i++, ptr += p->linesize[plane]) {
+                const uint8_t *src;
+                union av_intfloat32 *ptr_x;
 
-        // Zero out the start if xmin is not 0
-        memset(ptr_x, 0, bxmin);
-        ptr_x += s->xmin * s->desc->nb_components;
+                src = channel_buffer[c];
+                ptr_x = (union av_intfloat32 *)ptr;
 
-        if (s->pixel_type == EXR_FLOAT) {
-            // 32-bit
-            if (trc_func) {
-                for (x = 0; x < td->xsize; x++) {
-                    union av_intfloat32 t;
+                // Zero out the start if xmin is not 0
+                memset(ptr_x, 0, bxmin);
+                ptr_x += s->xmin;
 
-                    for (c = 0; c < rgb_channel_count; c++) {
-                        t.i = bytestream_get_le32(&rgb[c]);
-                        t.f = trc_func(t.f);
-                        *ptr_x++ = exr_flt2uint(t.i);
-                    }
-                    if (channel_buffer[3])
-                        *ptr_x++ = exr_flt2uint(bytestream_get_le32(&a));
-                }
-            } else {
-                for (x = 0; x < td->xsize; x++) {
+                if (s->pixel_type == EXR_FLOAT) {
+                    // 32-bit
                     union av_intfloat32 t;
-                    int c;
-
-                    for (c = 0; c < rgb_channel_count; c++) {
-                        t.i = bytestream_get_le32(&rgb[c]);
-                        if (t.f > 0.0f)  /* avoid negative values */
-                            t.f = powf(t.f, one_gamma);
-                        *ptr_x++ = exr_flt2uint(t.i);
+                    if (trc_func && c < 3) {
+                        for (x = 0; x < td->xsize; x++) {
+                            t.i = bytestream_get_le32(&src);
+                            t.f = trc_func(t.f);
+                            *ptr_x++ = t;
+                        }
+                    } else {
+                        for (x = 0; x < td->xsize; x++) {
+                            t.i = bytestream_get_le32(&src);
+                            if (t.f > 0.0f && c < 3)  /* avoid negative values */
+                                t.f = powf(t.f, one_gamma);
+                            *ptr_x++ = t;
+                        }
+                    }
+                } else if (s->pixel_type == EXR_HALF) {
+                    // 16-bit
+                    if (c < 3) {
+                        for (x = 0; x < td->xsize; x++) {
+                            *ptr_x++ = s->gamma_table[bytestream_get_le16(&src)];
+                        }
+                    } else {
+                        for (x = 0; x < td->xsize; x++) {
+                            *ptr_x++ = exr_half2float(bytestream_get_le16(&src));;
+                        }
                     }
-
-                    if (channel_buffer[3])
-                        *ptr_x++ = exr_flt2uint(bytestream_get_le32(&a));
                 }
+
+                // Zero out the end if xmax+1 is not w
+                memset(ptr_x, 0, axmax);
+                channel_buffer[c] += td->channel_line_size;
             }
-        } else if (s->pixel_type == EXR_HALF) {
-            // 16-bit
-            for (x = 0; x < td->xsize; x++) {
-                int c;
-                for (c = 0; c < rgb_channel_count; c++) {
-                    *ptr_x++ = s->gamma_table[bytestream_get_le16(&rgb[c])];
-                }
+        }
+    } else {
 
-                if (channel_buffer[3])
-                    *ptr_x++ = exr_halflt2uint(bytestream_get_le16(&a));
+        av_assert1(s->pixel_type == EXR_UINT);
+        ptr = p->data[0] + line * p->linesize[0] + (col * s->desc->nb_components * 2);
+
+        for (i = 0; i < td->ysize; i++, ptr += p->linesize[0]) {
+
+            const uint8_t * a;
+            const uint8_t *rgb[3];
+            uint16_t *ptr_x;
+
+            for (c = 0; c < rgb_channel_count; c++) {
+                rgb[c] = channel_buffer[c];
             }
-        } else if (s->pixel_type == EXR_UINT) {
+
+            if (channel_buffer[3])
+                a = channel_buffer[3];
+
+            ptr_x = (uint16_t *) ptr;
+
+            // Zero out the start if xmin is not 0
+            memset(ptr_x, 0, bxmin);
+            ptr_x += s->xmin * s->desc->nb_components;
+
             for (x = 0; x < td->xsize; x++) {
                 for (c = 0; c < rgb_channel_count; c++) {
                     *ptr_x++ = bytestream_get_le32(&rgb[c]) >> 16;
@@ -1246,16 +1224,16 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
                 if (channel_buffer[3])
                     *ptr_x++ = bytestream_get_le32(&a) >> 16;
             }
-        }
 
-        // Zero out the end if xmax+1 is not w
-        memset(ptr_x, 0, axmax);
+            // Zero out the end if xmax+1 is not w
+            memset(ptr_x, 0, axmax);
 
-        channel_buffer[0] += td->channel_line_size;
-        channel_buffer[1] += td->channel_line_size;
-        channel_buffer[2] += td->channel_line_size;
-        if (channel_buffer[3])
-            channel_buffer[3] += td->channel_line_size;
+            channel_buffer[0] += td->channel_line_size;
+            channel_buffer[1] += td->channel_line_size;
+            channel_buffer[2] += td->channel_line_size;
+            if (channel_buffer[3])
+                channel_buffer[3] += td->channel_line_size;
+        }
     }
 
     return 0;
@@ -1676,7 +1654,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     AVFrame *picture = data;
     uint8_t *ptr;
 
-    int y, ret;
+    int i, y, ret;
+    int planes;
     int out_line_size;
     int nb_blocks;   /* nb scanline or nb tile */
     uint64_t start_offset_table;
@@ -1691,6 +1670,21 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     switch (s->pixel_type) {
     case EXR_FLOAT:
     case EXR_HALF:
+        if (s->channel_offsets[3] >= 0) {
+            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;
+            }
+        } else {
+            if (!s->is_luma) {
+                avctx->pix_fmt = AV_PIX_FMT_GBRPF32;
+            } else {
+                avctx->pix_fmt = AV_PIX_FMT_GRAYF32;
+            }
+        }
+        break;
     case EXR_UINT:
         if (s->channel_offsets[3] >= 0) {
             if (!s->is_luma) {
@@ -1751,7 +1745,14 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     s->desc          = av_pix_fmt_desc_get(avctx->pix_fmt);
     if (!s->desc)
         return AVERROR_INVALIDDATA;
-    out_line_size    = avctx->width * 2 * s->desc->nb_components;
+
+    if (s->desc->flags & AV_PIX_FMT_FLAG_FLOAT) {
+        planes           = s->desc->nb_components;
+        out_line_size    = avctx->width * 4;
+    } else {
+        planes           = 1;
+        out_line_size    = avctx->width * 2 * s->desc->nb_components;
+    }
 
     if (s->is_tile) {
         nb_blocks = ((s->xdelta + s->tile_attr.xSize - 1) / s->tile_attr.xSize) *
@@ -1789,12 +1790,14 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     // save pointer we are going to use in decode_block
     s->buf      = avpkt->data;
     s->buf_size = avpkt->size;
-    ptr         = picture->data[0];
 
     // Zero out the start if ymin is not 0
-    for (y = 0; y < s->ymin; y++) {
-        memset(ptr, 0, out_line_size);
-        ptr += picture->linesize[0];
+    for (i = 0; i < planes; i++) {
+        ptr = picture->data[i];
+        for (y = 0; y < s->ymin; y++) {
+            memset(ptr, 0, out_line_size);
+            ptr += picture->linesize[i];
+        }
     }
 
     s->picture = picture;
@@ -1802,10 +1805,12 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     avctx->execute2(avctx, decode_block, s->thread_data, NULL, nb_blocks);
 
     // Zero out the end if ymax+1 is not h
-    ptr = picture->data[0] + ((s->ymax+1) * picture->linesize[0]);
-    for (y = s->ymax + 1; y < avctx->height; y++) {
-        memset(ptr, 0, out_line_size);
-        ptr += picture->linesize[0];
+    for (i = 0; i < planes; i++) {
+        ptr = picture->data[i] + ((s->ymax+1) * picture->linesize[i]);
+        for (y = s->ymax + 1; y < avctx->height; y++) {
+            memset(ptr, 0, out_line_size);
+            ptr += picture->linesize[i];
+        }
     }
 
     picture->pict_type = AV_PICTURE_TYPE_I;
@@ -1835,21 +1840,22 @@ static av_cold int decode_init(AVCodecContext *avctx)
         for (i = 0; i < 65536; ++i) {
             t = exr_half2float(i);
             t.f = trc_func(t.f);
-            s->gamma_table[i] = exr_flt2uint(t.i);
+            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] = exr_halflt2uint(i);
+            for (i = 0; i < 65536; ++i) {
+                s->gamma_table[i] = exr_half2float(i);
+            }
         } else {
             for (i = 0; i < 65536; ++i) {
                 t = exr_half2float(i);
                 /* If negative value we reuse half value */
                 if (t.f <= 0.0f) {
-                    s->gamma_table[i] = exr_halflt2uint(i);
+                    s->gamma_table[i] = t;
                 } else {
                     t.f = powf(t.f, one_gamma);
-                    s->gamma_table[i] = exr_flt2uint(t.i);
+                    s->gamma_table[i] = t;
                 }
             }
         }

diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 121405aab9cc6ffa88b2b1718c238e1364daf9cc..44fd06c294ab967f2811fbe21d9d3651b51792d0 100644 (file)
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -98,154 +98,154 @@ FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser
 fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx -sws_flags +accurate_rnd+bitexact
 
 FATE_EXR += fate-exr-slice-raw
-fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le
+fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-slice-rle
-fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -pix_fmt rgba64le
+fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-slice-zip1
-fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -pix_fmt rgba64le
+fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-slice-zip16
-fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -pix_fmt rgba64le
+fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-slice-pxr24
-fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt rgb48le
+fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-pxr24-float-12x8
-fate-exr-rgb-scanline-pxr24-float-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_12x8.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-pxr24-float-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_12x8.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgba-multiscanline-half-b44
-fate-exr-rgba-multiscanline-half-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_multiscanline_half_b44.exr -pix_fmt rgba64le
+fate-exr-rgba-multiscanline-half-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_multiscanline_half_b44.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-float-b44
-fate-exr-rgb-scanline-float-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_b44.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-float-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_b44.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-half-b44-12x8
-fate-exr-rgb-scanline-half-b44-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_12x8.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-half-b44-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_12x8.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-half-b44-13x9
-fate-exr-rgb-scanline-half-b44-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_13x9.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-half-b44-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_13x9.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-float-raw-12x8
-fate-exr-rgb-tile-float-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_12x8.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-float-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_12x8.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-float-raw-150x130
-fate-exr-rgb-tile-float-raw-150x130: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_150x130.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-float-raw-150x130: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_150x130.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-half-raw-12x8
-fate-exr-rgb-tile-half-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_raw_12x8.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-half-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_raw_12x8.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44-13x9-l1
-fate-exr-rgba-scanline-float-half-b44-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44-13x9-l2
-fate-exr-rgba-scanline-float-half-b44-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44-12x8-l1
-fate-exr-rgba-scanline-float-half-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44-12x8-l2
-fate-exr-rgba-scanline-float-half-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-12x8-l1
-fate-exr-rgba-scanline-float-half-b44a-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44a-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-12x8-l2
-fate-exr-rgba-scanline-float-half-b44a-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44a-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-13x9-l1
-fate-exr-rgba-scanline-float-half-b44a-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44a-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-13x9-l2
-fate-exr-rgba-scanline-float-half-b44a-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt rgba64le
+fate-exr-rgba-scanline-float-half-b44a-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-pxr24-float-half-l1
-fate-exr-rgb-tile-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-pxr24-float-half-l2
-fate-exr-rgb-tile-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-pxr24-half-float-l1
-fate-exr-rgb-tile-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-pxr24-half-float-l2
-fate-exr-rgb-tile-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-half-float-b44-12x8-l1
-fate-exr-rgb-tile-half-float-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-half-float-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-half-float-b44-12x8-l2
-fate-exr-rgb-tile-half-float-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-half-float-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-zip-half-float-l1
-fate-exr-rgb-tile-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-zip-half-float-l2
-fate-exr-rgb-tile-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-zip1-half-float-l1
-fate-exr-rgb-tile-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-zip1-half-float-l2
-fate-exr-rgb-tile-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-rle-half-float-l1
-fate-exr-rgb-tile-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-rle-half-float-l2
-fate-exr-rgb-tile-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-tile-raw-half-float-l1
-fate-exr-rgb-tile-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-tile-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-tile-raw-half-float-l2
-fate-exr-rgb-tile-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-tile-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-b44-half-float-12x8-l1
-fate-exr-rgb-scanline-b44-half-float-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-b44-half-float-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-b44-half-float-12x8-l2
-fate-exr-rgb-scanline-b44-half-float-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-b44-half-float-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-pxr24-half-float-l1
-fate-exr-rgb-scanline-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-pxr24-half-float-l2
-fate-exr-rgb-scanline-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l1
-fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l2
-fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-pxr24-half-uint32-13x9
 fate-exr-rgb-scanline-pxr24-half-uint32-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_uint32_13x9.exr -pix_fmt rgb48le
 
 FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l1
-fate-exr-rgb-scanline-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l2
-fate-exr-rgb-scanline-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l1
-fate-exr-rgb-scanline-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l2
-fate-exr-rgb-scanline-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-rle-half-float-l1
-fate-exr-rgb-scanline-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-rle-half-float-l2
-fate-exr-rgb-scanline-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l1
-fate-exr-rgb-scanline-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l2
-fate-exr-rgb-scanline-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt rgba64le
+fate-exr-rgb-scanline-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt gbrapf32le
 
 FATE_EXR += fate-exr-rgb-scanline-b44-uint32
 fate-exr-rgb-scanline-b44-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_uint32.exr -pix_fmt rgb48le
@@ -254,38 +254,38 @@ FATE_EXR += fate-exr-rgb-scanline-pxr24-uint32
 fate-exr-rgb-scanline-pxr24-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_uint32.exr -pix_fmt rgb48le
 
 FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets
-fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float_zero_offsets.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float_zero_offsets.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-half-piz-bw
-fate-exr-rgb-scanline-half-piz-bw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_bw.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-half-piz-bw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_bw.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-half-piz-color
-fate-exr-rgb-scanline-half-piz-color: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_color.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-half-piz-color: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_color.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-t01
-fate-exr-rgb-scanline-half-piz-dw-t01: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t01.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-half-piz-dw-t01: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t01.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-float-piz-48x32
-fate-exr-rgb-scanline-float-piz-48x32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_piz_48x32.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-float-piz-48x32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_piz_48x32.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgb-scanline-none-negative-red
-fate-exr-rgb-scanline-none-negative-red: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_none_negative_red.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-none-negative-red: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_none_negative_red.exr -pix_fmt gbrpf32le
 
 
 FATE_EXR += fate-exr-rgb-b44a-half-negative-4x4
-fate-exr-rgb-b44a-half-negative-4x4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_b44a_half_negative_4x4.exr -pix_fmt rgb48le
+fate-exr-rgb-b44a-half-negative-4x4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_b44a_half_negative_4x4.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-y-tile-zip-half-12x8
-fate-exr-y-tile-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_tile_zip_half_12x8.exr -pix_fmt gray16le
+fate-exr-y-tile-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_tile_zip_half_12x8.exr -pix_fmt grayf32le
 
 FATE_EXR += fate-exr-y-scanline-zip-half-12x8
-fate-exr-y-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_scanline_zip_half_12x8.exr -pix_fmt gray16le
+fate-exr-y-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_scanline_zip_half_12x8.exr -pix_fmt grayf32le
 
 FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-t08
-fate-exr-rgb-scanline-half-piz-dw-t08: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t08.exr -pix_fmt rgb48le
+fate-exr-rgb-scanline-half-piz-dw-t08: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t08.exr -pix_fmt gbrpf32le
 
 FATE_EXR += fate-exr-rgba-zip16-16x32-flag4
-fate-exr-rgba-zip16-16x32-flag4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_zip16_16x32_flag4.exr -pix_fmt rgba64le
+fate-exr-rgba-zip16-16x32-flag4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_zip16_16x32_flag4.exr -pix_fmt gbrapf32le
 
 FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR)
 

diff --git a/tests/ref/fate/exr-rgb-b44a-half-negative-4x4 b/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
index 2ff4e9742b7c348b720590018c01e99b0f78848a..82e3f74cd569d2e25559bcc9c2f19a1c263dbd68 100644 (file)
--- a/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
+++ b/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 4x4
 #sar 0: 1/1
-0,          0,          0,        1,       96, 0x70600260
+0,          0,          0,        1,      192, 0x5b8e39c0

diff --git a/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1 b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
index a19b500c901c80d37876de2f08922da80c0e67d1..e900164b8ce55e0671b2d640c3ba0b90cd69bbc9 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
+++ b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0xa1a70fac
+0,          0,          0,        1,     1152, 0x577d5150

diff --git a/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2 b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
+++ b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-scanline-float-b44 b/tests/ref/fate/exr-rgb-scanline-float-b44
index 91b0e1fba13ac6cc5cfd9140a97b839604063e64..6c1671377e901d4491971be2ad1927cd7f42f670 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-float-b44
+++ b/tests/ref/fate/exr-rgb-scanline-float-b44
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x39c8e03e
+0,          0,          0,        1,     1152, 0x18e0f4d9

diff --git a/tests/ref/fate/exr-rgb-scanline-float-piz-48x32 b/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
index d1a5d90ee2f4f74898a7e7eb710067efeca216c7..d9501e75940c490a2c19bb03d260bb598798163f 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
+++ b/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 48x32
 #sar 0: 1/1
-0,          0,          0,        1,     9216, 0x5b3f7a8e
+0,          0,          0,        1,    18432, 0x479e42a8

diff --git a/tests/ref/fate/exr-rgb-scanline-half-b44-12x8 b/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
index 8464203e7a0da1bb8e65283bf8b31a0b0d2293f1..2a63877ab905f87372c06f2cfcb3eddd209551c1 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
+++ b/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x506469f9
+0,          0,          0,        1,     1152, 0xe84d5b9d

diff --git a/tests/ref/fate/exr-rgb-scanline-half-b44-13x9 b/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
index 675d2f094904c13f4a911b8a0ac20b2269d4f949..a8136368ef941a521c311bcd0670f17dba3277d7 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
+++ b/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 13x9
 #sar 0: 1/1
-0,          0,          0,        1,      702, 0x6914838a
+0,          0,          0,        1,     1404, 0x252cc156

diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-bw b/tests/ref/fate/exr-rgb-scanline-half-piz-bw
index 6e08d528eba4bf842d86bc205bdd1c4ad61eb1ed..8dcab4196e887eaafd83f9af82f1bcd5de39ac54 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-half-piz-bw
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-bw
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 34x27
 #sar 0: 1/1
-0,          0,          0,        1,     5508, 0x36d15e2e
+0,          0,          0,        1,    11016, 0x1644e1f9

diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-color b/tests/ref/fate/exr-rgb-scanline-half-piz-color
index 21510792ff11bd893c53e49add16acf2f9b10f5c..0a7af94d7aa39cb7437919c2e70e9a10ccba8bae 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-half-piz-color
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-color
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 34x40
 #sar 0: 1/1
-0,          0,          0,        1,     8160, 0x9dd67b7d
+0,          0,          0,        1,    16320, 0xc40939ad

diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01 b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
index e135aed3ba49ed47c53d0de1ea194850db4c5883..6a77d850467fd8c2f5947abb4205f345127fdbbd 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 400x300
 #sar 0: 1/1
-0,          0,          0,        1,   720000, 0xe50fc9f8
+0,          0,          0,        1,  1440000, 0x4800b00b

diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08 b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
index a443c98d9de3f406399750378f754e4026a94b0f..7cf760334eb1fe31fb6e7a1282d3dfbe8612eab2 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 501x401
 #sar 0: 1/1
-0,          0,          0,        1,  1205406, 0xc45cc9f8
+0,          0,          0,        1,  2410812, 0x2dd1b00b

diff --git a/tests/ref/fate/exr-rgb-scanline-none-negative-red b/tests/ref/fate/exr-rgb-scanline-none-negative-red
index 8c399b2f5e648f78246a72dc0ee70c347c5f58c0..ae45873547d853ab08926910ca23c2b89be3835a 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-none-negative-red
+++ b/tests/ref/fate/exr-rgb-scanline-none-negative-red
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 4x4
 #sar 0: 1/1
-0,          0,          0,        1,       96, 0x27bc131b
+0,          0,          0,        1,      192, 0xc87b5685

diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8 b/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
index 13946d8e0322ec87378b8a4aabdd14c2124c0857..1a2e6e77f857ab7b91eef6b1d8081a3b6425e44c 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x7120e072
+0,          0,          0,        1,     1152, 0x046e63d0

diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1 b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
index 1f97a2fcb1ee387593cf9ccadc2729e64ed830d0..df84ed39aa65eb8deb2109f2b3ab79ea30e2a6eb 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0xbd350af8
+0,          0,          0,        1,     1152, 0xd9575c2d

diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2 b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
index e57f026f647199db2368f622893914e69c0aab67..4b50d0fd5e16bbf6154ba6e7c97dd432418b96e4 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0xadb27043
+0,          0,          0,        1,     1536, 0x04e1137d

diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
index 048e30d4d529768bbd8517238b4a29301a762494..3b6aa35b74906a1fe6ea7d235840ac09cff0eb92 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x78317b56
+0,          0,          0,        1,     1536, 0x03fb2399

diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9 b/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
index 50b85c8d1c955e91c151b58bf91fb90b392e01da..523ed9c88bc0db3949d450180555c977eb34bdbf 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 13x9
 #sar 0: 9/10
-0,          0,          0,        1,      702, 0xf0212f1d
+0,          0,          0,        1,      702, 0x68c1450d

diff --git a/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
+++ b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
+++ b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
+++ b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
+++ b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
+++ b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
+++ b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
+++ b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
+++ b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
+++ b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-tile-float-raw-12x8 b/tests/ref/fate/exr-rgb-tile-float-raw-12x8
index abe41b8a7a7cbc53dff8f31784db4bf04a35d558..c1ef672477ff46476e50265dd69a703e22623352 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-float-raw-12x8
+++ b/tests/ref/fate/exr-rgb-tile-float-raw-12x8
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x6b950ce3
+0,          0,          0,        1,     1152, 0xea4ae7b7

diff --git a/tests/ref/fate/exr-rgb-tile-float-raw-150x130 b/tests/ref/fate/exr-rgb-tile-float-raw-150x130
index 3ac5c28df10b24b54e90515cf6c1669631acfbb4..44f05f9acb46c09b6f3e252223d9d7602613959c 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-float-raw-150x130
+++ b/tests/ref/fate/exr-rgb-tile-float-raw-150x130
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 150x130
 #sar 0: 1/1
-0,          0,          0,        1,   117000, 0xabc5eab2
+0,          0,          0,        1,   234000, 0xeb8582d5

diff --git a/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1 b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
index a19b500c901c80d37876de2f08922da80c0e67d1..e900164b8ce55e0671b2d640c3ba0b90cd69bbc9 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
+++ b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0xa1a70fac
+0,          0,          0,        1,     1152, 0x577d5150

diff --git a/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2 b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
+++ b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-tile-half-raw-12x8 b/tests/ref/fate/exr-rgb-tile-half-raw-12x8
index f59e248d695c7cd360bd472e848c3d7ca426bfb7..f2ff361949790dc6c95598972066df9ad1bcb214 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-half-raw-12x8
+++ b/tests/ref/fate/exr-rgb-tile-half-raw-12x8
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x667903f5
+0,          0,          0,        1,     1152, 0xd3614640

diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1 b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
index 1f97a2fcb1ee387593cf9ccadc2729e64ed830d0..df84ed39aa65eb8deb2109f2b3ab79ea30e2a6eb 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0xbd350af8
+0,          0,          0,        1,     1152, 0xd9575c2d

diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2 b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
index e57f026f647199db2368f622893914e69c0aab67..4b50d0fd5e16bbf6154ba6e7c97dd432418b96e4 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0xadb27043
+0,          0,          0,        1,     1536, 0x04e1137d

diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1 b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2 b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
index 048e30d4d529768bbd8517238b4a29301a762494..3b6aa35b74906a1fe6ea7d235840ac09cff0eb92 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x78317b56
+0,          0,          0,        1,     1536, 0x03fb2399

diff --git a/tests/ref/fate/exr-rgb-tile-raw-half-float-l1 b/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
+++ b/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-tile-raw-half-float-l2 b/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
+++ b/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-tile-rle-half-float-l1 b/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
+++ b/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-tile-rle-half-float-l2 b/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
+++ b/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-tile-zip-half-float-l1 b/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
+++ b/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-tile-zip-half-float-l2 b/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
+++ b/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1 b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
index af042043e7ee9f9488d744736f16bf16d0ac86d6..ec431d3d85faa450dd3d8de2a4d45d7919cdc04d 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
+++ b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      576, 0x5ede004c
+0,          0,          0,        1,     1152, 0x8f8c4a81

diff --git a/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2 b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
index 444fb566d23cecd72e8866870f94b188020264e1..f577b7ad35baf7006819deae03defb048309307c 100644 (file)
--- a/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
+++ b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      768, 0x22f77b1c
+0,          0,          0,        1,     1536, 0xb8d48218

diff --git a/tests/ref/fate/exr-rgba-multiscanline-half-b44 b/tests/ref/fate/exr-rgba-multiscanline-half-b44
index 4b9a88ba5226e15364c95793f7daafcb28cc2e07..964bf2e65e4f6ef3742457176d6a35d0700027ca 100644 (file)
--- a/tests/ref/fate/exr-rgba-multiscanline-half-b44
+++ b/tests/ref/fate/exr-rgba-multiscanline-half-b44
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 935x251
 #sar 0: 1/1
-0,          0,          0,        1,  1877480, 0x6f28b860
+0,          0,          0,        1,  3754960, 0x4d48a1b2

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
index cd25f618f416d62f916872e6c18f2df11a0da1b7..f2b35237e4122e63ec3559714a9175f9a61d9663 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 9/10
-0,          0,          0,        1,      768, 0x1de5c7f1
+0,          0,          0,        1,     1536, 0xd5802c0c

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
index ecfba85e83dc3aee0445d3bf45b4e831a6b9c12a..825bfafd693a93623c8e4eef361f1de48fc1f4db 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 9/10
-0,          0,          0,        1,      768, 0xe08ca6d3
+0,          0,          0,        1,     1536, 0x0fca2ff9

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
index 3e82e2aaa43f4b3d3e7fddc38aa3dbacfc8bf3b2..e200b2f9f0c4028eed61c20fb389f63f751be493 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 13x9
 #sar 0: 9/10
-0,          0,          0,        1,      936, 0xdcb42186
+0,          0,          0,        1,     1872, 0xe9968f61

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
index f237d17d3f4468811f938a0c46026c2a171df5b5..ee5579c039533205df6de94d1cab232ed5112f99 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 13x9
 #sar 0: 9/10
-0,          0,          0,        1,      936, 0x7f710bf5
+0,          0,          0,        1,     1872, 0xf99e750e

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
index 43313e37126d4dec4f056794237d4edcb31803b7..fdfa6d22fdeb7556fbad75ece23f15a777e42167 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 9/10
-0,          0,          0,        1,      768, 0xe200c160
+0,          0,          0,        1,     1536, 0x4dec255f

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
index ecfba85e83dc3aee0445d3bf45b4e831a6b9c12a..825bfafd693a93623c8e4eef361f1de48fc1f4db 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 9/10
-0,          0,          0,        1,      768, 0xe08ca6d3
+0,          0,          0,        1,     1536, 0x0fca2ff9

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
index e43c31ebd54b6a97af5378b3a6d87c32a442fc43..20dc4bd8d54c4fc338049167820e016ac567c6e1 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 13x9
 #sar 0: 9/10
-0,          0,          0,        1,      936, 0x911718ac
+0,          0,          0,        1,     1872, 0x84b88e40

diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
index f237d17d3f4468811f938a0c46026c2a171df5b5..ee5579c039533205df6de94d1cab232ed5112f99 100644 (file)
--- a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 13x9
 #sar 0: 9/10
-0,          0,          0,        1,      936, 0x7f710bf5
+0,          0,          0,        1,     1872, 0xf99e750e

diff --git a/tests/ref/fate/exr-rgba-zip16-16x32-flag4 b/tests/ref/fate/exr-rgba-zip16-16x32-flag4
index e34aa711eab7f99b675a4e47f67eae36d1614b0d..66ecafc777b5d9088f8314e638a121bb1769b332 100644 (file)
--- a/tests/ref/fate/exr-rgba-zip16-16x32-flag4
+++ b/tests/ref/fate/exr-rgba-zip16-16x32-flag4
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 16x32
 #sar 0: 1/1
-0,          0,          0,        1,     4096, 0xf90ab1e9
+0,          0,          0,        1,     8192, 0x87767180

diff --git a/tests/ref/fate/exr-slice-pxr24 b/tests/ref/fate/exr-slice-pxr24
index 99fbc0507457b14e868d85f5558029a4ac07de38..79dfa546f4ac6076223df67d2e59e854a098468c 100644 (file)
--- a/tests/ref/fate/exr-slice-pxr24
+++ b/tests/ref/fate/exr-slice-pxr24
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 800x800
 #sar 0: 1/1
-0,          0,          0,        1,  3840000, 0xdcfb341d
+0,          0,          0,        1,  7680000, 0x98f60162

diff --git a/tests/ref/fate/exr-slice-raw b/tests/ref/fate/exr-slice-raw
index cbe124b3e16a8fe3114fa0016ff04984de63d68e..c7096e4d2ad36bd0559491fd4a259323025ee067 100644 (file)
--- a/tests/ref/fate/exr-slice-raw
+++ b/tests/ref/fate/exr-slice-raw
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 587x675
 #sar 0: 1/1
-0,          0,          0,        1,  3169800, 0x6a356d0d
+0,          0,          0,        1,  6339600, 0x4f2b496b

diff --git a/tests/ref/fate/exr-slice-rle b/tests/ref/fate/exr-slice-rle
index cbe124b3e16a8fe3114fa0016ff04984de63d68e..c7096e4d2ad36bd0559491fd4a259323025ee067 100644 (file)
--- a/tests/ref/fate/exr-slice-rle
+++ b/tests/ref/fate/exr-slice-rle
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 587x675
 #sar 0: 1/1
-0,          0,          0,        1,  3169800, 0x6a356d0d
+0,          0,          0,        1,  6339600, 0x4f2b496b

diff --git a/tests/ref/fate/exr-slice-zip1 b/tests/ref/fate/exr-slice-zip1
index cbe124b3e16a8fe3114fa0016ff04984de63d68e..c7096e4d2ad36bd0559491fd4a259323025ee067 100644 (file)
--- a/tests/ref/fate/exr-slice-zip1
+++ b/tests/ref/fate/exr-slice-zip1
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 587x675
 #sar 0: 1/1
-0,          0,          0,        1,  3169800, 0x6a356d0d
+0,          0,          0,        1,  6339600, 0x4f2b496b

diff --git a/tests/ref/fate/exr-slice-zip16 b/tests/ref/fate/exr-slice-zip16
index cbe124b3e16a8fe3114fa0016ff04984de63d68e..c7096e4d2ad36bd0559491fd4a259323025ee067 100644 (file)
--- a/tests/ref/fate/exr-slice-zip16
+++ b/tests/ref/fate/exr-slice-zip16
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 587x675
 #sar 0: 1/1
-0,          0,          0,        1,  3169800, 0x6a356d0d
+0,          0,          0,        1,  6339600, 0x4f2b496b

diff --git a/tests/ref/fate/exr-y-scanline-zip-half-12x8 b/tests/ref/fate/exr-y-scanline-zip-half-12x8
index 2a62164256c6393c9ef3d8532b19a2d3e6244df7..f6ef06a2a05881f4721420b5bdf8d8bb0dbbd029 100644 (file)
--- a/tests/ref/fate/exr-y-scanline-zip-half-12x8
+++ b/tests/ref/fate/exr-y-scanline-zip-half-12x8
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      192, 0xdd5759b5
+0,          0,          0,        1,      384, 0x911475c4

diff --git a/tests/ref/fate/exr-y-tile-zip-half-12x8 b/tests/ref/fate/exr-y-tile-zip-half-12x8
index 2a62164256c6393c9ef3d8532b19a2d3e6244df7..f6ef06a2a05881f4721420b5bdf8d8bb0dbbd029 100644 (file)
--- a/tests/ref/fate/exr-y-tile-zip-half-12x8
+++ b/tests/ref/fate/exr-y-tile-zip-half-12x8
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 12x8
 #sar 0: 1/1
-0,          0,          0,        1,      192, 0xdd5759b5
+0,          0,          0,        1,      384, 0x911475c4