#include "internal.h"
static const AVCodecTag rsd_tags[] = {
+ { AV_CODEC_ID_ADPCM_PSX, MKTAG('V','A','G',' ') },
{ AV_CODEC_ID_ADPCM_THP, MKTAG('G','A','D','P') },
{ AV_CODEC_ID_ADPCM_THP, MKTAG('W','A','D','P') },
{ AV_CODEC_ID_ADPCM_IMA_RAD, MKTAG('R','A','D','P') },
{ AV_CODEC_ID_ADPCM_IMA_WAV, MKTAG('X','A','D','P') },
{ AV_CODEC_ID_PCM_S16BE, MKTAG('P','C','M','B') },
{ AV_CODEC_ID_PCM_S16LE, MKTAG('P','C','M',' ') },
+ { AV_CODEC_ID_XMA1, MKTAG('X','M','A',' ') },
{ AV_CODEC_ID_NONE, 0 },
};
static const uint32_t rsd_unsupported_tags[] = {
MKTAG('O','G','G',' '),
- MKTAG('V','A','G',' '),
- MKTAG('X','M','A',' '),
};
static int rsd_probe(AVProbeData *p)
avio_skip(pb, 4); // Unknown
switch (codec->codec_id) {
+ case AV_CODEC_ID_XMA1:
+ codec->block_align = 2048;
+ ff_alloc_extradata(codec, 28);
+ if (!codec->extradata)
+ return AVERROR(ENOMEM);
+ memset(codec->extradata, 0, 28);
+ break;
+ case AV_CODEC_ID_ADPCM_PSX:
+ codec->block_align = 16 * codec->channels;
+ if (pb->seekable)
+ st->duration = av_get_audio_frame_duration(codec, avio_size(pb) - start);
+ break;
case AV_CODEC_ID_ADPCM_IMA_RAD:
codec->block_align = 20 * codec->channels;
if (pb->seekable)
}
avio_skip(pb, start - avio_tell(pb));
+ if (codec->codec_id == AV_CODEC_ID_XMA1) {
+ avio_skip(pb, avio_rb32(pb) + avio_rb32(pb));
+ st->duration = avio_rb32(pb);
+ }
avpriv_set_pts_info(st, 64, 1, codec->sample_rate);
return AVERROR_EOF;
if (codec->codec_id == AV_CODEC_ID_ADPCM_IMA_RAD ||
- codec->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) {
+ codec->codec_id == AV_CODEC_ID_ADPCM_PSX ||
+ codec->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV ||
+ codec->codec_id == AV_CODEC_ID_XMA1) {
ret = av_get_packet(s->pb, pkt, codec->block_align);
} else if (codec->codec_tag == MKTAG('W','A','D','P') &&
codec->channels > 1) {
int i, ch;
- av_new_packet(pkt, codec->block_align);
+ ret = av_new_packet(pkt, codec->block_align);
+ if (ret < 0)
+ return ret;
for (i = 0; i < 4; i++) {
for (ch = 0; ch < codec->channels; ch++) {
pkt->data[ch * 8 + i * 2 + 0] = avio_r8(s->pb);