/* first is true if we read the frame header */
static int ffm_read_data(AVFormatContext *s,
- uint8_t *buf, int size, int first)
+ uint8_t *buf, int size, int header)
{
FFMContext *ffm = s->priv_data;
ByteIOContext *pb = s->pb;
get_be16(pb); /* PACKET_ID */
fill_size = get_be16(pb);
ffm->pts = get_be64(pb);
- ffm->first_frame_in_packet = 1;
frame_offset = get_be16(pb);
get_buffer(pb, ffm->packet, ffm->packet_size - FFM_HEADER_SIZE);
ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size);
return 0;
}
ffm->first_packet = 0;
- if ((frame_offset & 0x7ffff) < FFM_HEADER_SIZE)
+ if ((frame_offset & 0x7fff) < FFM_HEADER_SIZE)
return -1;
ffm->packet_ptr = ffm->packet + (frame_offset & 0x7fff) - FFM_HEADER_SIZE;
- if (!first)
+ if (!header)
break;
} else {
ffm->packet_ptr = ffm->packet;
buf += len;
ffm->packet_ptr += len;
size -= len;
- first = 0;
+ header = 0;
}
return size1 - size;
}
if (pos >= ffm->file_size)
pos -= (ffm->file_size - FFM_PACKET_SIZE);
#ifdef DEBUG_SEEK
- printf("seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos);
+ av_log(s, AV_LOG_DEBUG, "seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos);
#endif
url_fseek(pb, pos, SEEK_SET);
}
url_fskip(pb, 4);
pts = get_be64(pb);
#ifdef DEBUG_SEEK
- printf("pts=%0.6f\n", pts / 1000000.0);
+ av_log(s, AV_LOG_DEBUG, "pts=%0.6f\n", pts / 1000000.0);
#endif
return pts;
}
{
FFMContext *ffm = s->priv_data;
AVStream *st;
- FFMStream *fst;
ByteIOContext *pb = s->pb;
AVCodecContext *codec;
int i, nb_streams;
st = av_new_stream(s, 0);
if (!st)
goto fail;
- fst = av_mallocz(sizeof(FFMStream));
- if (!fst)
- goto fail;
s->streams[i] = st;
av_set_pts_info(st, 64, 1, 1000000);
- st->priv_data = fst;
-
codec = st->codec;
/* generic info */
codec->codec_id = get_be32(pb);
default:
goto fail;
}
-
+ if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) {
+ codec->extradata_size = get_be32(pb);
+ codec->extradata = av_malloc(codec->extradata_size);
+ if (!codec->extradata)
+ return AVERROR(ENOMEM);
+ get_buffer(pb, codec->extradata, codec->extradata_size);
+ }
}
/* get until end of block reached */
for(i=0;i<s->nb_streams;i++) {
st = s->streams[i];
if (st) {
- av_freep(&st->priv_data);
av_free(st);
}
}
switch(ffm->read_state) {
case READ_HEADER:
- if (!ffm_is_avail_data(s, FRAME_HEADER_SIZE)) {
+ if (!ffm_is_avail_data(s, FRAME_HEADER_SIZE+4)) {
return AVERROR(EAGAIN);
}
-#if 0
- printf("pos=%08"PRIx64" spos=%"PRIx64", write_index=%"PRIx64" size=%"PRIx64"\n",
- url_ftell(s->pb), s->pb.pos, ffm->write_index, ffm->file_size);
-#endif
+ dprintf(s, "pos=%08"PRIx64" spos=%"PRIx64", write_index=%"PRIx64" size=%"PRIx64"\n",
+ url_ftell(s->pb), s->pb->pos, ffm->write_index, ffm->file_size);
if (ffm_read_data(s, ffm->header, FRAME_HEADER_SIZE, 1) !=
FRAME_HEADER_SIZE)
return AVERROR(EAGAIN);
+ if (ffm->header[1] & FLAG_DTS)
+ if (ffm_read_data(s, ffm->header+16, 4, 1) != 4)
+ return AVERROR(EAGAIN);
#if 0
- {
- int i;
- for(i=0;i<FRAME_HEADER_SIZE;i++)
- printf("%02x ", ffm->header[i]);
- printf("\n");
- }
+ av_hexdump_log(s, AV_LOG_DEBUG, ffm->header, FRAME_HEADER_SIZE);
#endif
ffm->read_state = READ_DATA;
/* fall thru */
av_free_packet(pkt);
return AVERROR(EAGAIN);
}
- if (ffm->first_frame_in_packet)
- {
- pkt->pts = ffm->pts;
- ffm->first_frame_in_packet = 0;
- }
+ pkt->pts = AV_RB64(ffm->header+8);
+ if (ffm->header[1] & FLAG_DTS)
+ pkt->dts = pkt->pts - AV_RB32(ffm->header+16);
+ else
+ pkt->dts = pkt->pts;
pkt->duration = duration;
break;
}
double pos1;
#ifdef DEBUG_SEEK
- printf("wanted_pts=%0.6f\n", wanted_pts / 1000000.0);
+ av_log(s, AV_LOG_DEBUG, "wanted_pts=%0.6f\n", wanted_pts / 1000000.0);
#endif
/* find the position using linear interpolation (better than
dichotomy in typical cases) */
pos -= FFM_PACKET_SIZE;
found:
ffm_seek1(s, pos);
- return 0;
-}
-static int ffm_read_close(AVFormatContext *s)
-{
- AVStream *st;
- int i;
+ /* reset read state */
+ ffm->read_state = READ_HEADER;
+ ffm->packet_ptr = ffm->packet;
+ ffm->packet_end = ffm->packet;
+ ffm->first_packet = 1;
- for(i=0;i<s->nb_streams;i++) {
- st = s->streams[i];
- av_freep(&st->priv_data);
- }
return 0;
}
AVInputFormat ffm_demuxer = {
"ffm",
- "ffm format",
+ NULL_IF_CONFIG_SMALL("ffm format"),
sizeof(FFMContext),
ffm_probe,
ffm_read_header,
ffm_read_packet,
- ffm_read_close,
+ NULL,
ffm_seek,
};