MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat: add alp muxer

This commit is contained in:
Zane van Iperen 2020-10-21 23:20:20 +10:00
parent 40a8d43885
commit 7a11cc29d6
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
5 changed files with 151 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -38,6 +38,7 @@ version <next>:
- VDPAU accelerated VP9 10/12bit decoding
- afreqshift and aphaseshift filters
- High Voltage Software ADPCM encoder
- LEGO Racers ALP (.tun & .pcm) muxer
version 4.3:

1
libavformat/Makefile
View File

@ -88,6 +88,7 @@ OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \
OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o
OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o
OBJS-$(CONFIG_ALP_DEMUXER) += alp.o
OBJS-$(CONFIG_ALP_MUXER) += alp.o
OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o
OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o

1
libavformat/allformats.c
View File

@ -49,6 +49,7 @@ extern AVInputFormat ff_aiff_demuxer;
extern AVOutputFormat ff_aiff_muxer;
extern AVInputFormat ff_aix_demuxer;
extern AVInputFormat ff_alp_demuxer;
extern AVOutputFormat ff_alp_muxer;
extern AVInputFormat ff_amr_demuxer;
extern AVOutputFormat ff_amr_muxer;
extern AVInputFormat ff_amrnb_demuxer;

148
libavformat/alp.c
View File

@ -1,5 +1,5 @@
/*
* LEGO Racers ALP (.tun & .pcm) demuxer
* LEGO Racers ALP (.tun & .pcm) (de)muxer
*
* Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com)
*
@ -21,8 +21,10 @@
*/
#include "avformat.h"
#include "internal.h"
#include "rawenc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#define ALP_TAG MKTAG('A', 'L', 'P', ' ')
#define ALP_MAX_READ_SIZE 4096
@ -36,6 +38,18 @@ typedef struct ALPHeader {
uint32_t sample_rate; /*< Sample rate, only if header_size >= 12. */
} ALPHeader;
typedef enum ALPType {
ALP_TYPE_AUTO = 0, /*< Autodetect based on file extension. */
ALP_TYPE_TUN = 1, /*< Force a .TUN file. */
ALP_TYPE_PCM = 2, /*< Force a .PCM file. */
} ALPType;
typedef struct ALPMuxContext {
const AVClass *class;
ALPType type;
} ALPMuxContext;
#if CONFIG_ALP_DEMUXER
static int alp_probe(const AVProbeData *p)
{
uint32_t i;
@ -144,3 +158,135 @@ AVInputFormat ff_alp_demuxer = {
.read_header = alp_read_header,
.read_packet = alp_read_packet
};
#endif
#if CONFIG_ALP_MUXER
static int alp_write_init(AVFormatContext *s)
{
ALPMuxContext *alp = s->priv_data;
AVCodecParameters *par;
if (alp->type == ALP_TYPE_AUTO) {
if (av_match_ext(s->url, "pcm"))
alp->type = ALP_TYPE_PCM;
else
alp->type = ALP_TYPE_TUN;
}
if (s->nb_streams != 1) {
av_log(s, AV_LOG_ERROR, "Too many streams\n");
return AVERROR(EINVAL);
}
par = s->streams[0]->codecpar;
if (par->codec_id != AV_CODEC_ID_ADPCM_IMA_ALP) {
av_log(s, AV_LOG_ERROR, "%s codec not supported\n",
avcodec_get_name(par->codec_id));
return AVERROR(EINVAL);
}
if (par->channels > 2) {
av_log(s, AV_LOG_ERROR, "A maximum of 2 channels are supported\n");
return AVERROR(EINVAL);
}
if (par->sample_rate > 44100) {
av_log(s, AV_LOG_ERROR, "Sample rate too large\n");
return AVERROR(EINVAL);
}
if (alp->type == ALP_TYPE_TUN && par->sample_rate != 22050) {
av_log(s, AV_LOG_ERROR, "Sample rate must be 22050 for TUN files\n");
return AVERROR(EINVAL);
}
return 0;
}
static int alp_write_header(AVFormatContext *s)
{
ALPMuxContext *alp = s->priv_data;
AVCodecParameters *par = s->streams[0]->codecpar;
avio_wl32(s->pb, ALP_TAG);
avio_wl32(s->pb, alp->type == ALP_TYPE_PCM ? 12 : 8);
avio_write(s->pb, "ADPCM", 6);
avio_w8(s->pb, 0);
avio_w8(s->pb, par->channels);
if (alp->type == ALP_TYPE_PCM)
avio_wl32(s->pb, par->sample_rate);
return 0;
}
enum { AE = AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM };
static const AVOption alp_options[] = {
{
.name = "type",
.help = "set file type",
.offset = offsetof(ALPMuxContext, type),
.type = AV_OPT_TYPE_INT,
.default_val = {.i64 = ALP_TYPE_AUTO},
.min = ALP_TYPE_AUTO,
.max = ALP_TYPE_PCM,
.flags = AE,
.unit = "type",
},
{
.name = "auto",
.help = "autodetect based on file extension",
.offset = 0,
.type = AV_OPT_TYPE_CONST,
.default_val = {.i64 = ALP_TYPE_AUTO},
.min = 0,
.max = 0,
.flags = AE,
.unit = "type"
},
{
.name = "tun",
.help = "force .tun, used for music",
.offset = 0,
.type = AV_OPT_TYPE_CONST,
.default_val = {.i64 = ALP_TYPE_TUN},
.min = 0,
.max = 0,
.flags = AE,
.unit = "type"
},
{
.name = "pcm",
.help = "force .pcm, used for sfx",
.offset = 0,
.type = AV_OPT_TYPE_CONST,
.default_val = {.i64 = ALP_TYPE_PCM},
.min = 0,
.max = 0,
.flags = AE,
.unit = "type"
},
{ NULL }
};
static const AVClass alp_muxer_class = {
.class_name = "alp",
.item_name = av_default_item_name,
.option = alp_options,
.version = LIBAVUTIL_VERSION_INT
};
AVOutputFormat ff_alp_muxer = {
.name = "alp",
.long_name = NULL_IF_CONFIG_SMALL("LEGO Racers ALP"),
.extensions = "tun,pcm",
.audio_codec = AV_CODEC_ID_ADPCM_IMA_ALP,
.video_codec = AV_CODEC_ID_NONE,
.init = alp_write_init,
.write_header = alp_write_header,
.write_packet = ff_raw_write_packet,
.priv_class = &alp_muxer_class,
.priv_data_size = sizeof(ALPMuxContext)
};
#endif

2
libavformat/version.h
View File

@ -32,7 +32,7 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 62
#define LIBAVFORMAT_VERSION_MINOR 63
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \