*/
#include "avformat.h"
#include "ac3_parser.h"
+#include "raw.h"
#ifdef CONFIG_MUXERS
/* simple formats */
-static int raw_write_header(struct AVFormatContext *s)
-{
- return 0;
-}
-
static int flac_write_header(struct AVFormatContext *s)
{
static const uint8_t header[8] = {
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
id = s->iformat->value;
if (id == CODEC_ID_RAWVIDEO) {
pkt->stream_index = 0;
if (ret <= 0) {
- return AVERROR_IO;
+ return AVERROR(EIO);
}
/* note: we need to modify the packet size here to handle the last
packet */
size = RAW_PACKET_SIZE;
if (av_new_packet(pkt, size) < 0)
- return AVERROR_IO;
+ return AVERROR(EIO);
pkt->pos= url_ftell(&s->pb);
pkt->stream_index = 0;
ret = get_partial_buffer(&s->pb, pkt->data, size);
if (ret <= 0) {
av_free_packet(pkt);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
pkt->size = ret;
return ret;
int ret, size, w, h, unk1, unk2;
if (get_le32(&s->pb) != MKTAG('M', 'J', 'P', 'G'))
- return AVERROR_IO; // FIXME
+ return AVERROR(EIO); // FIXME
size = get_le32(&s->pb);
size, w, h, unk1, unk2);
if (av_new_packet(pkt, size) < 0)
- return AVERROR_IO;
+ return AVERROR(EIO);
pkt->pos = url_ftell(&s->pb);
pkt->stream_index = 0;
ret = get_buffer(&s->pb, pkt->data, size);
if (ret <= 0) {
av_free_packet(pkt);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
pkt->size = ret;
return ret;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AC3;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_SHORTEN;
st->need_parsing = AVSTREAM_PARSE_FULL;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_FLAC;
st->need_parsing = AVSTREAM_PARSE_FULL;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_DTS;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AAC;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = s->iformat->value;
uint8_t *buf, *buf2, *end;
AC3HeaderInfo hdr;
- if(p->buf_size < 7)
- return 0;
-
max_frames = 0;
buf = p->buf;
- end = buf + FFMIN(4096, p->buf_size - 7);
+ end = buf + p->buf_size;
for(; buf < end; buf++) {
buf2 = buf;
else return 0;
}
+static int flac_probe(AVProbeData *p)
+{
+ if(memcmp(p->buf, "fLaC", 4)) return 0;
+ else return AVPROBE_SCORE_MAX / 2;
+}
+
AVInputFormat shorten_demuxer = {
"shn",
"raw shorten",
"flac",
"raw flac",
0,
- NULL,
+ flac_probe,
flac_read_header,
raw_read_partial_packet,
raw_read_close,
0,
CODEC_ID_AC3,
0,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
0,
CODEC_ID_H261,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
0,
CODEC_ID_H263,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
CODEC_ID_NONE,
CODEC_ID_MPEG4,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
CODEC_ID_NONE,
CODEC_ID_H264,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
0,
CODEC_ID_MPEG1VIDEO,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
0,
CODEC_ID_MPEG2VIDEO,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,
0,
CODEC_ID_MJPEG,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
0,\
codec,\
0,\
- raw_write_header,\
+ NULL,\
raw_write_packet,\
.flags= AVFMT_NOTIMESTAMPS,\
};
pkt->stream_index = 0;
if (ret != packet_size) {
- return AVERROR_IO;
+ return AVERROR(EIO);
} else {
return 0;
}
0,
CODEC_ID_NONE,
CODEC_ID_RAWVIDEO,
- raw_write_header,
+ NULL,
raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
};
CODEC_ID_PCM_S16LE,
#endif
CODEC_ID_RAWVIDEO,
- raw_write_header,
+ NULL,
null_write_packet,
.flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
};