avformat: add binka demuxer

diff --git a/Changelog b/Changelog
index 9a8b54da409dcc3868819413a54def959e5713e0..2a68b56bbab74c8604e183bd65f2435c8e9b7f04 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -64,6 +64,7 @@ version <next>:
 - colorcontrast filter
 - PFM encoder
 - colorcorrect filter
+- binka demuxer
 
 
 version 4.3:

diff --git a/libavformat/Makefile b/libavformat/Makefile
index bf1e56fc0af3f74e8cf3b897063f30c369b7b104..aca85878d006eb06d2dabe490dcb13c5314c16c2 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -129,6 +129,7 @@ OBJS-$(CONFIG_AVS3_DEMUXER)              += avs3dec.o rawdec.o
 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
 OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
 OBJS-$(CONFIG_BINK_DEMUXER)              += bink.o
+OBJS-$(CONFIG_BINKA_DEMUXER)             += binka.o
 OBJS-$(CONFIG_BINTEXT_DEMUXER)           += bintext.o sauce.o
 OBJS-$(CONFIG_BIT_DEMUXER)               += bit.o
 OBJS-$(CONFIG_BIT_MUXER)                 += bit.o

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6990af55f43addeee161b7b06b3a31fed13b4cfa..9628c726a71d7a7a471a4f89cf36752b6ee58299 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -94,6 +94,7 @@ extern AVInputFormat  ff_bethsoftvid_demuxer;
 extern AVInputFormat  ff_bfi_demuxer;
 extern AVInputFormat  ff_bintext_demuxer;
 extern AVInputFormat  ff_bink_demuxer;
+extern AVInputFormat  ff_binka_demuxer;
 extern AVInputFormat  ff_bit_demuxer;
 extern AVOutputFormat ff_bit_muxer;
 extern AVInputFormat  ff_bmv_demuxer;

diff --git a/libavformat/binka.c b/libavformat/binka.c
new file mode 100644 (file)
index 0000000..13ca9ca
--- /dev/null
+++ b/libavformat/binka.c
@@ -0,0 +1,100 @@
+/*
+ * 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
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "internal.h"
+
+static int binka_probe(const AVProbeData *p)
+{
+    if (AV_RB32(p->buf) == MKBETAG('1', 'F', 'C', 'B') &&
+        (p->buf[4] == 1 || p->buf[4] == 2))
+        return AVPROBE_SCORE_MAX;
+    return 0;
+}
+
+static int binka_read_header(AVFormatContext *s)
+{
+    AVIOContext *pb = s->pb;
+    AVStream *st;
+    int entries, offset;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    avio_skip(pb, 5);
+
+    st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_DCT;
+    st->codecpar->channels = avio_r8(pb);
+    st->codecpar->sample_rate = avio_rl16(pb);
+    st->duration = avio_rl32(pb);
+
+    avio_skip(pb, 8);
+    entries = avio_rl16(pb);
+
+    offset = entries * 2 + 2;
+    avio_skip(pb, offset);
+
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+
+    return 0;
+}
+
+static int binka_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    AVIOContext *pb = s->pb;
+    AVStream *st = s->streams[0];
+    int64_t pos;
+    int pkt_size;
+    int ret;
+
+    if (avio_feof(pb))
+        return AVERROR_EOF;
+
+    pos = avio_tell(pb);
+    avio_skip(pb, 2);
+    pkt_size = avio_rl16(pb) + 4;
+    if (pkt_size <= 4)
+        return AVERROR(EIO);
+    ret = av_new_packet(pkt, pkt_size);
+    if (ret < 0)
+        return ret;
+
+    avio_read(pb, pkt->data + 4, pkt_size - 4);
+    AV_WL32(pkt->data, pkt_size);
+
+    pkt->pos = pos;
+    pkt->stream_index = 0;
+    pkt->duration = av_get_audio_frame_duration2(st->codecpar, 0);
+
+    return 0;
+}
+
+AVInputFormat ff_binka_demuxer = {
+    .name           = "binka",
+    .long_name      = NULL_IF_CONFIG_SMALL("Bink Audio"),
+    .read_probe     = binka_probe,
+    .read_header    = binka_read_header,
+    .read_packet    = binka_read_packet,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "binka",
+};

diff --git a/libavformat/version.h b/libavformat/version.h
index a2b5901e74eab041e08d3ec91a03a8800edfeab6..b12ce3a843337c6811d6c18df58e951274315d4e 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,8 +32,8 @@
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
-#define LIBAVFORMAT_VERSION_MINOR  65
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MINOR  66
+#define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \