From c0aeee9443424a9d52e82fd08ae4e03f6b1563af Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 13 Oct 2015 12:52:54 +0200 Subject: [PATCH] avformat: add vag demuxer Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/vag.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 libavformat/vag.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 55169fb28d..6b6515c61a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -440,6 +440,7 @@ OBJS-$(CONFIG_TTA_DEMUXER) += tta.o apetag.o img2.o OBJS-$(CONFIG_TTY_DEMUXER) += tty.o sauce.o OBJS-$(CONFIG_TXD_DEMUXER) += txd.o OBJS-$(CONFIG_UNCODEDFRAMECRC_MUXER) += uncodedframecrcenc.o framehash.o +OBJS-$(CONFIG_VAG_DEMUXER) += vag.o OBJS-$(CONFIG_VC1_DEMUXER) += rawdec.o vc1dec.o OBJS-$(CONFIG_VC1_MUXER) += rawenc.o OBJS-$(CONFIG_VC1T_DEMUXER) += vc1test.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9dbe4bb96c..ddac08ed10 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -308,6 +308,7 @@ void av_register_all(void) REGISTER_DEMUXER (TXD, txd); REGISTER_DEMUXER (TTY, tty); REGISTER_MUXER (UNCODEDFRAMECRC, uncodedframecrc); + REGISTER_DEMUXER (VAG, vag); REGISTER_MUXDEMUX(VC1, vc1); REGISTER_MUXDEMUX(VC1T, vc1t); REGISTER_DEMUXER (VIVO, vivo); diff --git a/libavformat/vag.c b/libavformat/vag.c new file mode 100644 index 0000000000..c6c8341476 --- /dev/null +++ b/libavformat/vag.c @@ -0,0 +1,85 @@ +/* + * VAG demuxer + * Copyright (c) 2015 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/channel_layout.h" +#include "avformat.h" +#include "internal.h" + +typedef struct VAGDemuxContext { + int64_t data_end; +} VAGDemuxContext; + +static int vag_probe(AVProbeData *p) +{ + if (memcmp(p->buf, "VAGp\0\0\0", 7)) + return 0; + + return AVPROBE_SCORE_MAX; +} + +static int vag_read_header(AVFormatContext *s) +{ + VAGDemuxContext *c = s->priv_data; + AVStream *st; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avio_skip(s->pb, 4); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codec->channels = 1 + (avio_rb32(s->pb) == 0x00000004); + avio_skip(s->pb, 4); + c->data_end = avio_rb32(s->pb); + st->duration = (c->data_end - avio_tell(s->pb)) / (16 * st->codec->channels) * 28; + st->codec->sample_rate = avio_rb32(s->pb); + if (st->codec->sample_rate <= 0) + return AVERROR_INVALIDDATA; + st->codec->block_align = 16 * st->codec->channels; + avio_skip(s->pb, 28); + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + + return 0; +} + +static int vag_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + VAGDemuxContext *c = s->priv_data; + AVCodecContext *codec = s->streams[0]->codec; + int size; + + size = FFMIN(c->data_end - avio_tell(s->pb), codec->block_align); + if (size <= 0) + return AVERROR_EOF; + + return av_get_packet(s->pb, pkt, size); +} + +AVInputFormat ff_vag_demuxer = { + .name = "vag", + .long_name = NULL_IF_CONFIG_SMALL("Sony VAG"), + .priv_data_size = sizeof(VAGDemuxContext), + .read_probe = vag_probe, + .read_header = vag_read_header, + .read_packet = vag_read_packet, + .extensions = "vag", +}; diff --git a/libavformat/version.h b/libavformat/version.h index 98ce6f08f1..f5bc03232b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 5 +#define LIBAVFORMAT_VERSION_MINOR 6 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 2.11.0