* Based on documents from Game Audio Player and own research
*/
+#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
#define SOL_16BIT 4
#define SOL_STEREO 16
-static enum CodecID sol_codec_id(int magic, int type)
+static enum AVCodecID sol_codec_id(int magic, int type)
{
if (magic == 0x0B8D)
{
- if (type & SOL_DPCM) return CODEC_ID_SOL_DPCM;
- else return CODEC_ID_PCM_U8;
+ if (type & SOL_DPCM) return AV_CODEC_ID_SOL_DPCM;
+ else return AV_CODEC_ID_PCM_U8;
}
if (type & SOL_DPCM)
{
- if (type & SOL_16BIT) return CODEC_ID_SOL_DPCM;
- else if (magic == 0x0C8D) return CODEC_ID_SOL_DPCM;
- else return CODEC_ID_SOL_DPCM;
+ if (type & SOL_16BIT) return AV_CODEC_ID_SOL_DPCM;
+ else if (magic == 0x0C8D) return AV_CODEC_ID_SOL_DPCM;
+ else return AV_CODEC_ID_SOL_DPCM;
}
- if (type & SOL_16BIT) return CODEC_ID_PCM_S16LE;
- return CODEC_ID_PCM_U8;
+ if (type & SOL_16BIT) return AV_CODEC_ID_PCM_S16LE;
+ return AV_CODEC_ID_PCM_U8;
}
static int sol_codec_type(int magic, int type)
return 2;
}
-static int sol_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int sol_read_header(AVFormatContext *s)
{
unsigned int magic,tag;
AVIOContext *pb = s->pb;
unsigned int id, channels, rate, type;
- enum CodecID codec;
+ enum AVCodecID codec;
AVStream *st;
/* check ".snd" header */
codec = sol_codec_id(magic, type);
channels = sol_channels(magic, type);
- if (codec == CODEC_ID_SOL_DPCM)
+ if (codec == AV_CODEC_ID_SOL_DPCM)
id = sol_codec_type(magic, type);
else id = 0;
st->codec->codec_tag = id;
st->codec->codec_id = codec;
st->codec->channels = channels;
+ st->codec->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO :
+ AV_CH_LAYOUT_STEREO;
st->codec->sample_rate = rate;
avpriv_set_pts_info(st, 64, 1, rate);
return 0;
AVInputFormat ff_sol_demuxer = {
.name = "sol",
- .long_name = NULL_IF_CONFIG_SMALL("Sierra SOL format"),
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra SOL"),
.read_probe = sol_probe,
.read_header = sol_read_header,
.read_packet = sol_read_packet,
- .read_seek = pcm_read_seek,
+ .read_seek = ff_pcm_read_seek,
};