summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog1
-rwxr-xr-xconfigure6
-rw-r--r--doc/general.texi1
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/allcodecs.c1
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/codec_desc.c7
-rw-r--r--libavcodec/hap.h65
-rw-r--r--libavcodec/hapdec.c238
-rw-r--r--libavcodec/hapenc.c204
-rw-r--r--libavcodec/version.h4
-rw-r--r--libavformat/isom.c4
-rw-r--r--tests/fate/video.mak12
-rw-r--r--tests/ref/fate/hap12
-rw-r--r--tests/ref/fate/hap52
-rw-r--r--tests/ref/fate/hapy2
16 files changed, 550 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index a5c6b821a0..25aeb36c77 100644
--- a/Changelog
+++ b/Changelog
@@ -31,6 +31,7 @@ version 2.7:
- Direct3D11-accelerated decoding
- Support Secure Transport
- Multipart JPEG demuxer
+- Hap decoder and encoder
version 2.6:
diff --git a/configure b/configure
index cf75743a3f..b619474395 100755
--- a/configure
+++ b/configure
@@ -239,6 +239,7 @@ External library support:
--enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
--enable-libshine enable fixed-point MP3 encoding via libshine [no]
--enable-libsmbclient enable Samba protocol via libsmbclient [no]
+ --enable-libsnappy enable Snappy compression [no]
--enable-libsoxr enable Include libsoxr resampling [no]
--enable-libspeex enable Speex de/encoding via libspeex [no]
--enable-libssh enable SFTP protocol via libssh [no]
@@ -1396,6 +1397,7 @@ EXTERNAL_LIBRARY_LIST="
libschroedinger
libshine
libsmbclient
+ libsnappy
libsoxr
libspeex
libssh
@@ -2198,6 +2200,9 @@ h264_qsv_decoder_deps="libmfx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
h264_qsv_encoder_deps="libmfx"
h264_qsv_encoder_select="qsvenc"
+hap_decoder_select="snappy texturedsp"
+hap_encoder_deps="libsnappy"
+hap_encoder_select="texturedspenc"
hevc_decoder_select="bswapdsp cabac golomb videodsp"
huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
@@ -5129,6 +5134,7 @@ enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/sc
enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_buffer
enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h smbc_init ||
require smbclient libsmbclient.h smbc_init -lsmbclient; }
+enabled libsnappy && require snappy snappy-c.h snappy_compress -lsnappy
enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init
enabled libspeex && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
diff --git a/doc/general.texi b/doc/general.texi
index 471a11bb82..41dbaeeca5 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -479,6 +479,7 @@ library:
@tab Tiertex .seq files used in the DOS CD-ROM version of the game Flashback.
@item True Audio @tab @tab X
@item VC-1 test bitstream @tab X @tab X
+@item Vidvox Hap @tab X @tab X
@item Vivo @tab @tab X
@item WAV @tab X @tab X
@item WavPack @tab X @tab X
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5b53f5c98b..3566fac59e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -280,6 +280,8 @@ OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o
OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o
OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h264.o
OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
+OBJS-$(CONFIG_HAP_DECODER) += hapdec.o
+OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o
OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
hevc_cabac.o hevc_refs.o hevcpred.o \
hevcdsp.o hevc_filter.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 25462a60d8..73e1d1b683 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -181,6 +181,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(H264_QSV, h264_qsv);
REGISTER_DECODER(H264_VDA, h264_vda);
REGISTER_DECODER(H264_VDPAU, h264_vdpau);
+ REGISTER_ENCDEC (HAP, hap);
REGISTER_DECODER(HEVC, hevc);
REGISTER_DECODER(HNM4_VIDEO, hnm4_video);
REGISTER_DECODER(HQ_HQA, hq_hqa);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 25cb34f2a7..60084a523a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -293,6 +293,7 @@ enum AVCodecID {
AV_CODEC_ID_HQX,
AV_CODEC_ID_TDSC,
AV_CODEC_ID_HQ_HQA,
+ AV_CODEC_ID_HAP,
AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 87bbc776b3..a5664906e1 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1252,6 +1252,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
+ {
+ .id = AV_CODEC_ID_HAP,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "hap",
+ .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"),
+ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+ },
/* image codecs */
{
diff --git a/libavcodec/hap.h b/libavcodec/hap.h
new file mode 100644
index 0000000000..bd0fd37f1c
--- /dev/null
+++ b/libavcodec/hap.h
@@ -0,0 +1,65 @@
+/*
+ * Vidvox Hap
+ * Copyright (C) 2015 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * 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
+ */
+
+#ifndef AVCODEC_HAP_H
+#define AVCODEC_HAP_H
+
+#include <stdint.h>
+
+#include "libavutil/opt.h"
+
+#include "bytestream.h"
+#include "texturedsp.h"
+
+typedef struct HapContext {
+ AVClass *class;
+
+ TextureDSPContext dxtc;
+ GetByteContext gbc;
+ PutByteContext pbc;
+
+ int section_type; /* Header type */
+
+ int tex_rat; /* Compression ratio */
+ const uint8_t *tex_data; /* Compressed texture */
+ uint8_t *tex_buf; /* Uncompressed texture */
+ size_t tex_size; /* Size of the compressed texture */
+
+ uint8_t *snappied; /* Buffer interacting with snappy */
+ size_t max_snappy; /* Maximum compressed size for snappy buffer */
+
+ /* Pointer to the selected compress or decompress function */
+ int (*tex_fun)(uint8_t *dst, ptrdiff_t stride, const uint8_t *block);
+} HapContext;
+
+enum {
+ HAP_FMT_RGBDXT1 = 0x0B,
+ HAP_FMT_RGBADXT5 = 0x0E,
+ HAP_FMT_YCOCGDXT5 = 0x0F,
+};
+
+enum {
+ HAP_COMP_NONE = 0xA0,
+ HAP_COMP_SNAPPY = 0xB0,
+ HAP_COMP_COMPLEX = 0xC0,
+};
+
+#endif /* AVCODEC_HAP_H */
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
new file mode 100644
index 0000000000..6e3c138199
--- /dev/null
+++ b/libavcodec/hapdec.c
@@ -0,0 +1,238 @@
+/*
+ * Vidvox Hap decoder
+ * Copyright (C) 2015 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * 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
+ * Hap decoder
+ *
+ * Fourcc: Hap1, Hap5, HapY
+ *
+ * https://github.com/Vidvox/hap/blob/master/documentation/HapVideoDRAFT.md
+ */
+
+#include <stdint.h>
+
+#include "libavutil/imgutils.h"
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "hap.h"
+#include "internal.h"
+#include "snappy.h"
+#include "texturedsp.h"
+#include "thread.h"
+
+/* The first three bytes are the size of the section past the header, or zero
+ * if the length is stored in the next long word. The fourth byte in the first
+ * long word indicates the type of the current section. */
+static int parse_section_header(AVCodecContext *avctx)
+{
+ HapContext *ctx = avctx->priv_data;
+ GetByteContext *gbc = &ctx->gbc;
+ int length;
+
+ if (bytestream2_get_bytes_left(gbc) < 4)
+ return AVERROR_INVALIDDATA;
+
+ length = bytestream2_get_le24(gbc);
+
+ ctx->section_type = bytestream2_get_byte(gbc);
+
+ if (length == 0) {
+ if (bytestream2_get_bytes_left(gbc) < 4)
+ return AVERROR_INVALIDDATA;
+ length = bytestream2_get_le32(gbc);
+ }
+
+ if (length > bytestream2_get_bytes_left(gbc) || length == 0)
+ return AVERROR_INVALIDDATA;
+
+ return length;
+}
+
+/* Prepare the texture to be decompressed */
+static int setup_texture(AVCodecContext *avctx, size_t length)
+{
+ HapContext *ctx = avctx->priv_data;
+ GetByteContext *gbc = &ctx->gbc;
+ int64_t snappy_size;
+ const char *texture_name;
+ const char *compressorstr;
+ int ret;
+
+ switch (ctx->section_type & 0x0F) {
+ case HAP_FMT_RGBDXT1:
+ ctx->tex_rat = 8;
+ ctx->tex_fun = ctx->dxtc.dxt1_block;
+ texture_name = "DXT1";
+ break;
+ case HAP_FMT_RGBADXT5:
+ ctx->tex_rat = 16;
+ ctx->tex_fun = ctx->dxtc.dxt5_block;
+ texture_name = "DXT5";
+ break;
+ case HAP_FMT_YCOCGDXT5:
+ ctx->tex_rat = 16;
+ ctx->tex_fun = ctx->dxtc.dxt5ys_block;
+ texture_name = "DXT5-YCoCg-scaled";
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid format mode %02X.\n", ctx->section_type);
+ return AVERROR_INVALIDDATA;
+ }
+
+ switch (ctx->section_type & 0xF0) {
+ case HAP_COMP_NONE:
+ /* Only DXTC texture compression */
+ ctx->tex_data = gbc->buffer;
+ ctx->tex_size = length;
+ compressorstr = "none";
+ break;
+ case HAP_COMP_SNAPPY:
+ /* Uncompress the frame */
+ ret = ff_snappy_uncompress(gbc, &ctx->snappied, &snappy_size);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Snappy uncompress error\n");
+ return ret;
+ }
+
+ ctx->tex_data = ctx->snappied;
+ ctx->tex_size = snappy_size;
+ compressorstr = "snappy";
+ break;
+ case HAP_COMP_COMPLEX:
+ compressorstr = "complex";
+ avpriv_request_sample(avctx, "Complex Hap compressor");
+ return AVERROR_PATCHWELCOME;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid compressor mode %02X.\n", ctx->section_type);
+ return AVERROR_INVALIDDATA;
+ }
+
+ av_log(avctx, AV_LOG_DEBUG, "%s texture with %s compressor\n",
+ texture_name, compressorstr);
+
+ return 0;
+}
+
+static int decompress_texture_thread(AVCodecContext *avctx, void *arg,
+ int block_nb, int thread_nb)
+{
+ HapContext *ctx = avctx->priv_data;
+ AVFrame *frame = arg;
+ int x = (TEXTURE_BLOCK_W * block_nb) % avctx->coded_width;
+ int y = TEXTURE_BLOCK_H * (TEXTURE_BLOCK_W * block_nb / avctx->coded_width);
+ uint8_t *p = frame->data[0] + x * 4 + y * frame->linesize[0];
+ const uint8_t *d = ctx->tex_data + block_nb * ctx->tex_rat;
+
+ ctx->tex_fun(p, frame->linesize[0], d);
+ return 0;
+}
+
+static int hap_decode(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
+{
+ HapContext *ctx = avctx->priv_data;
+ ThreadFrame tframe;
+ int ret, length;
+ int blocks = avctx->coded_width * avctx->coded_height / (TEXTURE_BLOCK_W * TEXTURE_BLOCK_H);
+
+ bytestream2_init(&ctx->gbc, avpkt->data, avpkt->size);
+
+ /* Check for section header */
+ length = parse_section_header(avctx);
+ if (length < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Frame is too small.\n");
+ return length;
+ }
+
+ /* Prepare the texture buffer and decompress function */
+ ret = setup_texture(avctx, length);
+ if (ret < 0)
+ return ret;
+
+ /* Get the output frame ready to receive data */
+ tframe.f = data;
+ ret = ff_thread_get_buffer(avctx, &tframe, 0);
+ if (ret < 0)
+ return ret;
+ ff_thread_finish_setup(avctx);
+
+ /* Use the decompress function on the texture, one block per thread */
+ avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, blocks);
+
+ /* Frame is ready to be output */
+ tframe.f->pict_type = AV_PICTURE_TYPE_I;
+ tframe.f->key_frame = 1;
+ *got_frame = 1;
+
+ return avpkt->size;
+}
+
+static av_cold int hap_init(AVCodecContext *avctx)
+{
+ HapContext *ctx = avctx->priv_data;
+ int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
+
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid video size %dx%d.\n",
+ avctx->width, avctx->height);
+ return ret;
+ }
+
+ /* Since codec is based on 4x4 blocks, size is aligned to 4 */
+ avctx->coded_width = FFALIGN(avctx->width, TEXTURE_BLOCK_W);
+ avctx->coded_height = FFALIGN(avctx->height, TEXTURE_BLOCK_H);
+
+ /* Technically only one mode has alpha, but 32 bits are easier to handle */
+ avctx->pix_fmt = AV_PIX_FMT_RGBA;
+
+ ff_texturedsp_init(&ctx->dxtc);
+
+ return 0;
+}
+
+static av_cold int hap_close(AVCodecContext *avctx)
+{
+ HapContext *ctx = avctx->priv_data;
+
+ av_freep(&ctx->snappied);
+
+ return 0;
+}
+
+AVCodec ff_hap_decoder = {
+ .name = "hap",
+ .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HAP,
+ .init = hap_init,
+ .decode = hap_decode,
+ .close = hap_close,
+ .priv_data_size = sizeof(HapContext),
+ .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS |
+ CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
+ FF_CODEC_CAP_INIT_CLEANUP,
+};
diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c
new file mode 100644
index 0000000000..4434a1e075
--- /dev/null
+++ b/libavcodec/hapenc.c
@@ -0,0 +1,204 @@
+/*
+ * Vidvox Hap encoder
+ * Copyright (C) 2015 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * 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
+ * Hap encoder
+ *
+ * Fourcc: Hap1, Hap5, HapY
+ *
+ * https://github.com/Vidvox/hap/blob/master/documentation/HapVideoDRAFT.md
+ */
+
+#include <stdint.h>
+#include "snappy-c.h"
+
+#include "libavutil/frame.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "hap.h"
+#include "internal.h"
+#include "texturedsp.h"
+
+/* A fixed header size allows to skip a memcpy */
+#define HEADER_SIZE 8
+
+static void compress_texture(AVCodecContext *avctx, const AVFrame *f)
+{
+ HapContext *ctx = avctx->priv_data;
+ uint8_t *out = ctx->tex_buf;
+ int i, j;
+
+ for (j = 0; j < avctx->height; j += 4) {
+ for (i = 0; i < avctx->width; i += 4) {
+ uint8_t *p = f->data[0] + i * 4 + j * f->linesize[0];
+ const int step = ctx->tex_fun(out, f->linesize[0], p);
+ out += step;
+ }
+ }
+}
+
+static int hap_encode(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *frame, int *got_packet)
+{
+ HapContext *ctx = avctx->priv_data;
+ size_t final_size = ctx->max_snappy;
+ int ret, comp = HAP_COMP_SNAPPY;
+ int pktsize = FFMAX(ctx->tex_size, ctx->max_snappy) + HEADER_SIZE;
+
+ /* Allocate maximum size packet, shrink later. */
+ ret = ff_alloc_packet(pkt, pktsize);
+ if (ret < 0)
+ return ret;
+
+ /* DXTC compression. */
+ compress_texture(avctx, frame);
+
+ /* Compress with snappy too, write directly on packet buffer. */
+ ret = snappy_compress(ctx->tex_buf, ctx->tex_size,
+ pkt->data + HEADER_SIZE, &final_size);
+ if (ret != SNAPPY_OK) {
+ av_log(avctx, AV_LOG_ERROR, "Snappy compress error.\n");
+ return AVERROR_BUG;
+ }
+
+ /* If there is no gain from snappy, just use the raw texture. */
+ if (final_size > ctx->tex_size) {
+ comp = HAP_COMP_NONE;
+ av_log(avctx, AV_LOG_VERBOSE,
+ "Snappy buffer bigger than uncompressed (%lu > %lu bytes).\n",
+ final_size, ctx->tex_size);
+ memcpy(pkt->data + HEADER_SIZE, ctx->tex_buf, ctx->tex_size);
+ final_size = ctx->tex_size;
+ }
+
+ /* Write header at the start. */
+ AV_WL24(pkt->data, 0);
+ AV_WL32(pkt->data + 4, final_size);
+ pkt->data[3] = comp | ctx->section_type;
+
+ av_shrink_packet(pkt, final_size + HEADER_SIZE);
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ *got_packet = 1;
+ return 0;
+}
+
+static av_cold int hap_init(AVCodecContext *avctx)
+{
+ HapContext *ctx = avctx->priv_data;
+ int ratio;
+ int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
+
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid video size %dx%d.\n",
+ avctx->width, avctx->height);
+ return ret;
+ }
+
+ if (avctx->width % 4 || avctx->height % 4) {
+ av_log(avctx, AV_LOG_ERROR, "Video size %dx%d is not multiple of 4.\n",
+ avctx->width, avctx->height);
+ return AVERROR_INVALIDDATA;
+ }
+
+ ff_texturedspenc_init(&ctx->dxtc);
+
+ switch (ctx->section_type & 0x0F) {
+ case HAP_FMT_RGBDXT1:
+ ratio = 8;
+ avctx->codec_tag = MKTAG('H', 'a', 'p', '1');
+ ctx->tex_fun = ctx->dxtc.dxt1_block;
+ break;
+ case HAP_FMT_RGBADXT5:
+ ratio = 4;
+ avctx->codec_tag = MKTAG('H', 'a', 'p', '5');
+ ctx->tex_fun = ctx->dxtc.dxt5_block;
+ break;
+ case HAP_FMT_YCOCGDXT5:
+ ratio = 4;
+ avctx->codec_tag = MKTAG('H', 'a', 'p', 'Y');
+ ctx->tex_fun = ctx->dxtc.dxt5ys_block;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Invalid format %02X\n", ctx->section_type);
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* Texture compression ratio is constant, so can we computer
+ * beforehand the final size of the uncompressed buffer. */
+ ctx->tex_size = FFALIGN(avctx->width, TEXTURE_BLOCK_W) *
+ FFALIGN(avctx->height, TEXTURE_BLOCK_H) * 4 / ratio;
+ ctx->max_snappy = snappy_max_compressed_length(ctx->tex_size);
+
+ ctx->tex_buf = av_malloc(ctx->tex_size);
+ if (!ctx->tex_buf)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static av_cold int hap_close(AVCodecContext *avctx)
+{
+ HapContext *ctx = avctx->priv_data;
+
+ av_freep(&ctx->tex_buf);
+
+ return 0;
+}
+
+#define OFFSET(x) offsetof(HapContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "format", NULL, OFFSET(section_type), AV_OPT_TYPE_INT, { .i64 = HAP_FMT_RGBDXT1 }, HAP_FMT_RGBDXT1, HAP_FMT_YCOCGDXT5, FLAGS, "format" },
+ { "hap", "Hap 1 (DXT1 textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_RGBDXT1 }, 0, 0, FLAGS, "format" },
+ { "hap_alpha", "Hap Alpha (DXT5 textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_RGBADXT5 }, 0, 0, FLAGS, "format" },
+ { "hap_q", "Hap Q (DXT5-YCoCg textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_YCOCGDXT5 }, 0, 0, FLAGS, "format" },
+
+ { NULL },
+};
+
+static const AVClass hapenc_class = {
+ .class_name = "Hap encoder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_hap_encoder = {
+ .name = "hap",
+ .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap encoder"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HAP,
+ .priv_data_size = sizeof(HapContext),
+ .priv_class = &hapenc_class,
+ .init = hap_init,
+ .encode2 = hap_encode,
+ .close = hap_close,
+ .pix_fmts = (const enum AVPixelFormat[]) {
+ AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE,
+ },
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
+ FF_CODEC_CAP_INIT_CLEANUP,
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index f4d68bd85b..ba66129b2c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 42
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MINOR 43
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavformat/isom.c b/libavformat/isom.c
index c99f2dc5db..db9129bcac 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -258,6 +258,10 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_AIC, MKTAG('i', 'c', 'o', 'd') },
+ { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', '1') },
+ { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', '5') },
+ { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', 'Y') },
+
{ AV_CODEC_ID_NONE, 0 },
};
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 314f16889a..aecb0e5a03 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -168,6 +168,18 @@ fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_
FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode
fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2
+FATE_HAP += fate-hap1
+fate-hap1: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hap1.mov
+
+FATE_HAP += fate-hap5
+fate-hap5: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hap5.mov
+
+FATE_HAP += fate-hapy
+fate-hapy: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hapy.mov
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP)
+fate-hap: $(FATE_HAP)
+
FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1
fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
diff --git a/tests/ref/fate/hap1 b/tests/ref/fate/hap1
new file mode 100644
index 0000000000..d3bdeae9fe
--- /dev/null
+++ b/tests/ref/fate/hap1
@@ -0,0 +1,2 @@
+#tb 0: 62/2997
+0, 0, 0, 1, 1228800, 0x0fa946bc
diff --git a/tests/ref/fate/hap5 b/tests/ref/fate/hap5
new file mode 100644
index 0000000000..458981e4d8
--- /dev/null
+++ b/tests/ref/fate/hap5
@@ -0,0 +1,2 @@
+#tb 0: 1/30
+0, 0, 0, 1, 1228800, 0xb71ecf93
diff --git a/tests/ref/fate/hapy b/tests/ref/fate/hapy
new file mode 100644
index 0000000000..e7d7608395
--- /dev/null
+++ b/tests/ref/fate/hapy
@@ -0,0 +1,2 @@
+#tb 0: 62/2997
+0, 0, 0, 1, 1228800, 0x5993522d
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 17:56:15 +0000