[FFmpeg-cvslog] BMV demuxer and decoder
Kostya Shishkov
git at videolan.org
Tue Nov 8 02:22:02 CET 2011
ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Tue Nov 1 11:58:44 2011 +0100| [f545e0067751b764917be53520d233db1bbb945d] | committer: Martin Storsjö
BMV demuxer and decoder
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f545e0067751b764917be53520d233db1bbb945d
---
Changelog | 1 +
doc/general.texi | 3 +
libavcodec/Makefile | 2 +
libavcodec/allcodecs.c | 2 +
libavcodec/avcodec.h | 2 +
libavcodec/bmv.c | 360 ++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/bmv.c | 136 +++++++++++++++++
libavformat/version.h | 2 +-
11 files changed, 510 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 3027c91..5387a65 100644
--- a/Changelog
+++ b/Changelog
@@ -99,6 +99,7 @@ easier to use. The changes are:
AVCodecContext deprecated. Codec private options should be used instead.
- Properly working defaults in libx264 wrapper, support for native presets.
- Encrypted OMA files support
+- Discworld II BMV decoding support
version 0.7:
diff --git a/doc/general.texi b/doc/general.texi
index 24869c3..3187f2c 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -67,6 +67,7 @@ library:
@item Brute Force & Ignorance @tab @tab X
@tab Used in the game Flash Traffic: City of Angels.
@item BWF @tab X @tab X
+ at item Discworld II BMV @tab @tab X
@item Interplay C93 @tab @tab X
@tab Used in the game Cyberia from Interplay.
@item Delphine Software International CIN @tab @tab X
@@ -376,6 +377,7 @@ following image formats are supported:
@tab AVS1-P2, JiZhun profile, encoding through external library libxavs
@item Delphine Software International CIN video @tab @tab X
@tab Codec used in Delphine Software International games.
+ at item Discworld II BMV Video @tab @tab X
@item Cinepak @tab @tab X
@item Cirrus Logic AccuPak @tab @tab X
@tab fourcc: CLJR
@@ -608,6 +610,7 @@ following image formats are supported:
@tab Used in Bink and Smacker files in many games.
@item Delphine Software International CIN audio @tab @tab X
@tab Codec used in Delphine Software International games.
+ at item Discworld II BMV Audio @tab @tab X
@item COOK @tab @tab X
@tab All versions except 5.1 are supported.
@item DCA (DTS Coherent Acoustics) @tab @tab X
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 421072e..413b04d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -94,6 +94,8 @@ OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER) += binkaudio.o wma.o
OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER) += binkaudio.o wma.o
OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o
OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o
+OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmv.o
+OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmv.o
OBJS-$(CONFIG_C93_DECODER) += c93.o
OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \
mpeg12data.o mpegvideo.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 23d2252..2beb81c 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -81,6 +81,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (BFI, bfi);
REGISTER_DECODER (BINK, bink);
REGISTER_ENCDEC (BMP, bmp);
+ REGISTER_DECODER (BMV_VIDEO, bmv_video);
REGISTER_DECODER (C93, c93);
REGISTER_DECODER (CAVS, cavs);
REGISTER_DECODER (CDGRAPHICS, cdgraphics);
@@ -242,6 +243,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (ATRAC3, atrac3);
REGISTER_DECODER (BINKAUDIO_DCT, binkaudio_dct);
REGISTER_DECODER (BINKAUDIO_RDFT, binkaudio_rdft);
+ REGISTER_DECODER (BMV_AUDIO, bmv_audio);
REGISTER_DECODER (COOK, cook);
REGISTER_DECODER (DCA, dca);
REGISTER_DECODER (DSICINAUDIO, dsicinaudio);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index eda1fab..f169bec 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -219,6 +219,7 @@ enum CodecID {
CODEC_ID_G729,
#endif
CODEC_ID_UTVIDEO,
+ CODEC_ID_BMV_VIDEO,
/* various PCM "codecs" */
CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@@ -359,6 +360,7 @@ enum CodecID {
CODEC_ID_8SVX_EXP,
CODEC_ID_8SVX_FIB,
#endif
+ CODEC_ID_BMV_AUDIO,
/* subtitle codecs */
CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c
new file mode 100644
index 0000000..86d1e91
--- /dev/null
+++ b/libavcodec/bmv.c
@@ -0,0 +1,360 @@
+/*
+ * Discworld II BMV video and audio decoder
+ * Copyright (c) 2011 Konstantin Shishkov
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+
+enum BMVFlags{
+ BMV_NOP = 0,
+ BMV_END,
+ BMV_DELTA,
+ BMV_INTRA,
+
+ BMV_SCROLL = 0x04,
+ BMV_PALETTE = 0x08,
+ BMV_COMMAND = 0x10,
+ BMV_AUDIO = 0x20,
+ BMV_EXT = 0x40,
+ BMV_PRINT = 0x80
+};
+
+#define SCREEN_WIDE 640
+#define SCREEN_HIGH 429
+
+typedef struct BMVDecContext {
+ AVCodecContext *avctx;
+ AVFrame pic;
+
+ uint8_t *frame, frame_base[SCREEN_WIDE * (SCREEN_HIGH + 1)];
+ uint32_t pal[256];
+ const uint8_t *stream;
+} BMVDecContext;
+
+#define NEXT_BYTE(v) v = forward ? v + 1 : v - 1;
+
+static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame, int frame_off)
+{
+ int val, saved_val = 0;
+ int tmplen = src_len;
+ const uint8_t *src, *source_end = source + src_len;
+ uint8_t *frame_end = frame + SCREEN_WIDE * SCREEN_HIGH;
+ uint8_t *dst, *dst_end;
+ int len, mask;
+ int forward = (frame_off <= -SCREEN_WIDE) || (frame_off >= 0);
+ int read_two_nibbles, flag;
+ int advance_mode;
+ int mode = 0;
+ int i;
+
+ if (src_len <= 0)
+ return -1;
+
+ if (forward) {
+ src = source;
+ dst = frame;
+ dst_end = frame_end;
+ } else {
+ src = source + src_len - 1;
+ dst = frame_end - 1;
+ dst_end = frame - 1;
+ }
+ for (;;) {
+ int shift = 0;
+ flag = 0;
+
+ /* The mode/len decoding is a bit strange:
+ * values are coded as variable-length codes with nibble units,
+ * code end is signalled by two top bits in the nibble being nonzero.
+ * And since data is bytepacked and we read two nibbles at a time,
+ * we may get a nibble belonging to the next code.
+ * Hence this convoluted loop.
+ */
+ if (!mode || (tmplen == 4)) {
+ if (src < source || src >= source_end)
+ return -1;
+ val = *src;
+ read_two_nibbles = 1;
+ } else {
+ val = saved_val;
+ read_two_nibbles = 0;
+ }
+ if (!(val & 0xC)) {
+ for (;;) {
+ if (!read_two_nibbles) {
+ if (src < source || src >= source_end)
+ return -1;
+ shift += 2;
+ val |= *src << shift;
+ if (*src & 0xC)
+ break;
+ }
+ // two upper bits of the nibble is zero,
+ // so shift top nibble value down into their place
+ read_two_nibbles = 0;
+ shift += 2;
+ mask = (1 << shift) - 1;
+ val = ((val >> 2) & ~mask) | (val & mask);
+ NEXT_BYTE(src);
+ if ((val & (0xC << shift))) {
+ flag = 1;
+ break;
+ }
+ }
+ } else if (mode) {
+ flag = tmplen != 4;
+ }
+ if (flag) {
+ tmplen = 4;
+ } else {
+ saved_val = val >> (4 + shift);
+ tmplen = 0;
+ val &= (1 << (shift + 4)) - 1;
+ NEXT_BYTE(src);
+ }
+ advance_mode = val & 1;
+ len = (val >> 1) - 1;
+ mode += 1 + advance_mode;
+ if (mode >= 4)
+ mode -= 3;
+ if (FFABS(dst_end - dst) < len)
+ return -1;
+ switch (mode) {
+ case 1:
+ if (forward) {
+ if (dst - frame + SCREEN_WIDE < frame_off ||
+ frame_end - dst < frame_off + len)
+ return -1;
+ for (i = 0; i < len; i++)
+ dst[i] = dst[frame_off + i];
+ dst += len;
+ } else {
+ dst -= len;
+ if (dst - frame + SCREEN_WIDE < frame_off ||
+ frame_end - dst < frame_off + len)
+ return -1;
+ for (i = len - 1; i >= 0; i--)
+ dst[i] = dst[frame_off + i];
+ }
+ break;
+ case 2:
+ if (forward) {
+ if (source + src_len - src < len)
+ return -1;
+ memcpy(dst, src, len);
+ dst += len;
+ src += len;
+ } else {
+ if (src - source < len)
+ return -1;
+ dst -= len;
+ src -= len;
+ memcpy(dst, src, len);
+ }
+ break;
+ case 3:
+ val = forward ? dst[-1] : dst[1];
+ if (forward) {
+ memset(dst, val, len);
+ dst += len;
+ } else {
+ dst -= len;
+ memset(dst, val, len);
+ }
+ break;
+ default:
+ break;
+ }
+ if (dst == dst_end)
+ return 0;
+ }
+ return 0;
+}
+
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *pkt)
+{
+ BMVDecContext * const c = avctx->priv_data;
+ int type, scr_off;
+ int i;
+ uint8_t *srcptr, *outptr;
+
+ c->stream = pkt->data;
+ type = bytestream_get_byte(&c->stream);
+ if (type & BMV_AUDIO) {
+ int blobs = bytestream_get_byte(&c->stream);
+ if (pkt->size < blobs * 65 + 2) {
+ av_log(avctx, AV_LOG_ERROR, "Audio data doesn't fit in frame\n");
+ return AVERROR_INVALIDDATA;
+ }
+ c->stream += blobs * 65;
+ }
+ if (type & BMV_COMMAND) {
+ int command_size = (type & BMV_PRINT) ? 8 : 10;
+ if (c->stream - pkt->data + command_size > pkt->size) {
+ av_log(avctx, AV_LOG_ERROR, "Command data doesn't fit in frame\n");
+ return AVERROR_INVALIDDATA;
+ }
+ c->stream += command_size;
+ }
+ if (type & BMV_PALETTE) {
+ if (c->stream - pkt->data > pkt->size - 768) {
+ av_log(avctx, AV_LOG_ERROR, "Palette data doesn't fit in frame\n");
+ return AVERROR_INVALIDDATA;
+ }
+ for (i = 0; i < 256; i++)
+ c->pal[i] = bytestream_get_be24(&c->stream);
+ }
+ if (type & BMV_SCROLL) {
+ if (c->stream - pkt->data > pkt->size - 2) {
+ av_log(avctx, AV_LOG_ERROR, "Screen offset data doesn't fit in frame\n");
+ return AVERROR_INVALIDDATA;
+ }
+ scr_off = (int16_t)bytestream_get_le16(&c->stream);
+ } else if ((type & BMV_INTRA) == BMV_INTRA) {
+ scr_off = -640;
+ } else {
+ scr_off = 0;
+ }
+
+ if (decode_bmv_frame(c->stream, pkt->size - (c->stream - pkt->data), c->frame, scr_off)) {
+ av_log(avctx, AV_LOG_ERROR, "Error decoding frame data\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE);
+ c->pic.palette_has_changed = type & BMV_PALETTE;
+
+ outptr = c->pic.data[0];
+ srcptr = c->frame;
+
+ for (i = 0; i < avctx->height; i++) {
+ memcpy(outptr, srcptr, avctx->width);
+ srcptr += avctx->width;
+ outptr += c->pic.linesize[0];
+ }
+
+ *data_size = sizeof(AVFrame);
+ *(AVFrame*)data = c->pic;
+
+ /* always report that the buffer was completely consumed */
+ return pkt->size;
+}
+
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+ BMVDecContext * const c = avctx->priv_data;
+
+ c->avctx = avctx;
+ avctx->pix_fmt = PIX_FMT_PAL8;
+
+ c->pic.reference = 1;
+ if (avctx->get_buffer(avctx, &c->pic) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return -1;
+ }
+
+ c->frame = c->frame_base + 640;
+
+ return 0;
+}
+
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+ BMVDecContext *c = avctx->priv_data;
+
+ if (c->pic.data[0])
+ avctx->release_buffer(avctx, &c->pic);
+
+ return 0;
+}
+
+static const int bmv_aud_mults[16] = {
+ 16512, 8256, 4128, 2064, 1032, 516, 258, 192, 129, 88, 64, 56, 48, 40, 36, 32
+};
+
+static av_cold int bmv_aud_decode_init(AVCodecContext *avctx)
+{
+
+ if (avctx->channels != 2) {
+ av_log(avctx, AV_LOG_INFO, "invalid number of channels\n");
+ return AVERROR(EINVAL);
+ }
+
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+ return 0;
+}
+
+static int bmv_aud_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+ AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ int blocks = 0, total_blocks, i;
+ int out_size;
+ int16_t *output_samples = data;
+ int scale[2];
+
+ total_blocks = *buf++;
+ if (buf_size < total_blocks * 65 + 1) {
+ av_log(avctx, AV_LOG_ERROR, "expected %d bytes, got %d\n",
+ total_blocks * 65 + 1, buf_size);
+ return AVERROR_INVALIDDATA;
+ }
+ out_size = total_blocks * 64 * sizeof(*output_samples);
+ if (*data_size < out_size) {
+ av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
+ return AVERROR(EINVAL);
+ }
+
+ for (blocks = 0; blocks < total_blocks; blocks++) {
+ uint8_t code = *buf++;
+ code = (code >> 1) | (code << 7);
+ scale[0] = bmv_aud_mults[code & 0xF];
+ scale[1] = bmv_aud_mults[code >> 4];
+ for (i = 0; i < 32; i++) {
+ *output_samples++ = av_clip_int16((scale[0] * (int8_t)*buf++) >> 5);
+ *output_samples++ = av_clip_int16((scale[1] * (int8_t)*buf++) >> 5);
+ }
+ }
+
+ *data_size = out_size;
+ return buf_size;
+}
+
+AVCodec ff_bmv_video_decoder = {
+ .name = "bmv_video",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_BMV_VIDEO,
+ .priv_data_size = sizeof(BMVDecContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"),
+};
+
+AVCodec ff_bmv_audio_decoder = {
+ .name = "bmv_audio",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_BMV_AUDIO,
+ .init = bmv_aud_decode_init,
+ .decode = bmv_aud_decode_frame,
+ .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"),
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3fc418e..5e07ec2 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 16
+#define LIBAVCODEC_VERSION_MINOR 17
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 54bc8a1..0c7d258 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -46,6 +46,7 @@ OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o
OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
+OBJS-$(CONFIG_BMV_DEMUXER) += bmv.o
OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o
OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 01900e8..00924c8 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -70,6 +70,7 @@ void av_register_all(void)
REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid);
REGISTER_DEMUXER (BFI, bfi);
REGISTER_DEMUXER (BINK, bink);
+ REGISTER_DEMUXER (BMV, bmv);
REGISTER_DEMUXER (C93, c93);
REGISTER_DEMUXER (CAF, caf);
REGISTER_MUXDEMUX (CAVSVIDEO, cavsvideo);
diff --git a/libavformat/bmv.c b/libavformat/bmv.c
new file mode 100644
index 0000000..fb41712
--- /dev/null
+++ b/libavformat/bmv.c
@@ -0,0 +1,136 @@
+/*
+ * Discworld II BMV demuxer
+ * Copyright (c) 2011 Konstantin Shishkov.
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+
+enum BMVFlags {
+ BMV_NOP = 0,
+ BMV_END,
+ BMV_DELTA,
+ BMV_INTRA,
+
+ BMV_AUDIO = 0x20,
+};
+
+typedef struct BMVContext {
+ uint8_t *packet;
+ int size;
+ int get_next;
+ int64_t audio_pos;
+} BMVContext;
+
+static int bmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+ AVStream *st, *ast;
+ BMVContext *c = s->priv_data;
+
+ st = avformat_new_stream(s, 0);
+ if (!st)
+ return AVERROR(ENOMEM);
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = CODEC_ID_BMV_VIDEO;
+ st->codec->width = 640;
+ st->codec->height = 429;
+ st->codec->pix_fmt = PIX_FMT_PAL8;
+ av_set_pts_info(st, 16, 1, 12);
+ ast = avformat_new_stream(s, 0);
+ if (!ast)
+ return AVERROR(ENOMEM);
+ ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ ast->codec->codec_id = CODEC_ID_BMV_AUDIO;
+ ast->codec->channels = 2;
+ ast->codec->sample_rate = 22050;
+ av_set_pts_info(ast, 16, 1, 22050);
+
+ c->get_next = 1;
+ c->audio_pos = 0;
+ return 0;
+}
+
+static int bmv_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ BMVContext *c = s->priv_data;
+ int type;
+ void *tmp;
+
+ while (c->get_next) {
+ if (s->pb->eof_reached)
+ return AVERROR_EOF;
+ type = avio_r8(s->pb);
+ if (type == BMV_NOP)
+ continue;
+ if (type == BMV_END)
+ return AVERROR_EOF;
+ c->size = avio_rl24(s->pb);
+ if (!c->size)
+ return AVERROR_INVALIDDATA;
+ tmp = av_realloc(c->packet, c->size + 1);
+ if (!tmp)
+ return AVERROR(ENOMEM);
+ c->packet = tmp;
+ c->packet[0] = type;
+ if (avio_read(s->pb, c->packet + 1, c->size) != c->size)
+ return AVERROR(EIO);
+ if (type & BMV_AUDIO) {
+ int audio_size = c->packet[1] * 65 + 1;
+ if (audio_size >= c->size) {
+ av_log(s, AV_LOG_ERROR, "Reported audio size %d is bigger than packet size (%d)\n",
+ audio_size, c->size);
+ return AVERROR_INVALIDDATA;
+ }
+ if (av_new_packet(pkt, audio_size) < 0)
+ return AVERROR(ENOMEM);
+ memcpy(pkt->data, c->packet + 1, pkt->size);
+ pkt->stream_index = 1;
+ pkt->pts = c->audio_pos;
+ pkt->duration = c->packet[1] * 32;
+ c->audio_pos += pkt->duration;
+ c->get_next = 0;
+ return pkt->size;
+ } else
+ break;
+ }
+ if (av_new_packet(pkt, c->size + 1) < 0)
+ return AVERROR(ENOMEM);
+ pkt->stream_index = 0;
+ c->get_next = 1;
+ memcpy(pkt->data, c->packet, pkt->size);
+ return pkt->size;
+}
+
+static int bmv_read_close(AVFormatContext *s)
+{
+ BMVContext *c = s->priv_data;
+
+ av_freep(&c->packet);
+
+ return 0;
+}
+
+AVInputFormat ff_bmv_demuxer = {
+ .name = "bmv",
+ .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV"),
+ .priv_data_size = sizeof(BMVContext),
+ .read_header = bmv_read_header,
+ .read_packet = bmv_read_packet,
+ .read_close = bmv_read_close,
+ .extensions = "bmv"
+};
diff --git a/libavformat/version.h b/libavformat/version.h
index 48f2303..ec5d1fd 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -24,7 +24,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 53
-#define LIBAVFORMAT_VERSION_MINOR 13
+#define LIBAVFORMAT_VERSION_MINOR 14
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list