* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "opt.h"
-#include "avstring.h"
+#include "libavcodec/opt.h"
+#include "libavutil/avstring.h"
#include "riff.h"
#include <sys/time.h>
#include <time.h>
return av_probe_input_format2(pd, is_opened, &score);
}
+static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
+{
+ AVInputFormat *fmt;
+ fmt = av_probe_input_format2(pd, 1, &score);
+
+ if (fmt) {
+ if (strncmp(fmt->name, "mp3", 3) == 0)
+ st->codec->codec_id = CODEC_ID_MP3;
+ else if (strncmp(fmt->name, "ac3", 3) == 0)
+ st->codec->codec_id = CODEC_ID_AC3;
+ else if (!strcmp(fmt->name, "mpegvideo"))
+ st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
+ else if (!strcmp(fmt->name, "h264"))
+ st->codec->codec_id = CODEC_ID_H264;
+ }
+ return !!fmt;
+}
+
/************************************************************/
/* input media file */
{"cryptokey", "decryption key", OFFSET(key), FF_OPT_TYPE_BINARY, 0, 0, 0, D},
{"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), FF_OPT_TYPE_INT, 1<<20, 0, INT_MAX, D},
{"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), FF_OPT_TYPE_INT, 3041280, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */
+{"fdebug", "print specific debug info", OFFSET(debug), FF_OPT_TYPE_FLAGS, DEFAULT, 0, INT_MAX, E|D, "fdebug"},
+{"ts", NULL, 0, FF_OPT_TYPE_CONST, FF_FDEBUG_TS, INT_MIN, INT_MAX, E|D, "fdebug"},
{NULL},
};
ic->priv_data = NULL;
}
- err = ic->iformat->read_header(ic, ap);
- if (err < 0)
- goto fail;
+ if (ic->iformat->read_header) {
+ err = ic->iformat->read_header(ic, ap);
+ if (err < 0)
+ goto fail;
+ }
if (pb && !ic->data_offset)
ic->data_offset = url_ftell(ic->pb);
return 0;
fail:
if (ic) {
+ int i;
av_freep(&ic->priv_data);
+ for(i=0;i<ic->nb_streams;i++) {
+ AVStream *st = ic->streams[i];
+ if (st) {
+ av_free(st->priv_data);
+ av_free(st->codec->extradata);
+ }
+ av_free(st);
+ }
}
av_free(ic);
*ic_ptr = NULL;
/*******************************************************/
+static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt){
+ AVPacketList *pktl;
+ AVPacketList **plast_pktl= 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_packet(AVFormatContext *s, AVPacket *pkt)
{
int ret;
AVStream *st;
- av_init_packet(pkt);
- ret= s->iformat->read_packet(s, pkt);
- if (ret < 0)
- return ret;
- st= s->streams[pkt->stream_index];
- switch(st->codec->codec_type){
- case CODEC_TYPE_VIDEO:
- if(s->video_codec_id) st->codec->codec_id= s->video_codec_id;
- break;
- case CODEC_TYPE_AUDIO:
- if(s->audio_codec_id) st->codec->codec_id= s->audio_codec_id;
- break;
- case CODEC_TYPE_SUBTITLE:
- if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id;
- break;
- }
+ for(;;){
+ AVPacketList *pktl = s->raw_packet_buffer;
- return ret;
+ if (pktl) {
+ *pkt = pktl->pkt;
+ if(s->streams[pkt->stream_index]->codec->codec_id != CODEC_ID_PROBE){
+ s->raw_packet_buffer = pktl->next;
+ av_free(pktl);
+ return 0;
+ }
+ }
+
+ av_init_packet(pkt);
+ ret= s->iformat->read_packet(s, pkt);
+ if (ret < 0)
+ return ret;
+ st= s->streams[pkt->stream_index];
+
+ if(!pktl && st->codec->codec_id!=CODEC_ID_PROBE)
+ return ret;
+
+ add_to_pktbuf(&s->raw_packet_buffer, pkt);
+
+ switch(st->codec->codec_type){
+ case CODEC_TYPE_VIDEO:
+ if(s->video_codec_id) st->codec->codec_id= s->video_codec_id;
+ break;
+ case CODEC_TYPE_AUDIO:
+ if(s->audio_codec_id) st->codec->codec_id= s->audio_codec_id;
+ break;
+ case CODEC_TYPE_SUBTITLE:
+ if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id;
+ break;
+ }
+
+ if(st->codec->codec_id == CODEC_ID_PROBE){
+ AVProbeData *pd = &st->probe_data;
+
+ 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(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){
+ set_codec_from_probe_data(st, pd, 1);
+ if(st->codec->codec_id != CODEC_ID_PROBE){
+ pd->buf_size=0;
+ av_freep(&pd->buf);
+ }
+ }
+ }
+ }
}
/**********************************************************/
{
int frame_size;
+ if(enc->codec_id == CODEC_ID_VORBIS)
+ return -1;
+
if (enc->frame_size <= 1) {
int bits_per_sample = av_get_bits_per_sample(enc->codec_id);
AVStream *st= s->streams[stream_index];
AVPacketList *pktl= s->packet_buffer;
- if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE)
+ if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE)
return;
st->first_dts= dts - st->cur_dts;
static void update_initial_durations(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
AVPacketList *pktl= s->packet_buffer;
+ int64_t cur_dts= 0;
- assert(pkt->duration && !st->cur_dts);
+ if(st->first_dts != AV_NOPTS_VALUE){
+ cur_dts= st->first_dts;
+ for(; pktl; pktl= pktl->next){
+ if(pktl->pkt.stream_index == pkt->stream_index){
+ if(pktl->pkt.pts != pktl->pkt.dts || pktl->pkt.dts != AV_NOPTS_VALUE || pktl->pkt.duration)
+ break;
+ cur_dts -= pkt->duration;
+ }
+ }
+ pktl= s->packet_buffer;
+ st->first_dts = cur_dts;
+ }else if(st->cur_dts)
+ return;
for(; pktl; pktl= pktl->next){
if(pktl->pkt.stream_index != pkt->stream_index)
continue;
if(pktl->pkt.pts == pktl->pkt.dts && pktl->pkt.dts == AV_NOPTS_VALUE
&& !pktl->pkt.duration){
- pktl->pkt.pts= pktl->pkt.dts= st->cur_dts;
- st->cur_dts += pkt->duration;
+ pktl->pkt.dts= cur_dts;
+ if(!st->codec->has_b_frames)
+ pktl->pkt.pts= cur_dts;
+ cur_dts += pkt->duration;
pktl->pkt.duration= pkt->duration;
}else
break;
}
+ if(st->first_dts == AV_NOPTS_VALUE)
+ st->cur_dts= cur_dts;
}
static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
if (den && num) {
pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num);
- if(st->cur_dts == 0 && pkt->duration != 0)
+ if(pkt->duration != 0 && s->packet_buffer)
update_initial_durations(s, st, pkt);
}
}
if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts)
presentation_delayed = 1;
- if(st->cur_dts == AV_NOPTS_VALUE){
- 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);
/* interpolate PTS and DTS if they are not present */
- if(delay <=1){
+ if(delay==0 || (delay==1 && pc)){
if (presentation_delayed) {
/* DTS = decompression timestamp */
/* PTS = presentation timestamp */
of the frame we are displaying, i.e. the last I- or P-frame */
if (st->last_IP_duration == 0)
st->last_IP_duration = pkt->duration;
- st->cur_dts = pkt->dts + st->last_IP_duration;
+ if(pkt->dts != AV_NOPTS_VALUE)
+ st->cur_dts = pkt->dts + st->last_IP_duration;
st->last_IP_duration = pkt->duration;
st->last_IP_pts= pkt->pts;
/* cannot compute PTS if not present (we can compute it only
if(pkt->pts == AV_NOPTS_VALUE)
pkt->pts = st->cur_dts;
pkt->dts = pkt->pts;
- st->cur_dts = pkt->pts + pkt->duration;
+ if(pkt->pts != AV_NOPTS_VALUE)
+ st->cur_dts = pkt->pts + pkt->duration;
}
}
return ret;
}
- st = s->streams[s->cur_pkt.stream_index];
- if(st->codec->debug & FF_DEBUG_PTS)
- av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
+ if(s->cur_pkt.pts != AV_NOPTS_VALUE &&
+ s->cur_pkt.dts != AV_NOPTS_VALUE &&
+ s->cur_pkt.pts < s->cur_pkt.dts){
+ av_log(s, AV_LOG_WARNING, "Invalid timestamps stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
s->cur_pkt.stream_index,
s->cur_pkt.pts,
s->cur_pkt.dts,
s->cur_pkt.size);
+// av_free_packet(&s->cur_pkt);
+// return -1;
+ }
+
+ st = s->streams[s->cur_pkt.stream_index];
+ if(s->debug & FF_FDEBUG_TS)
+ av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d, flags=%d\n",
+ s->cur_pkt.stream_index,
+ s->cur_pkt.pts,
+ s->cur_pkt.dts,
+ s->cur_pkt.size,
+ s->cur_pkt.flags);
s->cur_st = st;
s->cur_ptr = s->cur_pkt.data;
st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
}
if(st->parser && (s->iformat->flags & AVFMT_GENERIC_INDEX)){
- st->parser->last_frame_offset=
+ st->parser->next_frame_offset=
st->parser->cur_offset= s->cur_pkt.pos;
}
}
}
}
- if(st->codec->debug & FF_DEBUG_PTS)
- av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
+ if(s->debug & FF_FDEBUG_TS)
+ av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d, flags=%d\n",
pkt->stream_index,
pkt->pts,
pkt->dts,
- pkt->size);
+ pkt->size,
+ pkt->flags);
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;
return ret;
}
- if(av_dup_packet(add_to_pktbuf(s, pkt)) < 0)
+ if(av_dup_packet(add_to_pktbuf(&s->packet_buffer, pkt)) < 0)
return AVERROR(ENOMEM);
}else{
assert(!s->packet_buffer);
int av_find_default_stream_index(AVFormatContext *s)
{
+ int first_audio_index = -1;
int i;
AVStream *st;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
return i;
}
+ if (first_audio_index < 0 && st->codec->codec_type == CODEC_TYPE_AUDIO)
+ first_audio_index = i;
}
- return 0;
+ return first_audio_index >= 0 ? first_audio_index : 0;
}
/**
int i;
AVPacket pkt;
- if(st->index_entries && st->nb_index_entries){
+ if(st->nb_index_entries){
+ assert(st->index_entries);
ie= &st->index_entries[st->nb_index_entries-1];
url_fseek(s->pb, ie->pos, SEEK_SET);
av_update_cur_dts(s, st, ie->timestamp);
int val;
switch(enc->codec_type) {
case CODEC_TYPE_AUDIO:
- val = enc->sample_rate;
+ val = enc->sample_rate && enc->channels;
+ if(!enc->frame_size &&
+ (enc->codec_id == CODEC_ID_VORBIS ||
+ enc->codec_id == CODEC_ID_AAC))
+ return 0;
break;
case CODEC_TYPE_VIDEO:
val = enc->width && enc->pix_fmt != PIX_FMT_NONE;
val = 1;
break;
}
- return (enc->codec_id != CODEC_ID_NONE && val != 0);
+ return enc->codec_id != CODEC_ID_NONE && val != 0;
}
static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
return ret;
}
-static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
-{
- AVInputFormat *fmt;
- fmt = av_probe_input_format2(pd, 1, &score);
-
- if (fmt) {
- if (strncmp(fmt->name, "mp3", 3) == 0)
- st->codec->codec_id = CODEC_ID_MP3;
- else if (strncmp(fmt->name, "ac3", 3) == 0)
- st->codec->codec_id = CODEC_ID_AC3;
- }
- return !!fmt;
-}
-
unsigned int codec_get_tag(const AVCodecTag *tags, int id)
{
while (tags->id != CODEC_ID_NONE) {
return CODEC_ID_NONE;
}
+static void compute_chapters_end(AVFormatContext *s)
+{
+ unsigned int i;
+
+ for (i=0; i+1<s->nb_chapters; i++)
+ if (s->chapters[i]->end == AV_NOPTS_VALUE) {
+ assert(s->chapters[i]->start <= s->chapters[i+1]->start);
+ assert(!av_cmp_q(s->chapters[i]->time_base, s->chapters[i+1]->time_base));
+ s->chapters[i]->end = s->chapters[i+1]->start;
+ }
+
+ if (s->nb_chapters && s->chapters[i]->end == AV_NOPTS_VALUE) {
+ assert(s->start_time != AV_NOPTS_VALUE);
+ assert(s->duration > 0);
+ s->chapters[i]->end = av_rescale_q(s->start_time + s->duration,
+ AV_TIME_BASE_Q,
+ s->chapters[i]->time_base);
+ }
+}
+
/* absolute maximum size we read until we abort */
#define MAX_READ_SIZE 5000000
break;
}
- pkt= add_to_pktbuf(ic, &pkt1);
+ pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1);
if(av_dup_packet(pkt) < 0)
return AVERROR(ENOMEM);
url_fseek(ic->pb, ic->data_offset, SEEK_SET);
}
+ compute_chapters_end(ic);
+
#if 0
/* correct DTS for B-frame streams with no timestamps */
for(i=0;i<ic->nb_streams;i++) {
av_free(st->codec->extradata);
av_free(st->codec);
av_free(st->filename);
+ av_free(st->priv_data);
av_free(st);
}
for(i=s->nb_programs-1; i>=0; i--) {
av_freep(&s->programs[i]->stream_index);
av_freep(&s->programs[i]);
}
+ av_freep(&s->programs);
flush_packet_queue(s);
av_freep(&s->priv_data);
+ while(s->nb_chapters--) {
+ av_free(s->chapters[s->nb_chapters]->title);
+ av_free(s->chapters[s->nb_chapters]);
+ }
+ av_freep(&s->chapters);
av_free(s);
}
st->id = id;
st->start_time = AV_NOPTS_VALUE;
st->duration = AV_NOPTS_VALUE;
- st->cur_dts = AV_NOPTS_VALUE;
+ /* we set the current DTS to 0 so that formats without any timestamps
+ but durations get some timestamps, formats with some unknown
+ timestamps have their first few packets buffered and the
+ timestamps corrected before they are returned to the user */
+ st->cur_dts = 0;
st->first_dts = AV_NOPTS_VALUE;
/* default pts setting is MPEG-like */
}
}
+AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title)
+{
+ AVChapter *chapter = NULL;
+ int i;
+
+ for(i=0; i<s->nb_chapters; i++)
+ if(s->chapters[i]->id == id)
+ chapter = s->chapters[i];
+
+ if(!chapter){
+ chapter= av_mallocz(sizeof(AVChapter));
+ if(!chapter)
+ return NULL;
+ dynarray_add(&s->chapters, &s->nb_chapters, chapter);
+ }
+ av_free(chapter->title);
+ chapter->title = av_strdup(title);
+ chapter->id = id;
+ chapter->time_base= time_base;
+ chapter->start = start;
+ chapter->end = end;
+
+ return chapter;
+}
/************************************************************/
/* output media file */
}
}
+ if(pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay==0)
+ pkt->pts= pkt->dts;
+
//XXX/FIXME this is a temporary hack until all encoders output pts
if((pkt->pts == 0 || pkt->pts == AV_NOPTS_VALUE) && pkt->dts == AV_NOPTS_VALUE && !delay){
pkt->dts=
}
if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){
- av_log(NULL, AV_LOG_ERROR, "error, non monotone timestamps %"PRId64" >= %"PRId64"\n", st->cur_dts, pkt->dts);
+ av_log(st->codec, AV_LOG_ERROR, "error, non monotone timestamps %"PRId64" >= %"PRId64"\n", st->cur_dts, pkt->dts);
return -1;
}
if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts){
- av_log(NULL, AV_LOG_ERROR, "error, pts < dts\n");
+ av_log(st->codec, AV_LOG_ERROR, "error, pts < dts\n");
return -1;
}
int av_write_frame(AVFormatContext *s, AVPacket *pkt)
{
- int ret;
+ int ret = compute_pkt_fields2(s->streams[pkt->stream_index], pkt);
- ret=compute_pkt_fields2(s->streams[pkt->stream_index], pkt);
if(ret<0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
return ret;
pktl= pktl->next;
}
- if(s->nb_streams == stream_count || (flush && stream_count)){
+ if(stream_count && (s->nb_streams == stream_count || flush)){
pktl= s->packet_buffer;
*out= pktl->pkt;