Re: [FFmpeg-devel] [PATCH 3/6] Add CRYO APC muxer

["Tomas Härdin" <git@haerdin.se>]

[-- Attachment #1: Type: text/plain, Size: 139 bytes --]

Updated patch attached. I reordered the patch series a bit also, will
post the entire series once this patch looks good enough

/Tomas

[-- Attachment #2: 0004-lavf-Add-CRYO-APC-muxer.patch --]
[-- Type: text/x-patch, Size: 7152 bytes --]

From ab94ae3520923ceb305055a0e568f3293e0e0c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Tue, 26 Dec 2023 14:32:10 +0100
Subject: [PATCH 4/6] lavf: Add CRYO APC muxer

---
 Changelog                 |   1 +
 doc/general_contents.texi |   2 +-
 libavformat/Makefile      |   1 +
 libavformat/allformats.c  |   1 +
 libavformat/apcenc.c      | 124 ++++++++++++++++++++++++++++++++++++++
 libavformat/version.h     |   2 +-
 6 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 libavformat/apcenc.c

diff --git a/Changelog b/Changelog
index a638c03250..31c9e25be6 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,7 @@ version <next>:
 - IAMF raw demuxer and muxer
 - D3D12VA hardware accelerated H264, HEVC, VP9, AV1, MPEG-2 and VC1 decoding
 - tiltandshift filter
+- CRYO APC muxer
 
 version 6.1:
 - libaribcaption decoder
diff --git a/doc/general_contents.texi b/doc/general_contents.texi
index ec7516dce8..df31edd060 100644
--- a/doc/general_contents.texi
+++ b/doc/general_contents.texi
@@ -464,7 +464,7 @@ library:
 @item CRC testing format        @tab X @tab
 @item Creative Voice            @tab X @tab X
     @tab Created for the Sound Blaster Pro.
-@item CRYO APC                  @tab   @tab X
+@item CRYO APC                  @tab X @tab X
     @tab Audio format used in some games by CRYO Interactive Entertainment.
 @item D-Cinema audio            @tab X @tab X
 @item Deluxe Paint Animation    @tab   @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 581e378d95..f605f4ae69 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -105,6 +105,7 @@ OBJS-$(CONFIG_AMV_MUXER)                 += amvenc.o
 OBJS-$(CONFIG_ANM_DEMUXER)               += anm.o
 OBJS-$(CONFIG_APAC_DEMUXER)              += apac.o rawdec.o
 OBJS-$(CONFIG_APC_DEMUXER)               += apc.o
+OBJS-$(CONFIG_APC_MUXER)                 += apcenc.o
 OBJS-$(CONFIG_APE_DEMUXER)               += ape.o apetag.o img2.o
 OBJS-$(CONFIG_APM_DEMUXER)               += apm.o
 OBJS-$(CONFIG_APM_MUXER)                 += apm.o rawenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index ce6be5f04d..18a33d7448 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -60,6 +60,7 @@ extern const FFOutputFormat ff_amv_muxer;
 extern const AVInputFormat  ff_anm_demuxer;
 extern const AVInputFormat  ff_apac_demuxer;
 extern const AVInputFormat  ff_apc_demuxer;
+extern const FFOutputFormat ff_apc_muxer;
 extern const AVInputFormat  ff_ape_demuxer;
 extern const AVInputFormat  ff_apm_demuxer;
 extern const FFOutputFormat ff_apm_muxer;
diff --git a/libavformat/apcenc.c b/libavformat/apcenc.c
new file mode 100644
index 0000000000..175c6c6cdd
--- /dev/null
+++ b/libavformat/apcenc.c
@@ -0,0 +1,124 @@
+/*
+ * CRYO APC audio format muxer
+ * Copyright (c) 2023 Tomas Härdin <git@haerdin.se>
+ *
+ * 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 "avio_internal.h"
+#include "internal.h"
+#include "mux.h"
+
+#define APC_HEADER_SIZE (8*4)
+
+static int apc_write_header(AVFormatContext *s)
+{
+    AVCodecParameters *par;
+    AVStream *st;
+
+    if (s->nb_streams != 1) {
+        av_log(s, AV_LOG_ERROR, "Must have exactly one stream\n");
+        return AVERROR(EINVAL);
+    }
+
+    st = s->streams[0];
+    par = st->codecpar;
+
+    if (par->ch_layout.nb_channels <= 0 || par->ch_layout.nb_channels > 2) {
+        av_log(s, AV_LOG_ERROR, "Must be mono or stereo\n");
+        return AVERROR(EINVAL);
+    }
+
+    avpriv_set_pts_info(st, 64, 1, par->sample_rate);
+    // delay writing the actual header until we get extradata from the encoder
+    return 0;
+}
+
+static int apc_write_header_delayed(AVFormatContext *s, AVPacket *pkt)
+{
+    AVIOContext *pb = s->pb;
+    AVCodecParameters *par = s->streams[0]->codecpar;
+    size_t new_extradata_size = 0, extradata_size;
+    const uint8_t *new_extradata = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &new_extradata_size), *extradata;
+
+    // prefer updated extradata from the encoder
+    if (new_extradata) {
+        extradata_size = new_extradata_size;
+        extradata = new_extradata;
+    } else {
+        extradata_size = par->extradata_size;
+        extradata = par->extradata;
+    }
+
+    if (extradata_size != 8) {
+        av_log(s, AV_LOG_ERROR, "Must have exactly 8 bytes of extradata, got %zu\n", extradata_size);
+        return AVERROR(EINVAL);
+    }
+
+    ffio_wfourcc(pb, "CRYO");
+    ffio_wfourcc(pb, "_APC");
+    ffio_wfourcc(pb, "1.20");
+    avio_wl32(pb, 0); // number or samples. updated in apc_write_trailer()
+    avio_wl32(pb, par->sample_rate);
+    avio_write(pb, extradata, extradata_size);
+    avio_wl32(pb, par->ch_layout.nb_channels - 1);
+
+    return 0;
+}
+
+static int apc_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    if (avio_tell(s->pb) == 0) {
+        // first packet - write header
+        int ret;
+        if ((ret = apc_write_header_delayed(s, pkt)) < 0)
+            return ret;
+    }
+
+    avio_write(s->pb, pkt->data, pkt->size);
+    return 0;
+}
+
+static int apc_write_trailer(AVFormatContext *s)
+{
+    int64_t file_size = avio_tell(s->pb);
+
+    // write length, if we're able to seek back
+    if (avio_seek(s->pb, 12, SEEK_SET) >= 0) {
+        int64_t data_size = file_size -= APC_HEADER_SIZE;
+        int channels = s->streams[0]->codecpar->ch_layout.nb_channels;
+
+        if (data_size / channels > UINT32_MAX / 2) {
+            av_log(s, AV_LOG_ERROR, "File too large\n");
+            return AVERROR(EINVAL);
+        }
+
+        avio_wl32(s->pb, data_size * 2 / channels);
+    }
+    return 0;
+}
+
+const FFOutputFormat ff_apc_muxer = {
+    .p.name         = "apc",
+    .p.long_name    = NULL_IF_CONFIG_SMALL("CRYO APC"),
+    .p.extensions   = "apc",
+    .p.audio_codec  = AV_CODEC_ID_ADPCM_IMA_APC,
+    .write_header   = apc_write_header,
+    .write_packet   = apc_write_packet,
+    .write_trailer  = apc_write_trailer,
+};
+
diff --git a/libavformat/version.h b/libavformat/version.h
index de9cc8e31d..683184d5da 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  20
+#define LIBAVFORMAT_VERSION_MINOR  21
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-- 
2.39.2


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".