summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog1
-rwxr-xr-xconfigure1
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavcodec/allcodecs.c1
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/codec_desc.c7
-rw-r--r--libavcodec/imm5.c193
-rw-r--r--libavcodec/version.h4
-rw-r--r--libavformat/riff.c1
9 files changed, 208 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index f1cddc4..20e4296 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,7 @@ version <next>:
- Intel QSV-accelerated VP9 decoding
- support for TrueHD in mp4
- Supoort AMD AMF encoder on Linux (via Vulkan)
+- IMM5 video decoder
version 4.2:
diff --git a/configure b/configure
index 691ae9b..08a54a7 100755
--- a/configure
+++ b/configure
@@ -2723,6 +2723,7 @@ huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llvidencdsp"
hymt_decoder_select="huffyuv_decoder"
iac_decoder_select="imc_decoder"
imc_decoder_select="bswapdsp fft mdct sinewin"
+imm5_decoder_select="h264_decoder hevc_decoder"
indeo3_decoder_select="hpeldsp"
indeo4_decoder_select="ividsp"
indeo5_decoder_select="ividsp"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e491883..1167238 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -393,6 +393,7 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o
OBJS-$(CONFIG_ILBC_DECODER) += ilbcdec.o
OBJS-$(CONFIG_IMC_DECODER) += imc.o
OBJS-$(CONFIG_IMM4_DECODER) += imm4.o
+OBJS-$(CONFIG_IMM5_DECODER) += imm5.o
OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o
OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 2298532..5130fca 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -158,6 +158,7 @@ extern AVCodec ff_hymt_decoder;
extern AVCodec ff_idcin_decoder;
extern AVCodec ff_iff_ilbm_decoder;
extern AVCodec ff_imm4_decoder;
+extern AVCodec ff_imm5_decoder;
extern AVCodec ff_indeo2_decoder;
extern AVCodec ff_indeo3_decoder;
extern AVCodec ff_indeo4_decoder;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d234271..de4feb6 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -457,6 +457,7 @@ enum AVCodecID {
AV_CODEC_ID_AGM,
AV_CODEC_ID_LSCR,
AV_CODEC_ID_VP4,
+ AV_CODEC_ID_IMM5,
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 4d033c2..e6373be 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1726,6 +1726,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("On2 VP4"),
.props = AV_CODEC_PROP_LOSSY,
},
+ {
+ .id = AV_CODEC_ID_IMM5,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "imm5",
+ .long_name = NULL_IF_CONFIG_SMALL("Infinity IMM5"),
+ .props = AV_CODEC_PROP_LOSSY,
+ },
/* various PCM "codecs" */
{
diff --git a/libavcodec/imm5.c b/libavcodec/imm5.c
new file mode 100644
index 0000000..917b414
--- /dev/null
+++ b/libavcodec/imm5.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2019 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
+ */
+
+#include "libavutil/intreadwrite.h"
+
+#include "avcodec.h"
+#include "internal.h"
+
+typedef struct IMM5Context {
+ AVCodecContext *h264_avctx; // wrapper context for H264
+ AVCodecContext *hevc_avctx; // wrapper context for HEVC
+} IMM5Context;
+
+static const struct IMM5_unit {
+ uint8_t bits[14];
+ uint8_t len;
+} IMM5_units[14] = {
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x1E, 0xF4, 0x0B, 0x0F, 0x88 }, 12 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x1E, 0xF4, 0x05, 0x83, 0xE2 }, 12 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x1E, 0xF4, 0x05, 0x81, 0xE8, 0x80 }, 13 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x1E, 0xF4, 0x0B, 0x04, 0xA2 }, 12 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x1E, 0xF4, 0x05, 0x81, 0x28, 0x80 }, 13 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x80, 0x1E, 0xF4, 0x05, 0x80, 0x92, 0x20 }, 13 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1E, 0x9A, 0x74, 0x0B, 0x0F, 0xC8 }, 13 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1E, 0x9A, 0x74, 0x05, 0x83, 0xF2 }, 13 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1E, 0x9A, 0x74, 0x05, 0x81, 0xEC, 0x80 }, 14 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1E, 0x9A, 0x74, 0x0B, 0x04, 0xB2 }, 13 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1E, 0x9A, 0x74, 0x05, 0x81, 0x2C, 0x80 }, 14 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1E, 0x9A, 0x74, 0x05, 0x80, 0x93, 0x20 }, 14 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x68, 0xDE, 0x3C, 0x80 }, 8 },
+ { { 0x00, 0x00, 0x00, 0x01, 0x68, 0xCE, 0x32, 0x28 }, 8 },
+};
+
+static av_cold int imm5_init(AVCodecContext *avctx)
+{
+ IMM5Context *ctx = avctx->priv_data;
+ const AVCodec *codec;
+ int ret;
+
+ codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ if (!codec)
+ return AVERROR_BUG;
+ ctx->h264_avctx = avcodec_alloc_context3(codec);
+ if (!ctx->h264_avctx)
+ return AVERROR(ENOMEM);
+ ctx->h264_avctx->thread_count = 1;
+ ctx->h264_avctx->flags = avctx->flags;
+ ctx->h264_avctx->flags2 = avctx->flags2;
+ ret = ff_codec_open2_recursive(ctx->h264_avctx, codec, NULL);
+ if (ret < 0)
+ return ret;
+
+ codec = avcodec_find_decoder(AV_CODEC_ID_HEVC);
+ if (!codec)
+ return AVERROR_BUG;
+ ctx->hevc_avctx = avcodec_alloc_context3(codec);
+ if (!ctx->hevc_avctx)
+ return AVERROR(ENOMEM);
+ ctx->hevc_avctx->thread_count = 1;
+ ctx->hevc_avctx->flags = avctx->flags;
+ ctx->hevc_avctx->flags2 = avctx->flags2;
+ ret = ff_codec_open2_recursive(ctx->hevc_avctx, codec, NULL);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int imm5_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
+{
+ IMM5Context *ctx = avctx->priv_data;
+ AVFrame *frame = data;
+ AVCodecContext *codec_avctx = ctx->h264_avctx;
+ int ret;
+
+ if (avpkt->size > 24 && avpkt->data[8] <= 1 && AV_RL32(avpkt->data + 4) + 24ULL <= avpkt->size) {
+ int codec_type = avpkt->data[1];
+ int index = avpkt->data[10];
+ int new_size = AV_RL32(avpkt->data + 4);
+ int offset, off;
+
+ if (codec_type == 0xA) {
+ codec_avctx = ctx->hevc_avctx;
+ } else if (index == 17) {
+ index = 4;
+ } else if (index == 18) {
+ index = 5;
+ }
+
+ if (index >= 1 && index <= 12) {
+ ret = av_packet_make_writable(avpkt);
+ if (ret < 0)
+ return ret;
+
+ index -= 1;
+ off = offset = IMM5_units[index].len;
+ if (codec_type == 2) {
+ offset += IMM5_units[12].len;
+ } else {
+ offset += IMM5_units[13].len;
+ }
+
+ avpkt->data += 24 - offset;
+ avpkt->size = new_size + offset;
+
+ memcpy(avpkt->data, IMM5_units[index].bits, IMM5_units[index].len);
+ if (codec_type == 2) {
+ memcpy(avpkt->data + off, IMM5_units[12].bits, IMM5_units[12].len);
+ } else {
+ memcpy(avpkt->data + off, IMM5_units[13].bits, IMM5_units[13].len);
+ }
+ } else {
+ avpkt->data += 24;
+ avpkt->size -= 24;
+ }
+ }
+
+ ret = avcodec_send_packet(codec_avctx, avpkt);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n");
+ return ret;
+ }
+
+ ret = avcodec_receive_frame(codec_avctx, frame);
+ if (ret < 0)
+ return ret;
+
+ avctx->pix_fmt = codec_avctx->pix_fmt;
+ avctx->coded_width = codec_avctx->coded_width;
+ avctx->coded_height = codec_avctx->coded_height;
+ avctx->width = codec_avctx->width;
+ avctx->height = codec_avctx->height;
+ avctx->bit_rate = codec_avctx->bit_rate;
+ avctx->colorspace = codec_avctx->colorspace;
+ avctx->color_range = codec_avctx->color_range;
+ avctx->color_trc = codec_avctx->color_trc;
+ avctx->color_primaries = codec_avctx->color_primaries;
+ avctx->chroma_sample_location = codec_avctx->chroma_sample_location;
+
+ *got_frame = 1;
+
+ return avpkt->size;
+}
+
+static void imm5_flush(AVCodecContext *avctx)
+{
+ IMM5Context *ctx = avctx->priv_data;
+
+ avcodec_flush_buffers(ctx->h264_avctx);
+ avcodec_flush_buffers(ctx->hevc_avctx);
+}
+
+static av_cold int imm5_close(AVCodecContext *avctx)
+{
+ IMM5Context *ctx = avctx->priv_data;
+
+ avcodec_free_context(&ctx->h264_avctx);
+ avcodec_free_context(&ctx->hevc_avctx);
+
+ return 0;
+}
+
+AVCodec ff_imm5_decoder = {
+ .name = "imm5",
+ .long_name = NULL_IF_CONFIG_SMALL("Infinity IMM5"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_IMM5,
+ .init = imm5_init,
+ .decode = imm5_decode_frame,
+ .close = imm5_close,
+ .flush = imm5_flush,
+ .priv_data_size = sizeof(IMM5Context),
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
+ FF_CODEC_CAP_INIT_CLEANUP,
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index cda6dba..ed767c8 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
-#define LIBAVCODEC_VERSION_MINOR 55
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MINOR 56
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavformat/riff.c b/libavformat/riff.c
index e755ad8..610974e 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -488,6 +488,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_AGM, MKTAG('A', 'G', 'M', '6') },
{ AV_CODEC_ID_AGM, MKTAG('A', 'G', 'M', '7') },
{ AV_CODEC_ID_LSCR, MKTAG('L', 'S', 'C', 'R') },
+ { AV_CODEC_ID_IMM5, MKTAG('I', 'M', 'M', '5') },
{ AV_CODEC_ID_NONE, 0 }
};
OpenPOWER on IntegriCloud