Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'

[ffmpeg] / libavformat / ast.c

diff --git a/libavformat/ast.c b/libavformat/ast.c
index 2027b579c5849e67db6d0e271a7cdeb954f309d4..9de74aae699ece71c829ff0074fdcff6902f20e9 100644 (file)
--- a/libavformat/ast.c
+++ b/libavformat/ast.c
@@ -1,6 +1,6 @@
 /*
- * AST demuxer
- * Copyright (c) 2012 Paul B Mahol
+ * AST common code
+ * Copyright (c) 2012 James Almer
  *
  * This file is part of FFmpeg.
  *
@@ -19,103 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/channel_layout.h"
-#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
 
-static int ast_probe(AVProbeData *p)
-{
-    if (AV_RL32(p->buf) == MKTAG('S', 'T', 'R', 'M'))
-        return AVPROBE_SCORE_MAX / 2;
-    return 0;
-}
-
-static int ast_read_header(AVFormatContext *s)
-{
-    int codec, depth;
-    AVStream *st;
-
-    st = avformat_new_stream(s, NULL);
-    if (!st)
-        return AVERROR(ENOMEM);
-
-    avio_skip(s->pb, 8);
-    codec = avio_rb16(s->pb);
-    switch (codec) {
-    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);
-    }
-
-    depth = avio_rb16(s->pb);
-    if (depth != 16) {
-        av_log_ask_for_sample(s, "unsupported depth %d\n", depth);
-        return AVERROR_INVALIDDATA;
-    }
-
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->channels = avio_rb16(s->pb);
-    if (!st->codec->channels)
-        return AVERROR_INVALIDDATA;
-
-    if (st->codec->channels == 2)
-        st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
-    else if (st->codec->channels == 4)
-        st->codec->channel_layout = AV_CH_LAYOUT_4POINT0;
-
-    avio_skip(s->pb, 2);
-    st->codec->sample_rate = avio_rb32(s->pb);
-    if (st->codec->sample_rate <= 0)
-        return AVERROR_INVALIDDATA;
-    st->start_time         = 0;
-    st->duration           = avio_rb32(s->pb);
-    avio_skip(s->pb, 40);
-    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
-
-    return 0;
-}
-
-static int ast_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    uint32_t type, size;
-    int64_t pos;
-    int ret;
-
-    if (url_feof(s->pb))
-        return AVERROR_EOF;
-
-    pos  = avio_tell(s->pb);
-    type = avio_rl32(s->pb);
-    size = avio_rb32(s->pb);
-    if (size > INT_MAX / s->streams[0]->codec->channels)
-        return AVERROR_INVALIDDATA;
-
-    size *= s->streams[0]->codec->channels;
-    if ((ret = avio_skip(s->pb, 24)) < 0) // padding
-        return ret;
-
-    if (type == MKTAG('B','L','C','K')) {
-        ret = av_get_packet(s->pb, pkt, size);
-        pkt->stream_index = 0;
-        pkt->pos = pos;
-    } else {
-        av_log(s, AV_LOG_ERROR, "unknown chunk %x\n", type);
-        avio_skip(s->pb, size);
-        ret = AVERROR_INVALIDDATA;
-    }
-
-    return ret;
-}
-
-AVInputFormat ff_ast_demuxer = {
-    .name           = "ast",
-    .long_name      = NULL_IF_CONFIG_SMALL("AST (Audio Stream)"),
-    .read_probe     = ast_probe,
-    .read_header    = ast_read_header,
-    .read_packet    = ast_read_packet,
-    .extensions     = "ast",
-    .flags          = AVFMT_GENERIC_INDEX,
+const AVCodecTag ff_codec_ast_tags[] = {
+    { AV_CODEC_ID_ADPCM_AFC,          0 },
+    { AV_CODEC_ID_PCM_S16BE_PLANAR,   1 },
+    { AV_CODEC_ID_NONE,               0 },
 };