diff mbox series

[FFmpeg-devel,v6,1/1] avformat: add kvag muxer

Message ID 20200529105425.318638-2-zane@zanevaniperen.com
State Accepted
Headers show
Series adpcm_ima_ssi encoder + kvag muxer | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Zane van Iperen May 29, 2020, 10:54 a.m. UTC 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
---
 Changelog                |  1 +
 libavformat/Makefile     |  1 +
 libavformat/allformats.c |  1 +
 libavformat/kvag.c       | 82 +++++++++++++++++++++++++++++++++++++++-
 libavformat/version.h    |  2 +-
 5 files changed, 85 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer May 29, 2020, 9:41 p.m. UTC | #1 
On Fri, May 29, 2020 at 10:54:59AM +0000, Zane van Iperen wrote:
> Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
> ---
>  Changelog                |  1 +
>  libavformat/Makefile     |  1 +
>  libavformat/allformats.c |  1 +
>  libavformat/kvag.c       | 82 +++++++++++++++++++++++++++++++++++++++-
>  libavformat/version.h    |  2 +-
>  5 files changed, 85 insertions(+), 2 deletions(-)

should the muxer not be in its own file ?
that would avoid #if*

thx

[...]
Zane van Iperen May 30, 2020, 12:10 a.m. UTC | #2 
On Fri, 29 May 2020 23:41:46 +0200
"Michael Niedermayer" <michael@niedermayer.cc> wrote:

> 
> On Fri, May 29, 2020 at 10:54:59AM +0000, Zane van Iperen wrote:
> > Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
> > ---
> >  Changelog                |  1 +
> >  libavformat/Makefile     |  1 +
> >  libavformat/allformats.c |  1 +
> >  libavformat/kvag.c       | 82
> > +++++++++++++++++++++++++++++++++++++++- libavformat/version.h    |
> >  2 +- 5 files changed, 85 insertions(+), 2 deletions(-)
> 
> should the muxer not be in its own file ?
> that would avoid #if*
> 
Normally, I'd agree. However, it's a very simple format and there's not
actually that much code, so I think separate files is overkill for this.

Zane
Michael Niedermayer May 30, 2020, 10:22 p.m. UTC | #3 
On Sat, May 30, 2020 at 12:10:14AM +0000, Zane van Iperen wrote:
> On Fri, 29 May 2020 23:41:46 +0200
> "Michael Niedermayer" <michael@niedermayer.cc> wrote:
> 
> > 
> > On Fri, May 29, 2020 at 10:54:59AM +0000, Zane van Iperen wrote:
> > > Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
> > > ---
> > >  Changelog                |  1 +
> > >  libavformat/Makefile     |  1 +
> > >  libavformat/allformats.c |  1 +
> > >  libavformat/kvag.c       | 82
> > > +++++++++++++++++++++++++++++++++++++++- libavformat/version.h    |
> > >  2 +- 5 files changed, 85 insertions(+), 2 deletions(-)
> > 
> > should the muxer not be in its own file ?
> > that would avoid #if*
> > 
> Normally, I'd agree. However, it's a very simple format and there's not
> actually that much code, so I think separate files is overkill for this.

ok, will apply

thx

[...]
diff mbox series

Patch

diff --git a/Changelog b/Changelog
index 24dbbc2208..f40938187d 100644
--- a/Changelog
+++ b/Changelog
@@ -72,6 +72,7 @@  version <next>:
 - MediaFoundation encoder wrapper
 - untile filter
 - Simon & Schuster Interactive ADPCM encoder
+- Real War KVAG muxer
 
 
 version 4.2:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index efe82f9f08..0658fa3710 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -285,6 +285,7 @@  OBJS-$(CONFIG_JACOSUB_MUXER)             += jacosubenc.o rawenc.o
 OBJS-$(CONFIG_JV_DEMUXER)                += jvdec.o
 OBJS-$(CONFIG_KUX_DEMUXER)               += flvdec.o
 OBJS-$(CONFIG_KVAG_DEMUXER)              += kvag.o
+OBJS-$(CONFIG_KVAG_MUXER)                += kvag.o rawenc.o
 OBJS-$(CONFIG_LATM_MUXER)                += latmenc.o rawenc.o
 OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
 OBJS-$(CONFIG_LOAS_DEMUXER)              += loasdec.o rawdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 3919c9e4c1..a7c5c9db89 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -220,6 +220,7 @@  extern AVOutputFormat ff_jacosub_muxer;
 extern AVInputFormat  ff_jv_demuxer;
 extern AVInputFormat  ff_kux_demuxer;
 extern AVInputFormat  ff_kvag_demuxer;
+extern AVOutputFormat ff_kvag_muxer;
 extern AVOutputFormat ff_latm_muxer;
 extern AVInputFormat  ff_lmlm4_demuxer;
 extern AVInputFormat  ff_loas_demuxer;
diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index 71b0eb4118..0a11fc0556 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -1,5 +1,5 @@ 
 /*
- * Simon & Schuster Interactive VAG demuxer
+ * Simon & Schuster Interactive VAG (de)muxer
  *
  * Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com)
  *
@@ -21,6 +21,7 @@ 
  */
 #include "avformat.h"
 #include "internal.h"
+#include "rawenc.h"
 #include "libavutil/intreadwrite.h"
 
 #define KVAG_TAG            MKTAG('K', 'V', 'A', 'G')
@@ -34,6 +35,7 @@  typedef struct KVAGHeader {
     uint16_t    stereo;
 } KVAGHeader;
 
+#if CONFIG_KVAG_DEMUXER
 static int kvag_probe(const AVProbeData *p)
 {
     if (AV_RL32(p->buf) != KVAG_TAG)
@@ -115,3 +117,81 @@  AVInputFormat ff_kvag_demuxer = {
     .read_header    = kvag_read_header,
     .read_packet    = kvag_read_packet
 };
+#endif
+
+#if CONFIG_KVAG_MUXER
+static int kvag_write_init(AVFormatContext *s)
+{
+    AVCodecParameters *par;
+
+    if (s->nb_streams != 1) {
+        av_log(s, AV_LOG_ERROR, "KVAG files have exactly one stream\n");
+        return AVERROR(EINVAL);
+    }
+
+    par = s->streams[0]->codecpar;
+
+    if (par->codec_id != AV_CODEC_ID_ADPCM_IMA_SSI) {
+        av_log(s, AV_LOG_ERROR, "%s codec not supported\n",
+               avcodec_get_name(par->codec_id));
+        return AVERROR(EINVAL);
+    }
+
+    if (par->channels > 2) {
+        av_log(s, AV_LOG_ERROR, "KVAG files only support up to 2 channels\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) {
+        av_log(s, AV_LOG_WARNING, "Stream not seekable, unable to write output file\n");
+        return AVERROR(EINVAL);
+    }
+
+    return 0;
+}
+
+static int kvag_write_header(AVFormatContext *s)
+{
+    uint8_t buf[KVAG_HEADER_SIZE];
+    AVCodecParameters *par = s->streams[0]->codecpar;
+
+    AV_WL32(buf +  0, KVAG_TAG);
+    AV_WL32(buf +  4, 0); /* Data size, we fix this up later. */
+    AV_WL32(buf +  8, par->sample_rate);
+    AV_WL16(buf + 12, par->channels == 2);
+
+    avio_write(s->pb, buf, sizeof(buf));
+    return 0;
+}
+
+static int kvag_write_trailer(AVFormatContext *s)
+{
+    int64_t file_size, data_size;
+
+    file_size = avio_tell(s->pb);
+    data_size = file_size - KVAG_HEADER_SIZE;
+    if (data_size < UINT32_MAX) {
+        avio_seek(s->pb, 4, SEEK_SET);
+        avio_wl32(s->pb, (uint32_t)data_size);
+        avio_seek(s->pb, file_size, SEEK_SET);
+    } else {
+        av_log(s, AV_LOG_WARNING,
+               "Filesize %"PRId64" invalid for KVAG, output file will be broken\n",
+               file_size);
+    }
+
+    return 0;
+}
+
+AVOutputFormat ff_kvag_muxer = {
+    .name           = "kvag",
+    .long_name      = NULL_IF_CONFIG_SMALL("Simon & Schuster Interactive VAG"),
+    .extensions     = "vag",
+    .audio_codec    = AV_CODEC_ID_ADPCM_IMA_SSI,
+    .video_codec    = AV_CODEC_ID_NONE,
+    .init           = kvag_write_init,
+    .write_header   = kvag_write_header,
+    .write_packet   = ff_raw_write_packet,
+    .write_trailer  = kvag_write_trailer
+};
+#endif
diff --git a/libavformat/version.h b/libavformat/version.h
index 493a0b337f..e0135fc7d3 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@ 
 // 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  43
+#define LIBAVFORMAT_VERSION_MINOR  44
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \