Hello,
Patches attached.
From 39f7a74977feb229760b78525cf298f99ebf088d Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sat, 2 Jul 2022 15:05:33 +0200
Subject: [PATCH 3/3] fate: add exr encoder tests
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
tests/fate/lavf-image.mak | 24 ++++++++++++++++++++++++
tests/ref/lavf/none.gbrapf32le.exr | 3 +++
tests/ref/lavf/none.gbrpf32le.exr | 3 +++
tests/ref/lavf/none.grayf32le.exr | 3 +++
tests/ref/lavf/rle.gbrapf32le.exr | 3 +++
tests/ref/lavf/rle.gbrpf32le.exr | 3 +++
tests/ref/lavf/rle.grayf32le.exr | 3 +++
tests/ref/lavf/zip1.gbrapf32le.exr | 3 +++
tests/ref/lavf/zip1.gbrpf32le.exr | 3 +++
tests/ref/lavf/zip1.grayf32le.exr | 3 +++
tests/ref/lavf/zip16.gbrapf32le.exr | 3 +++
tests/ref/lavf/zip16.gbrpf32le.exr | 3 +++
tests/ref/lavf/zip16.grayf32le.exr | 3 +++
13 files changed, 60 insertions(+)
create mode 100644 tests/ref/lavf/none.gbrapf32le.exr
create mode 100644 tests/ref/lavf/none.gbrpf32le.exr
create mode 100644 tests/ref/lavf/none.grayf32le.exr
create mode 100644 tests/ref/lavf/rle.gbrapf32le.exr
create mode 100644 tests/ref/lavf/rle.gbrpf32le.exr
create mode 100644 tests/ref/lavf/rle.grayf32le.exr
create mode 100644 tests/ref/lavf/zip1.gbrapf32le.exr
create mode 100644 tests/ref/lavf/zip1.gbrpf32le.exr
create mode 100644 tests/ref/lavf/zip1.grayf32le.exr
create mode 100644 tests/ref/lavf/zip16.gbrapf32le.exr
create mode 100644 tests/ref/lavf/zip16.gbrpf32le.exr
create mode 100644 tests/ref/lavf/zip16.grayf32le.exr
diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak
index 22ab84636d..38d3689abf 100644
--- a/tests/fate/lavf-image.mak
+++ b/tests/fate/lavf-image.mak
@@ -9,6 +9,18 @@ FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += gbrp12le.dpx
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgb48le.dpx
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgb48le_10.dpx
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += rgba64le.dpx
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += none.grayf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += none.gbrpf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += none.gbrapf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += rle.grayf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += rle.gbrpf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += rle.gbrapf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += zip1.grayf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += zip1.gbrpf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += zip1.gbrapf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += zip16.grayf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += zip16.gbrpf32le.exr
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, EXR) += zip16.gbrapf32le.exr
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, MJPEG) += jpg
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += pam
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += rgba.pam
@@ -47,6 +59,18 @@ $(FATE_LAVF_IMAGES): CMD = lavf_image
$(FATE_LAVF_IMAGES): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
$(FATE_LAVF_IMAGES): $(VREF)
+fate-lavf-none.grayf32le.exr: CMD = lavf_image "-compression none -pix_fmt grayf32le"
+fate-lavf-rle.grayf32le.exr: CMD = lavf_image "-compression rle -pix_fmt grayf32le"
+fate-lavf-zip1.grayf32le.exr: CMD = lavf_image "-compression zip1 -pix_fmt grayf32le"
+fate-lavf-zip16.grayf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt grayf32le"
+fate-lavf-none.gbrpf32le.exr: CMD = lavf_image "-compression none -pix_fmt gbrpf32le"
+fate-lavf-rle.gbrpf32le.exr: CMD = lavf_image "-compression rle -pix_fmt gbrpf32le"
+fate-lavf-zip1.gbrpf32le.exr: CMD = lavf_image "-compression zip1 -pix_fmt gbrpf32le"
+fate-lavf-zip16.gbrpf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt gbrpf32le"
+fate-lavf-none.gbrapf32le.exr: CMD = lavf_image "-compression none -pix_fmt gbrapf32le"
+fate-lavf-rle.gbrapf32le.exr: CMD = lavf_image "-compression rle -pix_fmt gbrapf32le"
+fate-lavf-zip1.gbrapf32le.exr: CMD = lavf_image "-compression zip1 -pix_fmt gbrapf32le"
+fate-lavf-zip16.gbrapf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt gbrapf32le"
fate-lavf-jpg: CMD = lavf_image "-pix_fmt yuvj420p"
fate-lavf-tiff: CMD = lavf_image "-pix_fmt rgb24"
fate-lavf-gbrp10le.dpx: CMD = lavf_image "-pix_fmt gbrp10le" "-pix_fmt gbrp10le"
diff --git a/tests/ref/lavf/none.gbrapf32le.exr b/tests/ref/lavf/none.gbrapf32le.exr
new file mode 100644
index 0000000000..3250be2ccc
--- /dev/null
+++ b/tests/ref/lavf/none.gbrapf32le.exr
@@ -0,0 +1,3 @@
+c586035e67f9ba7f2a3777933b5b22a0 *tests/data/images/none.gbrapf32le.exr/02.none.gbrapf32le.exr
+tests/data/images/none.gbrapf32le.exr/%02d.none.gbrapf32le.exr CRC=0x068aca4e
+1627003 tests/data/images/none.gbrapf32le.exr/02.none.gbrapf32le.exr
diff --git a/tests/ref/lavf/none.gbrpf32le.exr b/tests/ref/lavf/none.gbrpf32le.exr
new file mode 100644
index 0000000000..41c43e372a
--- /dev/null
+++ b/tests/ref/lavf/none.gbrpf32le.exr
@@ -0,0 +1,3 @@
+10f42423c6585fe5053c5457fba7b235 *tests/data/images/none.gbrpf32le.exr/02.none.gbrpf32le.exr
+tests/data/images/none.gbrpf32le.exr/%02d.none.gbrpf32le.exr CRC=0x95e1053f
+1221481 tests/data/images/none.gbrpf32le.exr/02.none.gbrpf32le.exr
diff --git a/tests/ref/lavf/none.grayf32le.exr b/tests/ref/lavf/none.grayf32le.exr
new file mode 100644
index 0000000000..19ab9a2d20
--- /dev/null
+++ b/tests/ref/lavf/none.grayf32le.exr
@@ -0,0 +1,3 @@
+8aa28b10bf2591b7030b78bc29907293 *tests/data/images/none.grayf32le.exr/02.none.grayf32le.exr
+tests/data/images/none.grayf32le.exr/%02d.none.grayf32le.exr CRC=0x5443a443
+410437 tests/data/images/none.grayf32le.exr/02.none.grayf32le.exr
diff --git a/tests/ref/lavf/rle.gbrapf32le.exr b/tests/ref/lavf/rle.gbrapf32le.exr
new file mode 100644
index 0000000000..e8093dacc9
--- /dev/null
+++ b/tests/ref/lavf/rle.gbrapf32le.exr
@@ -0,0 +1,3 @@
+94398a5ce98bb7b1b78b2b807306f6d7 *tests/data/images/rle.gbrapf32le.exr/02.rle.gbrapf32le.exr
+tests/data/images/rle.gbrapf32le.exr/%02d.rle.gbrapf32le.exr CRC=0x068aca4e
+1436849 tests/data/images/rle.gbrapf32le.exr/02.rle.gbrapf32le.exr
diff --git a/tests/ref/lavf/rle.gbrpf32le.exr b/tests/ref/lavf/rle.gbrpf32le.exr
new file mode 100644
index 0000000000..beb8bf4a64
--- /dev/null
+++ b/tests/ref/lavf/rle.gbrpf32le.exr
@@ -0,0 +1,3 @@
+fed878e1f4391314c37088085942e572 *tests/data/images/rle.gbrpf32le.exr/02.rle.gbrpf32le.exr
+tests/data/images/rle.gbrpf32le.exr/%02d.rle.gbrpf32le.exr CRC=0x95e1053f
+1208298 tests/data/images/rle.gbrpf32le.exr/02.rle.gbrpf32le.exr
diff --git a/tests/ref/lavf/rle.grayf32le.exr b/tests/ref/lavf/rle.grayf32le.exr
new file mode 100644
index 0000000000..883b1d6446
--- /dev/null
+++ b/tests/ref/lavf/rle.grayf32le.exr
@@ -0,0 +1,3 @@
+2841f839cb5aa98bb7aded800dda7cc7 *tests/data/images/rle.grayf32le.exr/02.rle.grayf32le.exr
+tests/data/images/rle.grayf32le.exr/%02d.rle.grayf32le.exr CRC=0x5443a443
+410437 tests/data/images/rle.grayf32le.exr/02.rle.grayf32le.exr
diff --git a/tests/ref/lavf/zip1.gbrapf32le.exr b/tests/ref/lavf/zip1.gbrapf32le.exr
new file mode 100644
index 0000000000..7b2f21b893
--- /dev/null
+++ b/tests/ref/lavf/zip1.gbrapf32le.exr
@@ -0,0 +1,3 @@
+9fca73aac1a2e38969bed55929da48b4 *tests/data/images/zip1.gbrapf32le.exr/02.zip1.gbrapf32le.exr
+tests/data/images/zip1.gbrapf32le.exr/%02d.zip1.gbrapf32le.exr CRC=0x068aca4e
+902782 tests/data/images/zip1.gbrapf32le.exr/02.zip1.gbrapf32le.exr
diff --git a/tests/ref/lavf/zip1.gbrpf32le.exr b/tests/ref/lavf/zip1.gbrpf32le.exr
new file mode 100644
index 0000000000..a986591146
--- /dev/null
+++ b/tests/ref/lavf/zip1.gbrpf32le.exr
@@ -0,0 +1,3 @@
+a405ee4328719c53f97d351b5910e82b *tests/data/images/zip1.gbrpf32le.exr/02.zip1.gbrpf32le.exr
+tests/data/images/zip1.gbrpf32le.exr/%02d.zip1.gbrpf32le.exr CRC=0x95e1053f
+897319 tests/data/images/zip1.gbrpf32le.exr/02.zip1.gbrpf32le.exr
diff --git a/tests/ref/lavf/zip1.grayf32le.exr b/tests/ref/lavf/zip1.grayf32le.exr
new file mode 100644
index 0000000000..b89ceb22df
--- /dev/null
+++ b/tests/ref/lavf/zip1.grayf32le.exr
@@ -0,0 +1,3 @@
+76fe15b4e0b735a6318ca273ff52fb58 *tests/data/images/zip1.grayf32le.exr/02.zip1.grayf32le.exr
+tests/data/images/zip1.grayf32le.exr/%02d.zip1.grayf32le.exr CRC=0x5443a443
+91044 tests/data/images/zip1.grayf32le.exr/02.zip1.grayf32le.exr
diff --git a/tests/ref/lavf/zip16.gbrapf32le.exr b/tests/ref/lavf/zip16.gbrapf32le.exr
new file mode 100644
index 0000000000..830ae0fe50
--- /dev/null
+++ b/tests/ref/lavf/zip16.gbrapf32le.exr
@@ -0,0 +1,3 @@
+8beb8db200e658e74fdd4ed4c4ca9214 *tests/data/images/zip16.gbrapf32le.exr/02.zip16.gbrapf32le.exr
+tests/data/images/zip16.gbrapf32le.exr/%02d.zip16.gbrapf32le.exr CRC=0x068aca4e
+807513 tests/data/images/zip16.gbrapf32le.exr/02.zip16.gbrapf32le.exr
diff --git a/tests/ref/lavf/zip16.gbrpf32le.exr b/tests/ref/lavf/zip16.gbrpf32le.exr
new file mode 100644
index 0000000000..27fa2a7c5b
--- /dev/null
+++ b/tests/ref/lavf/zip16.gbrpf32le.exr
@@ -0,0 +1,3 @@
+4bc7e2640ea086b7fc31cbcd4fff19f5 *tests/data/images/zip16.gbrpf32le.exr/02.zip16.gbrpf32le.exr
+tests/data/images/zip16.gbrpf32le.exr/%02d.zip16.gbrpf32le.exr CRC=0x95e1053f
+796693 tests/data/images/zip16.gbrpf32le.exr/02.zip16.gbrpf32le.exr
diff --git a/tests/ref/lavf/zip16.grayf32le.exr b/tests/ref/lavf/zip16.grayf32le.exr
new file mode 100644
index 0000000000..24f82525bd
--- /dev/null
+++ b/tests/ref/lavf/zip16.grayf32le.exr
@@ -0,0 +1,3 @@
+5d5def6a4f16cef1122280d80c7c527d *tests/data/images/zip16.grayf32le.exr/02.zip16.grayf32le.exr
+tests/data/images/zip16.grayf32le.exr/%02d.zip16.grayf32le.exr CRC=0x5443a443
+63997 tests/data/images/zip16.grayf32le.exr/02.zip16.grayf32le.exr
--
2.36.1
From 4009d5f82db911012b6dae5fcc29625d1edd0f66 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sat, 2 Jul 2022 15:13:47 +0200
Subject: [PATCH 2/3] fate: add PFM encoder tests
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
tests/fate/lavf-image.mak | 8 ++++++++
tests/ref/lavf/gbrpf32be.pfm | 3 +++
tests/ref/lavf/gbrpf32le.pfm | 3 +++
tests/ref/lavf/grayf32be.pfm | 3 +++
tests/ref/lavf/grayf32le.pfm | 3 +++
5 files changed, 20 insertions(+)
create mode 100644 tests/ref/lavf/gbrpf32be.pfm
create mode 100644 tests/ref/lavf/gbrpf32le.pfm
create mode 100644 tests/ref/lavf/grayf32be.pfm
create mode 100644 tests/ref/lavf/grayf32le.pfm
diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak
index d3b3399578..22ab84636d 100644
--- a/tests/fate/lavf-image.mak
+++ b/tests/fate/lavf-image.mak
@@ -17,6 +17,10 @@ FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += gray16be.pam
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += rgb48be.pam
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PAM) += monob.pam
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PCX) += pcx
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PFM) += grayf32le.pfm
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PFM) += gbrpf32le.pfm
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PFM) += grayf32be.pfm
+FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PFM) += gbrpf32be.pfm
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PGM) += pgm
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += png
FATE_LAVF_IMAGES-$(call LAVF_IMAGES, PNG) += gray16be.png
@@ -55,6 +59,10 @@ fate-lavf-gray.pam: CMD = lavf_image "-pix_fmt gray"
fate-lavf-gray16be.pam: CMD = lavf_image "-pix_fmt gray16be" "-pix_fmt gray16be"
fate-lavf-rgb48be.pam: CMD = lavf_image "-pix_fmt rgb48be" "-pix_fmt rgb48be"
fate-lavf-monob.pam: CMD = lavf_image "-pix_fmt monob"
+fate-lavf-grayf32le.pfm: CMD = lavf_image "-pix_fmt grayf32le" "-pix_fmt grayf32le"
+fate-lavf-grayf32be.pfm: CMD = lavf_image "-pix_fmt grayf32be" "-pix_fmt grayf32be"
+fate-lavf-gbrpf32le.pfm: CMD = lavf_image "-pix_fmt gbrpf32le" "-pix_fmt gbrpf32le"
+fate-lavf-gbrpf32be.pfm: CMD = lavf_image "-pix_fmt gbrpf32be" "-pix_fmt gbrpf32be"
fate-lavf-gray16be.png: CMD = lavf_image "-pix_fmt gray16be"
fate-lavf-rgb48be.png: CMD = lavf_image "-pix_fmt rgb48be"
fate-lavf-rgba.xwd: CMD = lavf_image "-pix_fmt rgba"
diff --git a/tests/ref/lavf/gbrpf32be.pfm b/tests/ref/lavf/gbrpf32be.pfm
new file mode 100644
index 0000000000..2cd6354401
--- /dev/null
+++ b/tests/ref/lavf/gbrpf32be.pfm
@@ -0,0 +1,3 @@
+6d470f8d6018b95b45afafc14b7d161a *tests/data/images/gbrpf32be.pfm/02.gbrpf32be.pfm
+tests/data/images/gbrpf32be.pfm/%02d.gbrpf32be.pfm CRC=0x4b73053f
+1216532 tests/data/images/gbrpf32be.pfm/02.gbrpf32be.pfm
diff --git a/tests/ref/lavf/gbrpf32le.pfm b/tests/ref/lavf/gbrpf32le.pfm
new file mode 100644
index 0000000000..3ddd100443
--- /dev/null
+++ b/tests/ref/lavf/gbrpf32le.pfm
@@ -0,0 +1,3 @@
+892c5a05e1cbb3d2f7761d51e18b9c4c *tests/data/images/gbrpf32le.pfm/02.gbrpf32le.pfm
+tests/data/images/gbrpf32le.pfm/%02d.gbrpf32le.pfm CRC=0x95e1053f
+1216533 tests/data/images/gbrpf32le.pfm/02.gbrpf32le.pfm
diff --git a/tests/ref/lavf/grayf32be.pfm b/tests/ref/lavf/grayf32be.pfm
new file mode 100644
index 0000000000..05614a0f50
--- /dev/null
+++ b/tests/ref/lavf/grayf32be.pfm
@@ -0,0 +1,3 @@
+0f6df0d68d7dd30e67386b1255f443c9 *tests/data/images/grayf32be.pfm/02.grayf32be.pfm
+tests/data/images/grayf32be.pfm/%02d.grayf32be.pfm CRC=0xe3fda443
+405524 tests/data/images/grayf32be.pfm/02.grayf32be.pfm
diff --git a/tests/ref/lavf/grayf32le.pfm b/tests/ref/lavf/grayf32le.pfm
new file mode 100644
index 0000000000..a419daa650
--- /dev/null
+++ b/tests/ref/lavf/grayf32le.pfm
@@ -0,0 +1,3 @@
+145715872a894b1fde0105d8a0106191 *tests/data/images/grayf32le.pfm/02.grayf32le.pfm
+tests/data/images/grayf32le.pfm/%02d.grayf32le.pfm CRC=0x5443a443
+405525 tests/data/images/grayf32le.pfm/02.grayf32le.pfm
--
2.36.1
From f6fa87efb5e8231012af846a60af66c2f187d9c6 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sat, 2 Jul 2022 15:22:42 +0200
Subject: [PATCH 1/3] avcodec/pnmenc: support both endian variants for PFM
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavcodec/pnmenc.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index 258d919d32..db40f4b8e2 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -88,7 +88,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
n = avctx->width * 2;
h1 = (h * 3) / 2;
break;
- case AV_PIX_FMT_GBRPF32:
+ case AV_PIX_FMT_GBRPF32BE:
+ case AV_PIX_FMT_GBRPF32LE:
if (avctx->codec_id == AV_CODEC_ID_PFM) {
c = 'F';
n = avctx->width * 4;
@@ -97,7 +98,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
n = avctx->width * 2;
}
break;
- case AV_PIX_FMT_GRAYF32:
+ case AV_PIX_FMT_GRAYF32BE:
+ case AV_PIX_FMT_GRAYF32LE:
if (avctx->codec_id == AV_CODEC_ID_PFM) {
c = 'f';
n = avctx->width * 4;
@@ -112,22 +114,27 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
snprintf(bytestream, bytestream_end - bytestream,
"P%c\n%d %d\n", c, avctx->width, h1);
bytestream += strlen(bytestream);
- if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 ||
- avctx->pix_fmt == AV_PIX_FMT_GRAYF32)
+ if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32LE ||
+ avctx->pix_fmt == AV_PIX_FMT_GRAYF32LE ||
+ avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE ||
+ avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE)
snprintf(bytestream, bytestream_end - bytestream,
"%f\n", (avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE ||
avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE) ? 1.f: -1.f);
bytestream += strlen(bytestream);
if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE &&
- avctx->pix_fmt != AV_PIX_FMT_GBRPF32 &&
- avctx->pix_fmt != AV_PIX_FMT_GRAYF32) {
+ avctx->pix_fmt != AV_PIX_FMT_GBRPF32LE &&
+ avctx->pix_fmt != AV_PIX_FMT_GRAYF32LE &&
+ avctx->pix_fmt != AV_PIX_FMT_GBRPF32BE &&
+ avctx->pix_fmt != AV_PIX_FMT_GRAYF32BE) {
int maxdepth = (1 << av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth) - 1;
snprintf(bytestream, bytestream_end - bytestream,
"%d\n", maxdepth);
bytestream += strlen(bytestream);
}
- if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 && c == 'F') {
+ if ((avctx->pix_fmt == AV_PIX_FMT_GBRPF32LE ||
+ avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE) && c == 'F') {
float *r = (float *)p->data[2];
float *g = (float *)p->data[0];
float *b = (float *)p->data[1];
@@ -144,7 +151,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
g += p->linesize[0] / 4;
b += p->linesize[1] / 4;
}
- } else if (avctx->pix_fmt == AV_PIX_FMT_GRAYF32 && c == 'f') {
+ } else if ((avctx->pix_fmt == AV_PIX_FMT_GRAYF32LE ||
+ avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE) && c == 'f') {
const float *g = (const float *)p->data[0];
for (int i = 0; i < avctx->height; i++) {
@@ -280,8 +288,10 @@ const FFCodec ff_pfm_encoder = {
.p.id = AV_CODEC_ID_PFM,
.p.capabilities = AV_CODEC_CAP_DR1,
FF_CODEC_ENCODE_CB(pnm_encode_frame),
- .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32,
- AV_PIX_FMT_GRAYF32,
+ .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32LE,
+ AV_PIX_FMT_GRAYF32LE,
+ AV_PIX_FMT_GBRPF32BE,
+ AV_PIX_FMT_GRAYF32BE,
AV_PIX_FMT_NONE },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
--
2.36.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-requ...@ffmpeg.org with subject "unsubscribe".
