/*
* Sierra SOL demuxer
- * Copyright Konstantin Shishkov.
+ * Copyright Konstantin Shishkov
*
* This file is part of FFmpeg.
*
* Based on documents from Game Audio Player and own research
*/
+#include "libavutil/bswap.h"
#include "avformat.h"
-#include "allformats.h"
-#include "riff.h"
-#include "bswap.h"
+#include "pcm.h"
/* if we don't know the size in advance */
-#define AU_UNKOWN_SIZE ((uint32_t)(~0))
+#define AU_UNKNOWN_SIZE ((uint32_t)(~0))
static int sol_probe(AVProbeData *p)
{
/* check file header */
uint16_t magic;
- if (p->buf_size <= 14)
- return 0;
- magic=le2me_16(*((uint16_t*)p->buf));
+ magic=av_le2ne16(*((uint16_t*)p->buf));
if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) &&
p->buf[2] == 'S' && p->buf[3] == 'O' &&
p->buf[4] == 'L' && p->buf[5] == 0)
#define SOL_16BIT 4
#define SOL_STEREO 16
-static int sol_codec_id(int magic, int type)
+static enum CodecID sol_codec_id(int magic, int type)
{
if (magic == 0x0B8D)
{
{
int size;
unsigned int magic,tag;
- ByteIOContext *pb = &s->pb;
- unsigned int id, codec, channels, rate, type;
+ ByteIOContext *pb = s->pb;
+ unsigned int id, channels, rate, type;
+ enum CodecID codec;
AVStream *st;
/* check ".snd" header */
st = av_new_stream(s, 0);
if (!st)
return -1;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_tag = id;
st->codec->codec_id = codec;
st->codec->channels = channels;
{
int ret;
- if (url_feof(&s->pb))
- return -EIO;
- ret= av_get_packet(&s->pb, pkt, MAX_SIZE);
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
+ ret= av_get_packet(s->pb, pkt, MAX_SIZE);
pkt->stream_index = 0;
/* note: we need to modify the packet size here to handle the last
return 0;
}
-static int sol_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
-AVInputFormat sol_demuxer = {
+AVInputFormat ff_sol_demuxer = {
"sol",
- "Sierra SOL Format",
+ NULL_IF_CONFIG_SMALL("Sierra SOL format"),
0,
sol_probe,
sol_read_header,
sol_read_packet,
- sol_read_close,
+ NULL,
pcm_read_seek,
};