* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "allformats.h"
#include "opt.h"
#include "avstring.h"
#include "riff.h"
/* read probe data */
pd->buf= av_realloc(pd->buf, probe_size + AVPROBE_PADDING_SIZE);
pd->buf_size = get_buffer(pb, pd->buf, probe_size);
+ memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
if (url_fseek(pb, 0, SEEK_SET) < 0) {
url_fclose(pb);
if (url_fopen(pb, filename, URL_RDONLY) < 0) {
/* XXX: suppress this hack for redirectors */
#ifdef CONFIG_REDIR_DEMUXER
- if (fmt == &redir_demuxer) {
+ if (!strcmp(fmt->name, "redir")) {
+ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
err = redir_open(ic_ptr, pb);
url_fclose(pb);
return err;
return 0;
}
-static int64_t lsb2full(int64_t lsb, int64_t last_ts, int lsb_bits){
- int64_t mask = lsb_bits < 64 ? (1LL<<lsb_bits)-1 : -1LL;
- int64_t delta= last_ts - mask/2;
- return ((lsb - delta)&mask) + delta;
+static void update_initial_timestamps(AVFormatContext *s, int stream_index,
+ int64_t dts, int64_t pts)
+{
+ AVStream *st= s->streams[stream_index];
+ AVPacketList *pktl= s->packet_buffer;
+
+ if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE)
+ return;
+
+ st->first_dts= dts - st->cur_dts;
+ st->cur_dts= dts;
+
+ for(; pktl; pktl= pktl->next){
+ if(pktl->pkt.stream_index != stream_index)
+ continue;
+ //FIXME think more about this check
+ if(pktl->pkt.pts != AV_NOPTS_VALUE && pktl->pkt.pts == pktl->pkt.dts)
+ pktl->pkt.pts += st->first_dts;
+
+ if(pktl->pkt.dts != AV_NOPTS_VALUE)
+ pktl->pkt.dts += st->first_dts;
+
+ if(st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE)
+ st->start_time= pktl->pkt.pts;
+ }
+ if (st->start_time == AV_NOPTS_VALUE)
+ st->start_time = pts;
}
static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
{
int num, den, presentation_delayed, delay, i;
int64_t offset;
- /* handle wrapping */
- if(st->cur_dts != AV_NOPTS_VALUE){
- if(pkt->pts != AV_NOPTS_VALUE)
- pkt->pts= lsb2full(pkt->pts, st->cur_dts, st->pts_wrap_bits);
- if(pkt->dts != AV_NOPTS_VALUE)
- pkt->dts= lsb2full(pkt->dts, st->cur_dts, st->pts_wrap_bits);
+
+ if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && pkt->dts > pkt->pts && st->pts_wrap_bits<63
+ /*&& pkt->dts-(1LL<<st->pts_wrap_bits) < pkt->pts*/){
+ pkt->dts -= 1LL<<st->pts_wrap_bits;
}
if (pkt->duration == 0) {
presentation_delayed = 1;
if(st->cur_dts == AV_NOPTS_VALUE){
- st->cur_dts = -delay * pkt->duration;
+ st->cur_dts = 0; //FIXME maybe set it to 0 during init
}
// av_log(NULL, AV_LOG_DEBUG, "IN delayed:%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64" st:%d pc:%p\n", presentation_delayed, pkt->pts, pkt->dts, st->cur_dts, pkt->stream_index, pc);
/* PTS = presentation time stamp */
if (pkt->dts == AV_NOPTS_VALUE)
pkt->dts = st->last_IP_pts;
+ update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts);
if (pkt->dts == AV_NOPTS_VALUE)
pkt->dts = st->cur_dts;
/* presentation is not delayed : PTS and DTS are the same */
if(pkt->pts == AV_NOPTS_VALUE)
pkt->pts = pkt->dts;
+ update_initial_timestamps(s, pkt->stream_index, pkt->pts, pkt->pts);
if(pkt->pts == AV_NOPTS_VALUE)
pkt->pts = st->cur_dts;
pkt->dts = pkt->pts;
FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
if(pkt->dts == AV_NOPTS_VALUE)
pkt->dts= st->pts_buffer[0];
+ if(delay>1){
+ update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet
+ }
if(pkt->dts > st->cur_dts)
st->cur_dts = pkt->dts;
}
return 0;
}
+static AVPacket *add_to_pktbuf(AVFormatContext *s, AVPacket *pkt){
+ AVPacketList *pktl= s->packet_buffer;
+ AVPacketList **plast_pktl= &s->packet_buffer;
+
+ while(*plast_pktl) plast_pktl= &(*plast_pktl)->next; //FIXME maybe maintain pointer to the last?
+
+ pktl = av_mallocz(sizeof(AVPacketList));
+ if (!pktl)
+ return NULL;
+
+ /* add the packet in the buffered packet list */
+ *plast_pktl = pktl;
+ pktl->pkt= *pkt;
+ return &pktl->pkt;
+}
+
int av_read_frame(AVFormatContext *s, AVPacket *pkt)
{
AVPacketList *pktl;
}
}
if(genpts){
- AVPacketList **plast_pktl= &s->packet_buffer;
int ret= av_read_frame_internal(s, pkt);
if(ret<0){
if(pktl && ret != AVERROR(EAGAIN)){
return ret;
}
- /* duplicate the packet */
- if (av_dup_packet(pkt) < 0)
+ if(av_dup_packet(add_to_pktbuf(s, pkt)) < 0)
return AVERROR(ENOMEM);
-
- while(*plast_pktl) plast_pktl= &(*plast_pktl)->next; //FIXME maybe maintain pointer to the last?
-
- pktl = av_mallocz(sizeof(AVPacketList));
- if (!pktl)
- return AVERROR(ENOMEM);
-
- /* add the packet in the buffered packet list */
- *plast_pktl = pktl;
- pktl->pkt= *pkt;
}else{
assert(!s->packet_buffer);
return av_read_frame_internal(s, pkt);
/*******************************************************/
/**
- * Returns TRUE if the stream has accurate timings in any stream.
+ * Returns TRUE if the stream has accurate duration in any stream.
*
- * @return TRUE if the stream has accurate timings for at least one component.
+ * @return TRUE if the stream has accurate duration for at least one component.
*/
-static int av_has_timings(AVFormatContext *ic)
+static int av_has_duration(AVFormatContext *ic)
{
int i;
AVStream *st;
for(i = 0;i < ic->nb_streams; i++) {
st = ic->streams[i];
- if (st->start_time != AV_NOPTS_VALUE &&
- st->duration != AV_NOPTS_VALUE)
+ if (st->duration != AV_NOPTS_VALUE)
return 1;
}
return 0;
static void av_update_stream_timings(AVFormatContext *ic)
{
int64_t start_time, start_time1, end_time, end_time1;
+ int64_t duration, duration1;
int i;
AVStream *st;
start_time = INT64_MAX;
end_time = INT64_MIN;
+ duration = INT64_MIN;
for(i = 0;i < ic->nb_streams; i++) {
st = ic->streams[i];
if (st->start_time != AV_NOPTS_VALUE) {
end_time = end_time1;
}
}
+ if (st->duration != AV_NOPTS_VALUE) {
+ duration1 = av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q);
+ if (duration1 > duration)
+ duration = duration1;
+ }
}
if (start_time != INT64_MAX) {
ic->start_time = start_time;
if (end_time != INT64_MIN) {
- ic->duration = end_time - start_time;
- if (ic->file_size > 0) {
- /* compute the bit rate */
- ic->bit_rate = (double)ic->file_size * 8.0 * AV_TIME_BASE /
- (double)ic->duration;
- }
+ if (end_time - start_time > duration)
+ duration = end_time - start_time;
+ }
+ }
+ if (duration != INT64_MIN) {
+ ic->duration = duration;
+ if (ic->file_size > 0) {
+ /* compute the bit rate */
+ ic->bit_rate = (double)ic->file_size * 8.0 * AV_TIME_BASE /
+ (double)ic->duration;
}
}
-
}
static void fill_all_stream_timings(AVFormatContext *ic)
for(i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i];
duration= av_rescale(8*filesize, st->time_base.den, ic->bit_rate*(int64_t)st->time_base.num);
- if (st->start_time == AV_NOPTS_VALUE ||
- st->duration == AV_NOPTS_VALUE) {
- st->start_time = 0;
+ if (st->duration == AV_NOPTS_VALUE)
st->duration = duration;
- }
}
}
}
for(;;) {
if (read_size >= DURATION_MAX_READ_SIZE)
break;
- /* if all info is available, we can stop */
- for(i = 0;i < ic->nb_streams; i++) {
- st = ic->streams[i];
- if (st->duration == AV_NOPTS_VALUE)
- break;
- }
- if (i == ic->nb_streams)
- break;
ret = av_read_packet(ic, pkt);
if (ret != 0)
break;
read_size += pkt->size;
st = ic->streams[pkt->stream_index];
- if (pkt->pts != AV_NOPTS_VALUE) {
+ if (pkt->pts != AV_NOPTS_VALUE &&
+ st->start_time != AV_NOPTS_VALUE) {
end_time = pkt->pts;
duration = end_time - st->start_time;
if (duration > 0) {
fill_all_stream_timings(ic);
url_fseek(&ic->pb, old_offset, SEEK_SET);
+ for(i=0; i<ic->nb_streams; i++){
+ st= ic->streams[i];
+ st->cur_dts= st->first_dts;
+ st->last_IP_pts = AV_NOPTS_VALUE;
+ }
}
static void av_estimate_timings(AVFormatContext *ic, offset_t old_offset)
file_size && !ic->pb.is_streamed) {
/* get accurate estimate from the PTSes */
av_estimate_timings_from_pts(ic, old_offset);
- } else if (av_has_timings(ic)) {
+ } else if (av_has_duration(ic)) {
/* at least one components has timings - we use them for all
the components */
fill_all_stream_timings(ic);
enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag)
{
- while (tags->id != CODEC_ID_NONE) {
- if( toupper((tag >> 0)&0xFF) == toupper((tags->tag >> 0)&0xFF)
- && toupper((tag >> 8)&0xFF) == toupper((tags->tag >> 8)&0xFF)
- && toupper((tag >>16)&0xFF) == toupper((tags->tag >>16)&0xFF)
- && toupper((tag >>24)&0xFF) == toupper((tags->tag >>24)&0xFF))
- return tags->id;
- tags++;
+ int i;
+ for(i=0; tags[i].id != CODEC_ID_NONE;i++) {
+ if(tag == tags[i].tag)
+ return tags[i].id;
+ }
+ for(i=0; tags[i].id != CODEC_ID_NONE; i++) {
+ if( toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
+ && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
+ && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
+ && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
+ return tags[i].id;
}
return CODEC_ID_NONE;
}
int i, count, ret, read_size, j;
AVStream *st;
AVPacket pkt1, *pkt;
- AVPacketList *pktl=NULL, **ppktl;
int64_t last_dts[MAX_STREAMS];
int duration_count[MAX_STREAMS]={0};
double (*duration_error)[MAX_STD_TIMEBASES];
memset(probe_data, 0, sizeof(probe_data));
count = 0;
read_size = 0;
- ppktl = &ic->packet_buffer;
for(;;) {
/* check if one codec still needs to be handled */
for(i=0;i<ic->nb_streams;i++) {
if (st->codec->codec_type == CODEC_TYPE_AUDIO &&
st->codec->codec_id == CODEC_ID_NONE)
break;
+ if(st->first_dts == AV_NOPTS_VALUE)
+ break;
}
if (i == ic->nb_streams) {
/* NOTE: if the format has no header, then we need to read
break;
}
- pktl = av_mallocz(sizeof(AVPacketList));
- if (!pktl) {
- ret = AVERROR(ENOMEM);
- break;
- }
-
- /* add the packet in the buffered packet list */
- *ppktl = pktl;
- ppktl = &pktl->next;
-
- pkt = &pktl->pkt;
- *pkt = pkt1;
-
- /* duplicate the packet */
- if (av_dup_packet(pkt) < 0) {
- ret = AVERROR(ENOMEM);
- break;
- }
+ pkt= add_to_pktbuf(ic, &pkt1);
+ if(av_dup_packet(pkt) < 0)
+ return AVERROR(ENOMEM);
read_size += pkt->size;
if (st->codec->codec_id == CODEC_ID_NONE) {
AVProbeData *pd = &(probe_data[st->index]);
- pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size);
+ pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE);
memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size);
pd->buf_size += pkt->size;
+ memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
}
}
if(st->parser && st->parser->parser->split && !st->codec->extradata){
}
}else if(st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (st->codec->codec_id == CODEC_ID_NONE && probe_data[st->index].buf_size > 0) {
- codec_identified[st->index] = set_codec_from_probe_data(st, &(probe_data[st->index]), 0);
+ codec_identified[st->index] = set_codec_from_probe_data(st, &(probe_data[st->index]), 1);
if (codec_identified[st->index]) {
st->need_parsing = AVSTREAM_PARSE_FULL;
}
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
- if (codec_identified[st->index]) {
- av_read_frame_flush(ic);
- av_seek_frame(ic, st->index, 0.0, 0);
- url_fseek(&ic->pb, ic->data_offset, SEEK_SET);
+ if (codec_identified[st->index])
+ break;
+ }
+ //FIXME this is a mess
+ if(i!=ic->nb_streams){
+ av_read_frame_flush(ic);
+ for(i=0;i<ic->nb_streams;i++) {
+ st = ic->streams[i];
+ if (codec_identified[st->index]) {
+ av_seek_frame(ic, st->index, 0.0, 0);
+ }
+ st->cur_dts= st->first_dts;
}
+ url_fseek(&ic->pb, ic->data_offset, SEEK_SET);
}
#if 0
av_free(st->codec);
av_free(st);
}
+ for(i=s->nb_programs-1; i>=0; i--) {
+ av_freep(&s->programs[i]->provider_name);
+ av_freep(&s->programs[i]->name);
+ av_freep(&s->programs[i]);
+ }
flush_packet_queue(s);
must_open_file = 1;
if (s->iformat->flags & AVFMT_NOFILE) {
st->start_time = AV_NOPTS_VALUE;
st->duration = AV_NOPTS_VALUE;
st->cur_dts = AV_NOPTS_VALUE;
+ st->first_dts = AV_NOPTS_VALUE;
/* default pts settings is MPEG like */
av_set_pts_info(st, 33, 1, 90000);
return st;
}
+AVProgram *av_new_program(AVFormatContext *ac, int id)
+{
+ AVProgram *program=NULL;
+ int i;
+
+#ifdef DEBUG_SI
+ av_log(ac, AV_LOG_DEBUG, "new_program: id=0x%04x\n", id);
+#endif
+
+ for(i=0; i<ac->nb_programs; i++)
+ if(ac->programs[i]->id == id)
+ program = ac->programs[i];
+
+ if(!program){
+ program = av_mallocz(sizeof(AVProgram));
+ if (!program)
+ return NULL;
+ dynarray_add(&ac->programs, &ac->nb_programs, program);
+ program->discard = AVDISCARD_NONE;
+ }
+ program->id = id;
+
+ return program;
+}
+
+void av_set_program_name(AVProgram *program, char *provider_name, char *name)
+{
+ assert(!provider_name == !name);
+ if(name){
+ av_free(program->provider_name);
+ av_free(program-> name);
+ program->provider_name = av_strdup(provider_name);
+ program-> name = av_strdup( name);
+ }
+}
+
+
/************************************************************/
/* output media file */
p = datestr;
q = NULL;
if (!duration) {
+ /* parse the year-month-day part */
for (i = 0; i < sizeof(date_fmt) / sizeof(date_fmt[0]); i++) {
q = small_strptime(p, date_fmt[i], &dt);
if (q) {
}
}
+ /* if the year-month-day part is missing, then take the
+ * current year-month-day time */
if (!q) {
if (is_utc) {
dt = *gmtime(&now);
if (*p == 'T' || *p == 't' || *p == ' ')
p++;
+ /* parse the hour-minute-second part */
for (i = 0; i < sizeof(time_fmt) / sizeof(time_fmt[0]); i++) {
q = small_strptime(p, time_fmt[i], &dt);
if (q) {
}
}
} else {
+ /* parse datestr as a duration */
if (p[0] == '-') {
negative = 1;
++p;
}
+ /* parse datestr as HH:MM:SS */
q = small_strptime(p, time_fmt[0], &dt);
if (!q) {
+ /* parse datestr as S+ */
dt.tm_sec = strtol(p, (char **)&q, 10);
+ if (q == p)
+ /* the parsing didn't succeed */
+ return INT64_MIN;
dt.tm_min = 0;
dt.tm_hour = 0;
}
/* Now we have all the fields that we can get */
if (!q) {
- if (duration)
- return 0;
- else
- return now * INT64_C(1000000);
+ return INT64_MIN;
}
if (duration) {
t *= 1000000;
+ /* parse the .m... part */
if (*q == '.') {
int val, n;
q++;
char *path, int path_size,
const char *url)
{
- const char *p;
- char *q;
- int port;
+ const char *p, *ls, *at, *col;
- port = -1;
+ if (port_ptr) *port_ptr = -1;
+ if (proto_size > 0) proto[0] = 0;
+ if (authorization_size > 0) authorization[0] = 0;
+ if (hostname_size > 0) hostname[0] = 0;
+ if (path_size > 0) path[0] = 0;
- p = url;
- q = proto;
- while (*p != ':' && *p != '\0') {
- if ((q - proto) < proto_size - 1)
- *q++ = *p;
- p++;
- }
- if (proto_size > 0)
- *q = '\0';
- if (authorization_size > 0)
- authorization[0] = '\0';
- if (*p == '\0') {
- if (proto_size > 0)
- proto[0] = '\0';
- if (hostname_size > 0)
- hostname[0] = '\0';
- p = url;
+ /* parse protocol */
+ if ((p = strchr(url, ':'))) {
+ av_strlcpy(proto, url, FFMIN(proto_size, p + 1 - url));
+ p++; /* skip ':' */
+ if (*p == '/') p++;
+ if (*p == '/') p++;
} else {
- char *at,*slash; // PETR: position of '@' character and '/' character
+ /* no protocol means plain filename */
+ av_strlcpy(path, url, path_size);
+ return;
+ }
- p++;
- if (*p == '/')
- p++;
- if (*p == '/')
- p++;
- at = strchr(p,'@'); // PETR: get the position of '@'
- slash = strchr(p,'/'); // PETR: get position of '/' - end of hostname
- if (at && slash && at > slash) at = NULL; // PETR: not interested in '@' behind '/'
-
- q = at ? authorization : hostname; // PETR: if '@' exists starting with auth.
-
- while ((at || *p != ':') && *p != '/' && *p != '?' && *p != '\0') { // PETR:
- if (*p == '@') { // PETR: passed '@'
- if (authorization_size > 0)
- *q = '\0';
- q = hostname;
- at = NULL;
- } else if (!at) { // PETR: hostname
- if ((q - hostname) < hostname_size - 1)
- *q++ = *p;
- } else {
- if ((q - authorization) < authorization_size - 1)
- *q++ = *p;
- }
- p++;
+ /* separate path from hostname */
+ if ((ls = strchr(p, '/')))
+ av_strlcpy(path, ls, path_size);
+ else
+ ls = &p[strlen(p)]; // XXX
+
+ /* the rest is hostname, use that to parse auth/port */
+ if (ls != p) {
+ /* authorization (user[:pass]@hostname) */
+ if ((at = strchr(p, '@')) && at < ls) {
+ av_strlcpy(authorization, p,
+ FFMIN(authorization_size, at + 1 - p));
+ p = at + 1; /* skip '@' */
}
- if (hostname_size > 0)
- *q = '\0';
- if (*p == ':') {
- p++;
- port = strtoul(p, (char **)&p, 10);
+
+ /* port */
+ if ((col = strchr(p, ':')) && col < ls) {
+ ls = col;
+ if (port_ptr) *port_ptr = atoi(col + 1); /* skip ':' */
}
+
+ av_strlcpy(hostname, p, FFMIN(1 + ls - p, hostname_size));
}
- if (port_ptr)
- *port_ptr = port;
- av_strlcpy(path, p, path_size);
}
void av_set_pts_info(AVStream *s, int pts_wrap_bits,