RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat: add musx demuxer 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-04-03 12:10:09 +02:00
parent 8a4c3f5258
commit 56a3a3f01c
5 changed files with 182 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -19,6 +19,7 @@ version <next>:
- libdcadec removed - libdcadec removed
- bitstream filter for extracting DTS core - bitstream filter for extracting DTS core
- ADPCM IMA DAT4 decoder - ADPCM IMA DAT4 decoder
- musx demuxer
version 3.0: version 3.0:
- Common Encryption (CENC) MP4 encoding and decoding support - Common Encryption (CENC) MP4 encoding and decoding support

1
libavformat/Makefile
View File

@ -296,6 +296,7 @@ OBJS-$(CONFIG_MSF_DEMUXER) += msf.o
OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o subtitles.o OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o subtitles.o
OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o
OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
OBJS-$(CONFIG_MUSX_DEMUXER) += musx.o
OBJS-$(CONFIG_MV_DEMUXER) += mvdec.o OBJS-$(CONFIG_MV_DEMUXER) += mvdec.o
OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o

1
libavformat/allformats.c
View File

@ -207,6 +207,7 @@ void av_register_all(void)
REGISTER_DEMUXER (MSF, msf); REGISTER_DEMUXER (MSF, msf);
REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp);
REGISTER_DEMUXER (MTV, mtv); REGISTER_DEMUXER (MTV, mtv);
REGISTER_DEMUXER (MUSX, musx);
REGISTER_DEMUXER (MV, mv); REGISTER_DEMUXER (MV, mv);
REGISTER_DEMUXER (MVI, mvi); REGISTER_DEMUXER (MVI, mvi);
REGISTER_MUXDEMUX(MXF, mxf); REGISTER_MUXDEMUX(MXF, mxf);

177
libavformat/musx.c Normal file
View File

@ -0,0 +1,177 @@
/*
* MUSX demuxer
* Copyright (c) 2016 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/avassert.h"
#include "avformat.h"
#include "internal.h"
static int musx_probe(AVProbeData *p)
{
if (memcmp(p->buf, "MUSX", 4))
return 0;
return AVPROBE_SCORE_MAX / 5 * 2;
}
static int musx_read_header(AVFormatContext *s)
{
unsigned type, version, coding, offset;
AVStream *st;
avio_skip(s->pb, 8);
version = avio_rl32(s->pb);
if (version != 10 &&
version != 6 &&
version != 5 &&
version != 4 &&
version != 201) {
avpriv_request_sample(s, "Unsupported version: %d", version);
return AVERROR_PATCHWELCOME;
}
avio_skip(s->pb, 4);
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
if (version == 201) {
avio_skip(s->pb, 8);
offset = avio_rl32(s->pb);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codec->channels = 2;
st->codec->sample_rate = 32000;
st->codec->block_align = 0x80 * st->codec->channels;
} else if (version == 10) {
type = avio_rl32(s->pb);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
offset = 0x800;
switch (type) {
case MKTAG('P', 'S', '3', '_'):
st->codec->channels = 2;
st->codec->sample_rate = 44100;
avio_skip(s->pb, 44);
coding = avio_rl32(s->pb);
if (coding == MKTAG('D', 'A', 'T', '4') ||
coding == MKTAG('D', 'A', 'T', '8')) {
avio_skip(s->pb, 4);
st->codec->channels = avio_rl32(s->pb);
if (st->codec->channels <= 0 ||
st->codec->channels > INT_MAX / 0x20)
return AVERROR_INVALIDDATA;
st->codec->sample_rate = avio_rl32(s->pb);
}
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4;
st->codec->block_align = 0x20 * st->codec->channels;
break;
case MKTAG('W', 'I', 'I', '_'):
avio_skip(s->pb, 44);
coding = avio_rl32(s->pb);
if (coding != MKTAG('D', 'A', 'T', '4') &&
coding != MKTAG('D', 'A', 'T', '8')) {
avpriv_request_sample(s, "Unsupported coding: %X", coding);
return AVERROR_PATCHWELCOME;
}
avio_skip(s->pb, 4);
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4;
st->codec->channels = avio_rl32(s->pb);
if (st->codec->channels <= 0 ||
st->codec->channels > INT_MAX / 0x20)
return AVERROR_INVALIDDATA;
st->codec->sample_rate = avio_rl32(s->pb);
st->codec->block_align = 0x20 * st->codec->channels;
break;
case MKTAG('X', 'E', '_', '_'):
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4;
st->codec->channels = 2;
st->codec->sample_rate = 32000;
st->codec->block_align = 0x20 * st->codec->channels;
break;
case MKTAG('P', 'S', 'P', '_'):
st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codec->channels = 2;
st->codec->sample_rate = 32768;
st->codec->block_align = 0x80 * st->codec->channels;
break;
case MKTAG('P', 'S', '2', '_'):
st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codec->channels = 2;
st->codec->sample_rate = 32000;
st->codec->block_align = 0x80 * st->codec->channels;
break;
default:
avpriv_request_sample(s, "Unsupported type: %X", type);
return AVERROR_PATCHWELCOME;
}
} else if (version == 6 || version == 5 || version == 4) {
type = avio_rl32(s->pb);
avio_skip(s->pb, 20);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->channels = 2;
switch (type) {
case MKTAG('G', 'C', '_', '_'):
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4;
st->codec->block_align = 0x20 * st->codec->channels;
st->codec->sample_rate = 32000;
offset = avio_rb32(s->pb);
break;
case MKTAG('P', 'S', '2', '_'):
st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codec->block_align = 0x80 * st->codec->channels;
st->codec->sample_rate = 32000;
offset = avio_rl32(s->pb);
break;
case MKTAG('X', 'B', '_', '_'):
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4;
st->codec->block_align = 0x20 * st->codec->channels;
st->codec->sample_rate = 44100;
offset = avio_rl32(s->pb);
break;
default:
avpriv_request_sample(s, "Unsupported type: %X", type);
return AVERROR_PATCHWELCOME;
}
} else {
av_assert0(0);
}
avio_seek(s->pb, offset, SEEK_SET);
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0;
}
static int musx_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVCodecContext *codec = s->streams[0]->codec;
return av_get_packet(s->pb, pkt, codec->block_align);
}
AVInputFormat ff_musx_demuxer = {
.name = "musx",
.long_name = NULL_IF_CONFIG_SMALL("Eurocom MUSX"),
.read_probe = musx_probe,
.read_header = musx_read_header,
.read_packet = musx_read_packet,
.extensions = "musx",
};

4
libavformat/version.h
View File

@ -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 29 #define LIBAVFORMAT_VERSION_MINOR 30
#define LIBAVFORMAT_VERSION_MICRO 101 #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, \