[FFmpeg-cvslog] avcodec: add initial exr image encoder
Paul B Mahol
git at videolan.org
Thu Feb 18 14:02:38 EET 2021
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Feb 14 23:11:59 2021 +0100| [67c8c863c70f2989add027ffccccbe4b87988415] | committer: Paul B Mahol
avcodec: add initial exr image encoder
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67c8c863c70f2989add027ffccccbe4b87988415
---
Changelog | 1 +
configure | 1 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/exrenc.c | 481 +++++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
libavformat/img2enc.c | 2 +-
7 files changed, 487 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 6471b35417..ed8f1f448d 100644
--- a/Changelog
+++ b/Changelog
@@ -74,6 +74,7 @@ version <next>:
- monochrome video filter
- setts bitstream filter
- vif video filter
+- OpenEXR image encoder
version 4.3:
diff --git a/configure b/configure
index a76c2ec4ae..336301cb40 100755
--- a/configure
+++ b/configure
@@ -2716,6 +2716,7 @@ eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo"
eatgq_decoder_select="aandcttables"
eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp"
exr_decoder_deps="zlib"
+exr_encoder_deps="zlib"
ffv1_decoder_select="rangecoder"
ffv1_encoder_select="rangecoder"
ffvhuff_decoder_select="huffyuv_decoder"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3341801b97..dac76f4465 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -321,6 +321,7 @@ OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o
OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o
+OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o
OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 16ec182a52..cb3f0e7c18 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -109,6 +109,7 @@ extern AVCodec ff_eightsvx_exp_decoder;
extern AVCodec ff_eightsvx_fib_decoder;
extern AVCodec ff_escape124_decoder;
extern AVCodec ff_escape130_decoder;
+extern AVCodec ff_exr_encoder;
extern AVCodec ff_exr_decoder;
extern AVCodec ff_ffv1_encoder;
extern AVCodec ff_ffv1_decoder;
diff --git a/libavcodec/exrenc.c b/libavcodec/exrenc.c
new file mode 100644
index 0000000000..305d44ad2d
--- /dev/null
+++ b/libavcodec/exrenc.c
@@ -0,0 +1,481 @@
+/*
+ * Copyright (c) 2021 Paul B Mahol
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * OpenEXR encoder
+ */
+
+#include <float.h>
+#include <zlib.h>
+
+#include "libavutil/avassert.h"
+#include "libavutil/opt.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/pixdesc.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+
+enum ExrCompr {
+ EXR_RAW,
+ EXR_RLE,
+ EXR_ZIP1,
+ EXR_ZIP16,
+ EXR_NBCOMPR,
+};
+
+enum ExrPixelType {
+ EXR_UINT,
+ EXR_HALF,
+ EXR_FLOAT,
+ EXR_UNKNOWN,
+};
+
+static const char abgr_chlist[4] = { 'A', 'B', 'G', 'R' };
+static const char bgr_chlist[4] = { 'B', 'G', 'R', 'A' };
+static const uint8_t gbra_order[4] = { 3, 1, 0, 2 };
+static const uint8_t gbr_order[4] = { 1, 0, 2, 0 };
+
+typedef struct EXRScanlineData {
+ uint8_t *compressed_data;
+ unsigned int compressed_size;
+
+ uint8_t *uncompressed_data;
+ unsigned int uncompressed_size;
+
+ uint8_t *tmp;
+ unsigned int tmp_size;
+
+ int64_t actual_size;
+} EXRScanlineData;
+
+typedef struct EXRContext {
+ const AVClass *class;
+
+ int compression;
+ int planes;
+ int nb_scanlines;
+ int scanline_height;
+ float gamma;
+ const char *ch_names;
+ const uint8_t *ch_order;
+ PutByteContext pb;
+
+ EXRScanlineData *scanline;
+} EXRContext;
+
+static int encode_init(AVCodecContext *avctx)
+{
+ EXRContext *s = avctx->priv_data;
+
+ switch (avctx->pix_fmt) {
+ case AV_PIX_FMT_GBRPF32:
+ s->planes = 3;
+ s->ch_names = bgr_chlist;
+ s->ch_order = gbr_order;
+ break;
+ case AV_PIX_FMT_GBRAPF32:
+ s->planes = 4;
+ s->ch_names = abgr_chlist;
+ s->ch_order = gbra_order;
+ break;
+ default:
+ av_assert0(0);
+ }
+
+ switch (s->compression) {
+ case EXR_RAW:
+ case EXR_RLE:
+ case EXR_ZIP1:
+ s->scanline_height = 1;
+ s->nb_scanlines = avctx->height;
+ break;
+ case EXR_ZIP16:
+ s->scanline_height = 16;
+ s->nb_scanlines = (avctx->height + s->scanline_height - 1) / s->scanline_height;
+ break;
+ default:
+ av_assert0(0);
+ }
+
+ s->scanline = av_calloc(s->nb_scanlines, sizeof(*s->scanline));
+ if (!s->scanline)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static int encode_close(AVCodecContext *avctx)
+{
+ EXRContext *s = avctx->priv_data;
+
+ for (int y = 0; y < s->nb_scanlines && s->scanline; y++) {
+ EXRScanlineData *scanline = &s->scanline[y];
+
+ av_freep(&scanline->tmp);
+ av_freep(&scanline->compressed_data);
+ av_freep(&scanline->uncompressed_data);
+ }
+
+ av_freep(&s->scanline);
+
+ return 0;
+}
+
+static void reorder_pixels(uint8_t *dst, const uint8_t *src, ptrdiff_t size)
+{
+ const ptrdiff_t half_size = (size + 1) / 2;
+ uint8_t *t1 = dst;
+ uint8_t *t2 = dst + half_size;
+
+ for (ptrdiff_t i = 0; i < half_size; i++) {
+ t1[i] = *(src++);
+ t2[i] = *(src++);
+ }
+}
+
+static void predictor(uint8_t *src, ptrdiff_t size)
+{
+ int p = src[0];
+
+ for (ptrdiff_t i = 1; i < size; i++) {
+ int d = src[i] - p + 384;
+
+ p = src[i];
+ src[i] = d;
+ }
+}
+
+static int64_t rle_compress(uint8_t *out, int64_t out_size,
+ const uint8_t *in, int64_t in_size)
+{
+ int64_t i = 0, o = 0, run = 1, copy = 0;
+
+ while (i < in_size) {
+ while (i + run < in_size && in[i] == in[i + run] && run < 128)
+ run++;
+
+ if (run >= 3) {
+ av_assert1(o + 2 <= out_size);
+ out[o++] = run - 1;
+ out[o++] = in[i];
+ i += run;
+ } else {
+ if (i + run < in_size)
+ copy += run;
+ while (i + copy < in_size && copy < 127 && in[i + copy] != in[i + copy - 1])
+ copy++;
+
+ av_assert1(o + 1 + copy <= out_size);
+ out[o++] = -copy;
+
+ for (int x = 0; x < copy; x++)
+ out[o + x] = in[i + x];
+
+ o += copy;
+ i += copy;
+ copy = 0;
+ }
+
+ run = 1;
+ }
+
+ return o;
+}
+
+static int encode_scanline_rle(EXRContext *s, const AVFrame *frame)
+{
+ for (int y = 0; y < frame->height; y++) {
+ EXRScanlineData *scanline = &s->scanline[y];
+ int64_t tmp_size = 4LL * s->planes * frame->width;
+ int64_t max_compressed_size = tmp_size * 3 / 2;
+
+ av_fast_padded_malloc(&scanline->uncompressed_data, &scanline->uncompressed_size, tmp_size);
+ if (!scanline->uncompressed_data)
+ return AVERROR(ENOMEM);
+
+ av_fast_padded_malloc(&scanline->tmp, &scanline->tmp_size, tmp_size);
+ if (!scanline->tmp)
+ return AVERROR(ENOMEM);
+
+ av_fast_padded_malloc(&scanline->compressed_data, &scanline->compressed_size, max_compressed_size);
+ if (!scanline->compressed_data)
+ return AVERROR(ENOMEM);
+
+ for (int p = 0; p < s->planes; p++) {
+ int ch = s->ch_order[p];
+
+ memcpy(scanline->uncompressed_data + frame->width * 4 * p,
+ frame->data[ch] + y * frame->linesize[ch], frame->width * 4);
+ }
+
+ reorder_pixels(scanline->tmp, scanline->uncompressed_data, tmp_size);
+ predictor(scanline->tmp, tmp_size);
+ scanline->actual_size = rle_compress(scanline->compressed_data,
+ max_compressed_size,
+ scanline->tmp, tmp_size);
+
+ if (scanline->actual_size >= tmp_size) {
+ FFSWAP(uint8_t *, scanline->uncompressed_data, scanline->compressed_data);
+ FFSWAP(int, scanline->uncompressed_size, scanline->compressed_size);
+ scanline->actual_size = tmp_size;
+ }
+ }
+
+ return 0;
+}
+
+static int encode_scanline_zip(EXRContext *s, const AVFrame *frame)
+{
+ for (int y = 0; y < s->nb_scanlines; y++) {
+ EXRScanlineData *scanline = &s->scanline[y];
+ const int scanline_height = FFMIN(s->scanline_height, frame->height - y * s->scanline_height);
+ int64_t tmp_size = 4LL * s->planes * frame->width * scanline_height;
+ int64_t max_compressed_size = tmp_size * 3 / 2;
+
+ av_fast_padded_malloc(&scanline->uncompressed_data, &scanline->uncompressed_size, tmp_size);
+ if (!scanline->uncompressed_data)
+ return AVERROR(ENOMEM);
+
+ av_fast_padded_malloc(&scanline->tmp, &scanline->tmp_size, tmp_size);
+ if (!scanline->tmp)
+ return AVERROR(ENOMEM);
+
+ av_fast_padded_malloc(&scanline->compressed_data, &scanline->compressed_size, max_compressed_size);
+ if (!scanline->compressed_data)
+ return AVERROR(ENOMEM);
+
+ for (int l = 0; l < scanline_height; l++) {
+ const int scanline_size = frame->width * 4 * s->planes;
+
+ for (int p = 0; p < s->planes; p++) {
+ int ch = s->ch_order[p];
+
+ memcpy(scanline->uncompressed_data + scanline_size * l + p * frame->width * 4,
+ frame->data[ch] + (y * s->scanline_height + l) * frame->linesize[ch],
+ frame->width * 4);
+ }
+ }
+
+ reorder_pixels(scanline->tmp, scanline->uncompressed_data, tmp_size);
+ predictor(scanline->tmp, tmp_size);
+ scanline->actual_size = max_compressed_size;
+ compress(scanline->compressed_data, &scanline->actual_size,
+ scanline->tmp, tmp_size);
+
+ if (scanline->actual_size >= tmp_size) {
+ FFSWAP(uint8_t *, scanline->uncompressed_data, scanline->compressed_data);
+ FFSWAP(int, scanline->uncompressed_size, scanline->compressed_size);
+ scanline->actual_size = tmp_size;
+ }
+ }
+
+ return 0;
+}
+
+static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *frame, int *got_packet)
+{
+ EXRContext *s = avctx->priv_data;
+ PutByteContext *pb = &s->pb;
+ int64_t offset;
+ int ret;
+ int64_t out_size = 2048LL + avctx->height * 16LL +
+ av_image_get_buffer_size(avctx->pix_fmt,
+ avctx->width,
+ avctx->height, 64) * 3LL / 2;
+
+ if ((ret = ff_alloc_packet2(avctx, pkt, out_size, out_size)) < 0)
+ return ret;
+
+ bytestream2_init_writer(pb, pkt->data, pkt->size);
+
+ bytestream2_put_le32(pb, 20000630);
+ bytestream2_put_byte(pb, 2);
+ bytestream2_put_le24(pb, 0);
+ bytestream2_put_buffer(pb, "channels\0chlist\0", 16);
+ bytestream2_put_le32(pb, s->planes * 18 + 1);
+
+ for (int p = 0; p < s->planes; p++) {
+ bytestream2_put_byte(pb, s->ch_names[p]);
+ bytestream2_put_byte(pb, 0);
+ bytestream2_put_le32(pb, EXR_FLOAT);
+ bytestream2_put_le32(pb, 0);
+ bytestream2_put_le32(pb, 1);
+ bytestream2_put_le32(pb, 1);
+ }
+ bytestream2_put_byte(pb, 0);
+
+ bytestream2_put_buffer(pb, "compression\0compression\0", 24);
+ bytestream2_put_le32(pb, 1);
+ bytestream2_put_byte(pb, s->compression);
+
+ bytestream2_put_buffer(pb, "dataWindow\0box2i\0", 17);
+ bytestream2_put_le32(pb, 16);
+ bytestream2_put_le32(pb, 0);
+ bytestream2_put_le32(pb, 0);
+ bytestream2_put_le32(pb, avctx->width - 1);
+ bytestream2_put_le32(pb, avctx->height - 1);
+
+ bytestream2_put_buffer(pb, "displayWindow\0box2i\0", 20);
+ bytestream2_put_le32(pb, 16);
+ bytestream2_put_le32(pb, 0);
+ bytestream2_put_le32(pb, 0);
+ bytestream2_put_le32(pb, avctx->width - 1);
+ bytestream2_put_le32(pb, avctx->height - 1);
+
+ bytestream2_put_buffer(pb, "lineOrder\0lineOrder\0", 20);
+ bytestream2_put_le32(pb, 1);
+ bytestream2_put_byte(pb, 0);
+
+ bytestream2_put_buffer(pb, "screenWindowCenter\0v2f\0", 23);
+ bytestream2_put_le32(pb, 8);
+ bytestream2_put_le64(pb, 0);
+
+ bytestream2_put_buffer(pb, "screenWindowWidth\0float\0", 24);
+ bytestream2_put_le32(pb, 4);
+ bytestream2_put_le32(pb, av_float2int(1.f));
+
+ if (avctx->sample_aspect_ratio.num && avctx->sample_aspect_ratio.den) {
+ bytestream2_put_buffer(pb, "pixelAspectRatio\0float\0", 23);
+ bytestream2_put_le32(pb, 4);
+ bytestream2_put_le32(pb, av_float2int(av_q2d(avctx->sample_aspect_ratio)));
+ }
+
+ if (avctx->framerate.num && avctx->framerate.den) {
+ bytestream2_put_buffer(pb, "framesPerSecond\0rational\0", 25);
+ bytestream2_put_le32(pb, 8);
+ bytestream2_put_le32(pb, avctx->framerate.num);
+ bytestream2_put_le32(pb, avctx->framerate.den);
+ }
+
+ bytestream2_put_buffer(pb, "gamma\0float\0", 12);
+ bytestream2_put_le32(pb, 4);
+ bytestream2_put_le32(pb, av_float2int(s->gamma));
+
+ bytestream2_put_buffer(pb, "writer\0string\0", 14);
+ bytestream2_put_le32(pb, 4);
+ bytestream2_put_buffer(pb, "lavc", 4);
+ bytestream2_put_byte(pb, 0);
+
+ switch (s->compression) {
+ case EXR_RAW:
+ /* nothing to do */
+ break;
+ case EXR_RLE:
+ encode_scanline_rle(s, frame);
+ break;
+ case EXR_ZIP16:
+ case EXR_ZIP1:
+ encode_scanline_zip(s, frame);
+ break;
+ default:
+ av_assert0(0);
+ }
+
+ switch (s->compression) {
+ case EXR_RAW:
+ offset = bytestream2_tell_p(pb) + avctx->height * 8LL;
+
+ for (int y = 0; y < avctx->height; y++) {
+ bytestream2_put_le64(pb, offset);
+ offset += avctx->width * s->planes * 4 + 8;
+ }
+
+ for (int y = 0; y < avctx->height; y++) {
+ bytestream2_put_le32(pb, y);
+ bytestream2_put_le32(pb, s->planes * avctx->width * 4);
+ for (int p = 0; p < s->planes; p++) {
+ int ch = s->ch_order[p];
+ bytestream2_put_buffer(pb, frame->data[ch] + y * frame->linesize[ch],
+ avctx->width * 4);
+ }
+ }
+ break;
+ case EXR_ZIP16:
+ case EXR_ZIP1:
+ case EXR_RLE:
+ offset = bytestream2_tell_p(pb) + s->nb_scanlines * 8LL;
+
+ for (int y = 0; y < s->nb_scanlines; y++) {
+ EXRScanlineData *scanline = &s->scanline[y];
+
+ bytestream2_put_le64(pb, offset);
+ offset += scanline->actual_size + 8;
+ }
+
+ for (int y = 0; y < s->nb_scanlines; y++) {
+ EXRScanlineData *scanline = &s->scanline[y];
+
+ bytestream2_put_le32(pb, y * s->scanline_height);
+ bytestream2_put_le32(pb, scanline->actual_size);
+ bytestream2_put_buffer(pb, scanline->compressed_data,
+ scanline->actual_size);
+ }
+ break;
+ default:
+ av_assert0(0);
+ }
+
+ av_shrink_packet(pkt, bytestream2_tell_p(pb));
+
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ *got_packet = 1;
+
+ return 0;
+}
+
+#define OFFSET(x) offsetof(EXRContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "compression", "set compression type", OFFSET(compression), AV_OPT_TYPE_INT, {.i64=0}, 0, EXR_NBCOMPR-1, VE, "compr" },
+ { "none", "none", 0, AV_OPT_TYPE_CONST, {.i64=EXR_RAW}, 0, 0, VE, "compr" },
+ { "rle" , "RLE", 0, AV_OPT_TYPE_CONST, {.i64=EXR_RLE}, 0, 0, VE, "compr" },
+ { "zip1", "ZIP1", 0, AV_OPT_TYPE_CONST, {.i64=EXR_ZIP1}, 0, 0, VE, "compr" },
+ { "zip16", "ZIP16", 0, AV_OPT_TYPE_CONST, {.i64=EXR_ZIP16}, 0, 0, VE, "compr" },
+ { "gamma", "set gamma", OFFSET(gamma), AV_OPT_TYPE_FLOAT, {.dbl=1.f}, 0.001, FLT_MAX, VE },
+ { NULL},
+};
+
+static const AVClass exr_class = {
+ .class_name = "exr",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_exr_encoder = {
+ .name = "exr",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"),
+ .priv_data_size = sizeof(EXRContext),
+ .priv_class = &exr_class,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_EXR,
+ .init = encode_init,
+ .encode2 = encode_frame,
+ .close = encode_close,
+ .capabilities = AV_CODEC_CAP_FRAME_THREADS,
+ .pix_fmts = (const enum AVPixelFormat[]) {
+ AV_PIX_FMT_GBRPF32,
+ AV_PIX_FMT_GBRAPF32,
+ AV_PIX_FMT_NONE },
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 83dbd1ad63..d4fe2da937 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
-#define LIBAVCODEC_VERSION_MINOR 123
+#define LIBAVCODEC_VERSION_MINOR 124
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 84201d3beb..0f7a21ffa0 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -260,7 +260,7 @@ static const AVClass img2mux_class = {
AVOutputFormat ff_image2_muxer = {
.name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
- .extensions = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv,png,"
+ .extensions = "bmp,dpx,exr,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv,png,"
"ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24,"
"sunras,xbm,xface,pix,y",
.priv_data_size = sizeof(VideoMuxData),
More information about the ffmpeg-cvslog
mailing list