diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 | ||||
| -rw-r--r-- | libavformat/vpk.c | 115 |
6 files changed, 121 insertions, 2 deletions
@@ -20,7 +20,7 @@ version <next>: - selectivecolor filter - extensive native AAC encoder improvements - ADPCM PSX decoder -- 3dostr, dcstr, genh, vag, xvag, ads, msf & svag demuxer +- 3dostr, dcstr, genh, vag, xvag, ads, msf, svag & vpk demuxer - zscale filter - wve demuxer - zero-copy Intel QSV transcoding in ffmpeg diff --git a/doc/general.texi b/doc/general.texi index cb85893..a10b756 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -521,6 +521,8 @@ library: @item VC-1 test bitstream @tab X @tab X @item Vidvox Hap @tab X @tab X @item Vivo @tab @tab X +@item VPK @tab @tab X + @tab Audio format used in Sony PS games. @item WAV @tab X @tab X @item WavPack @tab X @tab X @item WebM @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 0b39a33..64764fe 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -460,6 +460,7 @@ OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o OBJS-$(CONFIG_VOBSUB_DEMUXER) += subtitles.o # mpeg demuxer is in the dependencies OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o +OBJS-$(CONFIG_VPK_DEMUXER) += vpk.o OBJS-$(CONFIG_VPLAYER_DEMUXER) += vplayerdec.o subtitles.o OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9ac40c5..02f59ee 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -324,6 +324,7 @@ void av_register_all(void) REGISTER_DEMUXER (VMD, vmd); REGISTER_DEMUXER (VOBSUB, vobsub); REGISTER_MUXDEMUX(VOC, voc); + REGISTER_DEMUXER (VPK, vpk); REGISTER_DEMUXER (VPLAYER, vplayer); REGISTER_DEMUXER (VQF, vqf); REGISTER_MUXDEMUX(W64, w64); diff --git a/libavformat/version.h b/libavformat/version.h index 55198e7..d66eeff 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 15 +#define LIBAVFORMAT_VERSION_MINOR 16 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/libavformat/vpk.c b/libavformat/vpk.c new file mode 100644 index 0000000..ad60aa3 --- /dev/null +++ b/libavformat/vpk.c @@ -0,0 +1,115 @@ +/* + * VPK 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/intreadwrite.h" +#include "avformat.h" +#include "internal.h" + +typedef struct VPKDemuxContext { + unsigned block_count; + unsigned current_block; + unsigned last_block_size; +} VPKDemuxContext; + +static int vpk_probe(AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKBETAG('V','P','K',' ')) + return 0; + + return AVPROBE_SCORE_MAX / 3 * 2; +} + +static int vpk_read_header(AVFormatContext *s) +{ + VPKDemuxContext *vpk = s->priv_data; + unsigned offset; + unsigned samples_per_block; + AVStream *st; + + vpk->current_block = 0; + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avio_skip(s->pb, 4); + st->duration = avio_rl32(s->pb) * 28 / 16; + offset = avio_rl32(s->pb); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codec->block_align = avio_rl32(s->pb); + st->codec->sample_rate = avio_rl32(s->pb); + if (st->codec->sample_rate <= 0) + return AVERROR_INVALIDDATA; + st->codec->channels = avio_rl32(s->pb); + if (st->codec->channels <= 0) + return AVERROR_INVALIDDATA; + samples_per_block = ((st->codec->block_align / st->codec->channels) * 28) / 16; + vpk->block_count = (st->duration + (samples_per_block - 1)) / samples_per_block; + vpk->last_block_size = (st->duration % samples_per_block) * 16 * st->codec->channels / 28; + avio_skip(s->pb, offset - avio_tell(s->pb)); + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + + return 0; +} + +static int vpk_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVCodecContext *codec = s->streams[0]->codec; + VPKDemuxContext *vpk = s->priv_data; + int ret, i; + + vpk->current_block++; + if (vpk->current_block == vpk->block_count) { + unsigned size = vpk->last_block_size / codec->channels; + unsigned skip = (codec->block_align - vpk->last_block_size) / codec->channels; + + ret = av_new_packet(pkt, vpk->last_block_size); + if (ret < 0) + return ret; + for (i = 0; i < codec->channels; i++) { + ret = avio_read(s->pb, pkt->data + i * size, size); + avio_skip(s->pb, skip); + if (ret != size) { + av_packet_unref(pkt); + ret = AVERROR(EIO); + break; + } + } + pkt->stream_index = 0; + } else if (vpk->current_block < vpk->block_count) { + ret = av_get_packet(s->pb, pkt, codec->block_align); + pkt->stream_index = 0; + } else { + return AVERROR_EOF; + } + + return ret; +} + +AVInputFormat ff_vpk_demuxer = { + .name = "vpk", + .long_name = NULL_IF_CONFIG_SMALL("Sony PS2 VPK"), + .priv_data_size = sizeof(VPKDemuxContext), + .read_probe = vpk_probe, + .read_header = vpk_read_header, + .read_packet = vpk_read_packet, + .extensions = "vpk", +}; |
