*/
#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] = {
uint8_t *streaminfo = s->streams[0]->codec->extradata;
int len = s->streams[0]->codec->extradata_size;
if(streaminfo != NULL && len > 0) {
- put_buffer(&s->pb, header, 8);
- put_buffer(&s->pb, streaminfo, len);
+ put_buffer(s->pb, header, 8);
+ put_buffer(s->pb, streaminfo, len);
}
return 0;
}
0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
};
- put_buffer(&s->pb, header, 8);
- put_flush_packet(&s->pb);
+ put_buffer(s->pb, header, 8);
+ put_flush_packet(s->pb);
return 0;
}
static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
- put_buffer(&s->pb, pkt->data, pkt->size);
- put_flush_packet(&s->pb);
- return 0;
-}
-
-static int raw_write_trailer(struct AVFormatContext *s)
-{
+ put_buffer(s->pb, pkt->data, pkt->size);
+ put_flush_packet(s->pb);
return 0;
}
#endif //CONFIG_MUXERS
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
id = s->iformat->value;
if (id == CODEC_ID_RAWVIDEO) {
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
break;
case CODEC_TYPE_VIDEO:
- av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
+ if(ap->time_base.num)
+ av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
+ else
+ av_set_pts_info(st, 64, 1, 25);
st->codec->width = ap->width;
st->codec->height = ap->height;
st->codec->pix_fmt = ap->pix_fmt;
static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
{
- int ret, size;
+ int ret, size, bps;
// AVStream *st = s->streams[0];
size= RAW_PACKET_SIZE;
- ret= av_get_packet(&s->pb, pkt, size);
+ ret= av_get_packet(s->pb, pkt, size);
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 */
pkt->size = ret;
+
+ bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
+ assert(bps); // if false there IS a bug elsewhere (NOT in this function)
+ pkt->dts=
+ pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
+
return ret;
}
size = RAW_PACKET_SIZE;
if (av_new_packet(pkt, size) < 0)
- return AVERROR_IO;
+ return AVERROR(EIO);
- pkt->pos= url_ftell(&s->pb);
+ pkt->pos= url_ftell(s->pb);
pkt->stream_index = 0;
- ret = get_partial_buffer(&s->pb, pkt->data, size);
+ 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
+ if (get_le32(s->pb) != MKTAG('M', 'J', 'P', 'G'))
+ return AVERROR(EIO); // FIXME
- size = get_le32(&s->pb);
+ size = get_le32(s->pb);
- w = get_le16(&s->pb);
- h = get_le16(&s->pb);
+ w = get_le16(s->pb);
+ h = get_le16(s->pb);
- url_fskip(&s->pb, 8); // zero + size (padded?)
- url_fskip(&s->pb, 2);
- unk1 = get_le16(&s->pb);
- unk2 = get_le16(&s->pb);
- url_fskip(&s->pb, 22); // ascii timestamp
+ url_fskip(s->pb, 8); // zero + size (padded?)
+ url_fskip(s->pb, 2);
+ unk1 = get_le16(s->pb);
+ unk2 = get_le16(s->pb);
+ url_fskip(s->pb, 22); // ascii timestamp
av_log(NULL, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n",
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->pos = url_ftell(s->pb);
pkt->stream_index = 0;
- ret = get_buffer(&s->pb, pkt->data, size);
+ 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;
/* recompute exact position */
st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num);
- url_fseek(&s->pb, pos + s->data_offset, SEEK_SET);
+ url_fseek(s->pb, pos + s->data_offset, SEEK_SET);
return 0;
}
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;
for(i=0; i<probe_packet->buf_size; i++){
temp_buffer = (temp_buffer<<8) + probe_packet->buf[i];
- if ((temp_buffer & 0xffffff00) == 0x100) {
- switch(temp_buffer){
- case VOP_START_CODE: VOP++; break;
- case VISUAL_OBJECT_START_CODE: VISO++; break;
- case 0x100 ... 0x11F: VO++; break;
- case 0x120 ... 0x12F: VOL++; break;
- case 0x130 ... 0x1AF:
- case 0x1B7 ... 0x1B9:
- case 0x1C4 ... 0x1FF: res++; break;
- }
- }
+ if ((temp_buffer & 0xffffff00) != 0x100)
+ continue;
+
+ if (temp_buffer == VOP_START_CODE) VOP++;
+ else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++;
+ else if (temp_buffer < 0x120) VO++;
+ else if (temp_buffer < 0x130) VOL++;
+ else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7)
+ && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++;
}
if ( VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0)
static int ac3_probe(AVProbeData *p)
{
- int max_frames, first_frames, frames;
+ int max_frames, first_frames = 0, frames;
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,
flac_write_header,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
CODEC_ID_AC3,
0,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
CODEC_ID_ROQ,
roq_write_header,
raw_write_packet,
- raw_write_trailer,
};
#endif //CONFIG_ROQ_MUXER
0,
0,
CODEC_ID_H261,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
0,
CODEC_ID_H263,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
CODEC_ID_NONE,
CODEC_ID_MPEG4,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
CODEC_ID_NONE,
CODEC_ID_H264,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
0,
CODEC_ID_MPEG1VIDEO,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
0,
CODEC_ID_MPEG2VIDEO,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,
0,
CODEC_ID_MJPEG,
- raw_write_header,
+ NULL,
raw_write_packet,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
0,\
codec,\
0,\
- raw_write_header,\
+ NULL,\
raw_write_packet,\
- raw_write_trailer,\
.flags= AVFMT_NOTIMESTAMPS,\
};
if (packet_size < 0)
return -1;
- ret= av_get_packet(&s->pb, pkt, packet_size);
+ ret= av_get_packet(s->pb, pkt, packet_size);
+ pkt->pts=
+ pkt->dts= pkt->pos / packet_size;
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,
- raw_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
CODEC_ID_PCM_S16LE,
#endif
CODEC_ID_RAWVIDEO,
- raw_write_header,
+ NULL,
null_write_packet,
- raw_write_trailer,
.flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
};
#endif //CONFIG_MUXERS
projects / ffmpeg / blobdiff