AST Muxer

Signed-off-by: James Almer <jamrial@gmail.com>

Changelog

@@ -24,7 +24,7 @@ version <next>:
 - AVR demuxer
 - geq filter ported from libmpcodecs
 - remove ffserver daemon mode
-- AST demuxer
+- AST muxer/demuxer
 - new expansion syntax for drawtext
 - BRender PIX image decoder
 - ffprobe -show_entries option

doc/general.texi

@@ -150,7 +150,7 @@ library:
 @item AFC                       @tab   @tab X
     @tab Audio format used on the Nintendo Gamecube.
 @item ASF                       @tab X @tab X
-@item AST                       @tab   @tab X
+@item AST                       @tab X @tab X
     @tab Audio format used on the Nintendo Wii.
 @item AVI                       @tab X @tab X
 @item AVISynth                  @tab   @tab X

libavformat/Makefile

@@ -51,7 +51,8 @@ OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec.o asf.o asfcrypt.o \
 OBJS-$(CONFIG_ASF_MUXER)                 += asfenc.o asf.o
 OBJS-$(CONFIG_ASS_DEMUXER)               += assdec.o
 OBJS-$(CONFIG_ASS_MUXER)                 += assenc.o
-OBJS-$(CONFIG_AST_DEMUXER)               += astdec.o
+OBJS-$(CONFIG_AST_DEMUXER)               += ast.o astdec.o
+OBJS-$(CONFIG_AST_MUXER)                 += ast.o astenc.o
 OBJS-$(CONFIG_AU_DEMUXER)                += au.o pcm.o
 OBJS-$(CONFIG_AU_MUXER)                  += au.o
 OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o

libavformat/allformats.c

@@ -65,7 +65,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (APE, ape);
     REGISTER_MUXDEMUX (ASF, asf);
     REGISTER_MUXDEMUX (ASS, ass);
-    REGISTER_DEMUXER  (AST, ast);
+    REGISTER_MUXDEMUX (AST, ast);
     REGISTER_MUXER    (ASF_STREAM, asf_stream);
     REGISTER_MUXDEMUX (AU, au);
     REGISTER_MUXDEMUX (AVI, avi);

libavformat/ast.c

+/*
+ * AST common code
+ * Copyright (c) 2012 James Almer
+ *
+ * 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 "avformat.h"
+#include "internal.h"
+
+const AVCodecTag ff_codec_ast_tags[] = {
+    { AV_CODEC_ID_ADPCM_AFC,          0 },
+    { AV_CODEC_ID_PCM_S16BE_PLANAR,   1 },
+    { AV_CODEC_ID_NONE,               0 },
+};

libavformat/ast.h

+/*
+ * AST common code
+ * Copyright (c) 2012 James Almer
+ *
+ * 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
+ */
+
+#ifndef AVFORMAT_AST_H
+#define AVFORMAT_AST_H
+
+#include "avformat.h"
+#include "internal.h"
+
+extern const AVCodecTag ff_codec_ast_tags[];
+
+#endif /* AVFORMAT_AST_H */

libavformat/astdec.c

@@ -23,6 +23,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
+#include "ast.h"
 
 static int ast_probe(AVProbeData *p)
 {
@@ -36,7 +37,7 @@ static int ast_probe(AVProbeData *p)
 
 static int ast_read_header(AVFormatContext *s)
 {
-    int codec, depth;
+    int depth;
     AVStream *st;
 
     st = avformat_new_stream(s, NULL);
@@ -44,17 +45,8 @@ static int ast_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     avio_skip(s->pb, 8);
-    codec = avio_rb16(s->pb);
-    switch (codec) {
-    case 0:
-        st->codec->codec_id = AV_CODEC_ID_ADPCM_AFC;
-        break;
-    case 1:
-        st->codec->codec_id = AV_CODEC_ID_PCM_S16BE_PLANAR;
-        break;
-    default:
-        av_log(s, AV_LOG_ERROR, "unsupported codec %d\n", codec);
-    }
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    st->codec->codec_id   = ff_codec_get_id(ff_codec_ast_tags, avio_rb16(s->pb));
 
     depth = avio_rb16(s->pb);
     if (depth != 16) {
@@ -62,7 +54,6 @@ static int ast_read_header(AVFormatContext *s)
         return AVERROR_INVALIDDATA;
     }
 
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->channels = avio_rb16(s->pb);
     if (!st->codec->channels)
         return AVERROR_INVALIDDATA;
@@ -124,4 +115,5 @@ AVInputFormat ff_ast_demuxer = {
     .read_packet    = ast_read_packet,
     .extensions     = "ast",
     .flags          = AVFMT_GENERIC_INDEX,
+    .codec_tag      = (const AVCodecTag* const []){ff_codec_ast_tags, 0},
 };

libavformat/astenc.c

+/*
+ * AST muxer
+ * Copyright (c) 2012 James Almer
+ *
+ * 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 "avformat.h"
+#include "avio_internal.h"
+#include "internal.h"
+#include "ast.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+
+typedef struct ASTMuxContext {
+    AVClass *class;
+    int64_t  size;
+    int64_t  samples;
+    int64_t  loopstart;
+    int64_t  loopend;
+    int      fbs;
+} ASTMuxContext;
+
+#define CHECK_LOOP(type) \
+    if (ast->loop ## type) { \
+        ast->loop ## type = av_rescale_q_rnd(ast->loop ## type, (AVRational){enc->sample_rate, 1}, (AVRational){1000, 1}, AV_ROUND_DOWN); \
+        if (ast->loop ## type < 0 || ast->loop ## type > UINT_MAX) { \
+            av_log(s, AV_LOG_ERROR, "Invalid loop" #type " value\n"); \
+            return AVERROR(EINVAL);  \
+        } \
+    }
+
+static int ast_write_header(AVFormatContext *s)
+{
+    ASTMuxContext *ast = s->priv_data;
+    AVIOContext *pb = s->pb;
+    AVCodecContext *enc;
+    unsigned int codec_tag;
+
+    if (s->nb_streams = 1) {
+        enc = s->streams[0]->codec;
+    } else {
+        av_log(s, AV_LOG_ERROR, "only one stream is supported\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (enc->codec_id == AV_CODEC_ID_ADPCM_AFC) {
+        av_log(s, AV_LOG_ERROR, "muxing ADPCM AFC is not implemented\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
+    codec_tag = ff_codec_get_tag(ff_codec_ast_tags, enc->codec_id);
+    if (!codec_tag) {
+        av_log(s, AV_LOG_ERROR, "unsupported codec\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (ast->loopstart && ast->loopend && ast->loopstart >= ast->loopend) {
+        av_log(s, AV_LOG_ERROR, "loopend can't be less or equal to loopstart\n");
+        return AVERROR(EINVAL);
+    }
+
+    /* Convert milliseconds to samples */
+    CHECK_LOOP(start)
+    CHECK_LOOP(end)
+
+    ffio_wfourcc(pb, "STRM");
+
+    ast->size = avio_tell(pb);
+    avio_wb32(pb, 0); /* File size minus header */
+    avio_wb16(pb, codec_tag);
+    avio_wb16(pb, 16); /* Bit depth */
+    avio_wb16(pb, enc->channels);
+    avio_wb16(pb, 0xFFFF);
+    avio_wb32(pb, enc->sample_rate);
+
+    ast->samples = avio_tell(pb);
+    avio_wb32(pb, 0); /* Number of samples */
+    avio_wb32(pb, 0); /* Loopstart */
+    avio_wb32(pb, 0); /* Loopend */
+    avio_wb32(pb, 0); /* Size of first block */
+
+    /* Unknown */
+    avio_wb32(pb, 0);
+    avio_wl32(pb, 0x7F);
+    avio_wb64(pb, 0);
+    avio_wb64(pb, 0);
+    avio_wb32(pb, 0);
+
+    avio_flush(pb);
+
+    return 0;
+}
+
+static int ast_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    AVIOContext *pb = s->pb;
+    ASTMuxContext *ast = s->priv_data;
+    AVCodecContext *enc = s->streams[0]->codec;
+    int size = pkt->size / enc->channels;
+
+    if (enc->frame_number == 1)
+        ast->fbs = size;
+
+    ffio_wfourcc(pb, "BLCK");
+    avio_wb32(pb, size); /* Block size */
+
+    /* padding */
+    avio_wb64(pb, 0);
+    avio_wb64(pb, 0);
+    avio_wb64(pb, 0);
+
+    avio_write(pb, pkt->data, pkt->size);
+
+    return 0;
+}
+
+static int ast_write_trailer(AVFormatContext *s)
+{
+    AVIOContext *pb = s->pb;
+    ASTMuxContext *ast = s->priv_data;
+    AVCodecContext *enc = s->streams[0]->codec;
+    int64_t file_size = avio_tell(pb);
+    int64_t samples = (file_size - 64 - (32 * enc->frame_number)) / enc->block_align; /* PCM_S16BE_PLANAR */
+
+    av_log(s, AV_LOG_DEBUG, "total samples: %"PRId64"\n", samples);
+
+    if (s->pb->seekable) {
+        /* File size minus header */
+        avio_seek(pb, ast->size, SEEK_SET);
+        avio_wb32(pb, file_size - 64);
+
+        /* Number of samples */
+        avio_seek(pb, ast->samples, SEEK_SET);
+        avio_wb32(pb, samples);
+
+        /* Loopstart if provided */
+        if (ast->loopstart && ast->loopstart >= samples) {
+            av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n");
+            ast->loopstart = 0;
+        }
+        avio_wb32(pb, ast->loopstart);
+
+        /* Loopend if provided. Otherwise number of samples again */
+        if (ast->loopend) {
+            if (ast->loopend > samples) {
+                av_log(s, AV_LOG_WARNING, "Loopend value is out of range and will be ignored\n");
+                ast->loopend = samples;
+            }
+            avio_wb32(pb, ast->loopend);
+        } else {
+            avio_wb32(pb, samples);
+        }
+
+        /* Size of first block */
+        avio_wb32(pb, ast->fbs);
+        avio_flush(pb);
+    }
+    return 0;
+}
+
+#define OFFSET(obj) offsetof(ASTMuxContext, obj)
+static const AVOption options[] = {
+  { "loopstart", "Loopstart position in milliseconds.", OFFSET(loopstart), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
+  { "loopend",   "Loopend position in milliseconds.",   OFFSET(loopend),   AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
+  { NULL },
+};
+
+static const AVClass ast_muxer_class = {
+    .class_name = "AST muxer",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_ast_muxer = {
+    .name              = "ast",
+    .long_name         = NULL_IF_CONFIG_SMALL("AST (Audio Stream)"),
+    .extensions        = "ast",
+    .priv_data_size    = sizeof(ASTMuxContext),
+    .audio_codec       = AV_CODEC_ID_PCM_S16BE_PLANAR,
+    .video_codec       = AV_CODEC_ID_NONE,
+    .write_header      = ast_write_header,
+    .write_packet      = ast_write_packet,
+    .write_trailer     = ast_write_trailer,
+    .priv_class        = &ast_muxer_class,
+    .codec_tag         = (const AVCodecTag* const []){ff_codec_ast_tags, 0},
+};

libavformat/version.h

@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 54
-#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, \

tests/fate/avformat.mak

 FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)               += aiff
 FATE_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)           += alaw
 FATE_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
+FATE_LAVF-$(call ENCDEC,  PCM_S16BE_PLANAR,      AST)                += ast
 FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)                 += au
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
 FATE_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)             += bmp

tests/lavf-regression.sh

@@ -326,6 +326,10 @@ if [ -n "$do_caf" ] ; then
 do_audio_only caf
 fi
 
+if [ -n "$do_ast" ] ; then
+do_audio_only ast "-ac 2" "-loopstart 1 -loopend 10"
+fi
+
 # pix_fmt conversions
 
 if [ -n "$do_pixfmt" ] ; then

tests/ref/lavf/ast

+7fa8cd2dd7453428e71930a7c65f7b62 *./tests/data/lavf/lavf.ast
+181696 ./tests/data/lavf/lavf.ast
+./tests/data/lavf/lavf.ast CRC=0x7bd585ff