Commit 6f3ba23a authored by Paul B Mahol's avatar Paul B Mahol

avformat: add xvag demuxer

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 7c8fcbbd
...@@ -20,7 +20,7 @@ version <next>: ...@@ -20,7 +20,7 @@ version <next>:
- selectivecolor filter - selectivecolor filter
- extensive native AAC encoder improvements - extensive native AAC encoder improvements
- ADPCM PSX decoder - ADPCM PSX decoder
- genh, vag, ads, msf & svag demuxer - genh, vag, xvag, ads, msf & svag demuxer
- zscale filter - zscale filter
- wve demuxer - wve demuxer
- zero-copy Intel QSV transcoding in ffmpeg - zero-copy Intel QSV transcoding in ffmpeg
......
...@@ -487,6 +487,7 @@ OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o ...@@ -487,6 +487,7 @@ OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o
OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o
OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o
OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o
OBJS-$(CONFIG_XVAG_DEMUXER) += xvag.o
OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o
OBJS-$(CONFIG_YOP_DEMUXER) += yop.o OBJS-$(CONFIG_YOP_DEMUXER) += yop.o
OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o
......
...@@ -336,6 +336,7 @@ void av_register_all(void) ...@@ -336,6 +336,7 @@ void av_register_all(void)
REGISTER_DEMUXER (XA, xa); REGISTER_DEMUXER (XA, xa);
REGISTER_DEMUXER (XBIN, xbin); REGISTER_DEMUXER (XBIN, xbin);
REGISTER_DEMUXER (XMV, xmv); REGISTER_DEMUXER (XMV, xmv);
REGISTER_DEMUXER (XVAG, xvag);
REGISTER_DEMUXER (XWMA, xwma); REGISTER_DEMUXER (XWMA, xwma);
REGISTER_DEMUXER (YOP, yop); REGISTER_DEMUXER (YOP, yop);
REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe); REGISTER_MUXDEMUX(YUV4MPEGPIPE, yuv4mpegpipe);
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 10 #define LIBAVFORMAT_VERSION_MINOR 11
#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
/*
* XVAG 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/bswap.h"
#include "avformat.h"
#include "internal.h"
static int xvag_probe(AVProbeData *p)
{
if (memcmp(p->buf, "XVAG", 4) ||
memcmp(p->buf+32, "fmat", 4))
return 0;
return AVPROBE_SCORE_MAX;
}
static int xvag_read_header(AVFormatContext *s)
{
unsigned offset, big_endian, codec;
AVStream *st;
avio_skip(s->pb, 4);
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
offset = avio_rl32(s->pb);
big_endian = offset > av_bswap32(offset);
if (big_endian) {
offset = av_bswap32(offset);
avio_skip(s->pb, 28);
codec = avio_rb32(s->pb);
st->codec->channels = avio_rb32(s->pb);
avio_skip(s->pb, 4);
st->duration = avio_rb32(s->pb);
avio_skip(s->pb, 8);
st->codec->sample_rate = avio_rb32(s->pb);
} else {
avio_skip(s->pb, 28);
codec = avio_rl32(s->pb);
st->codec->channels = avio_rl32(s->pb);
avio_skip(s->pb, 4);
st->duration = avio_rl32(s->pb);
avio_skip(s->pb, 8);
st->codec->sample_rate = avio_rl32(s->pb);
}
if (st->codec->sample_rate <= 0)
return AVERROR_INVALIDDATA;
if (st->codec->channels <= 0)
return AVERROR_INVALIDDATA;
switch (codec) {
case 0x1c:
st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codec->block_align = 16 * st->codec->channels;
break;
default:
avpriv_request_sample(s, "codec %X", codec);
return AVERROR_PATCHWELCOME;
};
avio_skip(s->pb, offset - avio_tell(s->pb));
if (avio_rb16(s->pb) == 0xFFFB) {
st->codec->codec_id = AV_CODEC_ID_MP3;
st->codec->block_align = 0x1000;
st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
}
avio_skip(s->pb, -2);
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0;
}
static int xvag_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVCodecContext *codec = s->streams[0]->codec;
return av_get_packet(s->pb, pkt, codec->block_align);
}
AVInputFormat ff_xvag_demuxer = {
.name = "xvag",
.long_name = NULL_IF_CONFIG_SMALL("Sony PS3 XVAG"),
.read_probe = xvag_probe,
.read_header = xvag_read_header,
.read_packet = xvag_read_packet,
.extensions = "xvag",
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment