*/
#include "avformat.h"
#include "internal.h"
-#include "libavcodec/opt.h"
+#include "libavcodec/internal.h"
+#include "libavutil/opt.h"
#include "metadata.h"
#include "libavutil/avstring.h"
#include "riff.h"
+#include "audiointerleave.h"
#include <sys/time.h>
#include <time.h>
#include <strings.h>
+#include <stdarg.h>
+#if CONFIG_NETWORK
+#include "network.h"
+#endif
#undef NDEBUG
#include <assert.h>
/**
- * @file libavformat/utils.c
+ * @file
* various utility functions for use within FFmpeg
*/
return LIBAVFORMAT_VERSION_INT;
}
-const char * avformat_configuration(void)
+const char *avformat_configuration(void)
{
return FFMPEG_CONFIGURATION;
}
-const char * avformat_license(void)
+const char *avformat_license(void)
{
#define LICENSE_PREFIX "libavformat license: "
return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
format->next = NULL;
}
-int match_ext(const char *filename, const char *extensions)
+int av_match_ext(const char *filename, const char *extensions)
{
const char *ext, *p;
char ext1[32], *q;
return !strcasecmp(name, names);
}
+#if LIBAVFORMAT_VERSION_MAJOR < 53
AVOutputFormat *guess_format(const char *short_name, const char *filename,
const char *mime_type)
+{
+ return av_guess_format(short_name, filename, mime_type);
+}
+#endif
+
+AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
+ const char *mime_type)
{
AVOutputFormat *fmt, *fmt_found;
int score_max, score;
if (!short_name && filename &&
av_filename_number_test(filename) &&
av_guess_image2_codec(filename) != CODEC_ID_NONE) {
- return guess_format("image2", NULL, NULL);
+ return av_guess_format("image2", NULL, NULL);
}
#endif
/* Find the proper file type. */
if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
score += 10;
if (filename && fmt->extensions &&
- match_ext(filename, fmt->extensions)) {
+ av_match_ext(filename, fmt->extensions)) {
score += 5;
}
if (score > score_max) {
return fmt_found;
}
+#if LIBAVFORMAT_VERSION_MAJOR < 53
AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
const char *mime_type)
{
- AVOutputFormat *fmt = guess_format(short_name, filename, mime_type);
+ AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
if (fmt) {
AVOutputFormat *stream_fmt;
char stream_format_name[64];
snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name);
- stream_fmt = guess_format(stream_format_name, NULL, NULL);
+ stream_fmt = av_guess_format(stream_format_name, NULL, NULL);
if (stream_fmt)
fmt = stream_fmt;
return fmt;
}
+#endif
enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
- const char *filename, const char *mime_type, enum CodecType type){
- if(type == CODEC_TYPE_VIDEO){
+ const char *filename, const char *mime_type, enum AVMediaType type){
+ if(type == AVMEDIA_TYPE_VIDEO){
enum CodecID codec_id= CODEC_ID_NONE;
#if CONFIG_IMAGE2_MUXER
if(codec_id == CODEC_ID_NONE)
codec_id= fmt->video_codec;
return codec_id;
- }else if(type == CODEC_TYPE_AUDIO)
+ }else if(type == AVMEDIA_TYPE_AUDIO)
return fmt->audio_codec;
else
return CODEC_ID_NONE;
return NULL;
}
-/* memory handling */
+#if LIBAVFORMAT_VERSION_MAJOR < 53 && CONFIG_SHARED && HAVE_SYMVER
+FF_SYMVER(void, av_destruct_packet_nofree, (AVPacket *pkt), "LIBAVFORMAT_52")
+{
+ av_destruct_packet_nofree(pkt);
+}
+
+FF_SYMVER(void, av_destruct_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
+{
+ av_destruct_packet(pkt);
+}
+
+FF_SYMVER(int, av_new_packet, (AVPacket *pkt, int size), "LIBAVFORMAT_52")
+{
+ return av_new_packet(pkt, size);
+}
+FF_SYMVER(int, av_dup_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
+{
+ return av_dup_packet(pkt);
+}
+
+FF_SYMVER(void, av_free_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
+{
+ av_free_packet(pkt);
+}
+
+FF_SYMVER(void, av_init_packet, (AVPacket *pkt), "LIBAVFORMAT_52")
+{
+ av_log(NULL, AV_LOG_WARNING, "Diverting av_*_packet function calls to libavcodec. Recompile to improve performance\n");
+ av_init_packet(pkt);
+}
+#endif
int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size)
{
return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0);
}
-static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
{
AVInputFormat *fmt1, *fmt;
int score;
if (fmt1->read_probe) {
score = fmt1->read_probe(pd);
} else if (fmt1->extensions) {
- if (match_ext(pd->filename, fmt1->extensions)) {
+ if (av_match_ext(pd->filename, fmt1->extensions)) {
score = 50;
}
}
static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, AVProbeData *pd, int score)
{
- AVInputFormat *fmt;
- fmt = av_probe_input_format2(pd, 1, &score);
+ static const struct {
+ const char *name; enum CodecID id; enum AVMediaType type;
+ } fmt_id_type[] = {
+ { "aac" , CODEC_ID_AAC , AVMEDIA_TYPE_AUDIO },
+ { "ac3" , CODEC_ID_AC3 , AVMEDIA_TYPE_AUDIO },
+ { "dts" , CODEC_ID_DTS , AVMEDIA_TYPE_AUDIO },
+ { "eac3" , CODEC_ID_EAC3 , AVMEDIA_TYPE_AUDIO },
+ { "h264" , CODEC_ID_H264 , AVMEDIA_TYPE_VIDEO },
+ { "m4v" , CODEC_ID_MPEG4 , AVMEDIA_TYPE_VIDEO },
+ { "mp3" , CODEC_ID_MP3 , AVMEDIA_TYPE_AUDIO },
+ { "mpegvideo", CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO },
+ { 0 }
+ };
+ AVInputFormat *fmt = av_probe_input_format2(pd, 1, &score);
if (fmt) {
+ int i;
av_log(s, AV_LOG_DEBUG, "Probe with size=%d, packets=%d detected %s with score=%d\n",
pd->buf_size, MAX_PROBE_PACKETS - st->probe_packets, fmt->name, score);
- if (!strcmp(fmt->name, "mp3")) {
- st->codec->codec_id = CODEC_ID_MP3;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- } else if (!strcmp(fmt->name, "ac3")) {
- st->codec->codec_id = CODEC_ID_AC3;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- } else if (!strcmp(fmt->name, "eac3")) {
- st->codec->codec_id = CODEC_ID_EAC3;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- } else if (!strcmp(fmt->name, "mpegvideo")) {
- st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- } else if (!strcmp(fmt->name, "m4v")) {
- st->codec->codec_id = CODEC_ID_MPEG4;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- } else if (!strcmp(fmt->name, "h264")) {
- st->codec->codec_id = CODEC_ID_H264;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- } else if (!strcmp(fmt->name, "dts")) {
- st->codec->codec_id = CODEC_ID_DTS;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ for (i = 0; fmt_id_type[i].name; i++) {
+ if (!strcmp(fmt->name, fmt_id_type[i].name)) {
+ st->codec->codec_id = fmt_id_type[i].id;
+ st->codec->codec_type = fmt_id_type[i].type;
+ break;
+ }
}
}
return !!fmt;
if (pb && !ic->data_offset)
ic->data_offset = url_ftell(ic->pb);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_OLD_METADATA
ff_metadata_demux_compat(ic);
#endif
if (st) {
av_free(st->priv_data);
av_free(st->codec->extradata);
+ av_free(st->codec);
}
av_free(st);
}
#define PROBE_BUF_MIN 2048
#define PROBE_BUF_MAX (1<<20)
+int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt,
+ const char *filename, void *logctx,
+ unsigned int offset, unsigned int max_probe_size)
+{
+ AVProbeData pd = { filename ? filename : "", NULL, -offset };
+ unsigned char *buf = NULL;
+ int ret = 0, probe_size;
+
+ if (!max_probe_size) {
+ max_probe_size = PROBE_BUF_MAX;
+ } else if (max_probe_size > PROBE_BUF_MAX) {
+ max_probe_size = PROBE_BUF_MAX;
+ } else if (max_probe_size < PROBE_BUF_MIN) {
+ return AVERROR(EINVAL);
+ }
+
+ if (offset >= max_probe_size) {
+ return AVERROR(EINVAL);
+ }
+
+ for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt && ret >= 0;
+ probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) {
+ int ret, score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0;
+ int buf_offset = (probe_size == PROBE_BUF_MIN) ? 0 : probe_size>>1;
+
+ if (probe_size < offset) {
+ continue;
+ }
+
+ /* read probe data */
+ buf = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE);
+ if ((ret = get_buffer(*pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
+ /* fail if error was not end of file, otherwise, lower score */
+ if (ret != AVERROR_EOF) {
+ av_free(buf);
+ return ret;
+ }
+ score = 0;
+ ret = 0; /* error was end of file, nothing read */
+ }
+ pd.buf_size += ret;
+ pd.buf = &buf[offset];
+
+ memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE);
+
+ /* guess file format */
+ *fmt = av_probe_input_format2(&pd, 1, &score);
+ if(*fmt){
+ if(score <= AVPROBE_SCORE_MAX/4){ //this can only be true in the last iteration
+ av_log(logctx, AV_LOG_WARNING, "Format detected only with low score of %d, misdetection possible!\n", score);
+ }else
+ av_log(logctx, AV_LOG_DEBUG, "Probed with size=%d and score=%d\n", probe_size, score);
+ }
+ }
+
+ if (!*fmt) {
+ av_free(buf);
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* rewind. reuse probe buffer to avoid seeking */
+ if ((ret = ff_rewind_with_probe_data(*pb, buf, pd.buf_size)) < 0)
+ av_free(buf);
+
+ return ret;
+}
+
int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
AVInputFormat *fmt,
int buf_size,
AVFormatParameters *ap)
{
- int err, probe_size;
+ int err;
AVProbeData probe_data, *pd = &probe_data;
ByteIOContext *pb = NULL;
void *logctx= ap && ap->prealloced_context ? *ic_ptr : NULL;
if (buf_size > 0) {
url_setbufsize(pb, buf_size);
}
-
- for(probe_size= PROBE_BUF_MIN; probe_size<=PROBE_BUF_MAX && !fmt; probe_size<<=1){
- int score= probe_size < PROBE_BUF_MAX ? AVPROBE_SCORE_MAX/4 : 0;
- /* read probe data */
- pd->buf= av_realloc(pd->buf, probe_size + AVPROBE_PADDING_SIZE);
- pd->buf_size = get_buffer(pb, pd->buf, probe_size);
-
- if ((int)pd->buf_size < 0) {
- err = pd->buf_size;
- goto fail;
- }
-
- 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) {
- pb = NULL;
- err = AVERROR(EIO);
- goto fail;
- }
- }
- /* guess file format */
- fmt = av_probe_input_format2(pd, 1, &score);
- if(fmt){
- if(score <= AVPROBE_SCORE_MAX/4){ //this can only be true in the last iteration
- av_log(logctx, AV_LOG_WARNING, "Format detected only with low score of %d, misdetection possible!\n", score);
- }else
- av_log(logctx, AV_LOG_DEBUG, "Probed with size=%d and score=%d\n", probe_size, score);
- }
+ if (!fmt && (err = ff_probe_input_buffer(&pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) {
+ goto fail;
}
- av_freep(&pd->buf);
}
/* if still no format found, error */
if (!fmt) {
- err = AVERROR_NOFMT;
+ err = AVERROR_INVALIDDATA;
goto fail;
}
st= s->streams[pkt->stream_index];
switch(st->codec->codec_type){
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
if(s->video_codec_id) st->codec->codec_id= s->video_codec_id;
break;
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
if(s->audio_codec_id) st->codec->codec_id= s->audio_codec_id;
break;
- case CODEC_TYPE_SUBTITLE:
+ case AVMEDIA_TYPE_SUBTITLE:
if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id;
break;
}
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(s, st, pd, 1);
+ //FIXME we dont reduce score to 0 for the case of running out of buffer space in bytes
+ set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);
if(st->codec->codec_id != CODEC_ID_PROBE){
pd->buf_size=0;
av_freep(&pd->buf);
*pnum = 0;
*pden = 0;
switch(st->codec->codec_type) {
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
if(st->time_base.num*1000LL > st->time_base.den){
*pnum = st->time_base.num;
*pden = st->time_base.den;
if (pc && pc->repeat_pict) {
*pnum = (*pnum) * (1 + pc->repeat_pict);
}
+ //If this codec can be interlaced or progressive then we need a parser to compute duration of a packet
+ //Thus if we have no parser in such case leave duration undefined.
+ if(st->codec->ticks_per_frame>1 && !pc){
+ *pnum = *pden = 0;
+ }
}
break;
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
frame_size = get_audio_frame_size(st->codec, pkt->size);
if (frame_size < 0)
break;
}
static int is_intra_only(AVCodecContext *enc){
- if(enc->codec_type == CODEC_TYPE_AUDIO){
+ if(enc->codec_type == AVMEDIA_TYPE_AUDIO){
return 1;
- }else if(enc->codec_type == CODEC_TYPE_VIDEO){
+ }else if(enc->codec_type == AVMEDIA_TYPE_VIDEO){
switch(enc->codec_id){
case CODEC_ID_MJPEG:
case CODEC_ID_MJPEGB:
int num, den, presentation_delayed, delay, i;
int64_t offset;
+ if (s->flags & AVFMT_FLAG_NOFILLIN)
+ return;
+
+ if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE)
+ pkt->dts= AV_NOPTS_VALUE;
+
if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == FF_B_TYPE)
//FIXME Set low_delay = 0 when has_b_frames = 1
st->codec->has_b_frames = 1;
// we take the conservative approach and discard both
// Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly.
if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){
- av_log(s, AV_LOG_WARNING, "invalid dts/pts combination\n");
+ av_log(s, AV_LOG_DEBUG, "invalid dts/pts combination\n");
pkt->dts= pkt->pts= AV_NOPTS_VALUE;
}
if (pkt->duration == 0) {
compute_frame_duration(&num, &den, st, pc, pkt);
if (den && num) {
- pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num);
+ pkt->duration = av_rescale_rnd(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num, AV_ROUND_DOWN);
if(pkt->duration != 0 && s->packet_buffer)
update_initial_durations(s, st, pkt);
/* update flags */
if(is_intra_only(st->codec))
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
else if (pc) {
pkt->flags = 0;
/* keyframe computation */
if (pc->key_frame == 1)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE)
- pkt->flags |= PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
}
if (pc)
pkt->convergence_duration = pc->convergence_duration;
compute_pkt_fields(s, st, NULL, pkt);
s->cur_st = NULL;
if ((s->iformat->flags & AVFMT_GENERIC_INDEX) &&
- (pkt->flags & PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) {
+ (pkt->flags & AV_PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) {
ff_reduce_index(s, st->index);
av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME);
}
pkt->pts = st->parser->pts;
pkt->dts = st->parser->dts;
pkt->pos = st->parser->pos;
+ if(pkt->data == st->cur_pkt.data && pkt->size == st->cur_pkt.size){
+ s->cur_st = NULL;
+ pkt->destruct= st->cur_pkt.destruct;
+ st->cur_pkt.destruct= NULL;
+ st->cur_pkt.data = NULL;
+ assert(st->cur_len == 0);
+ }else{
pkt->destruct = NULL;
+ }
compute_pkt_fields(s, st, st->parser, pkt);
- if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){
+ if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY){
ff_reduce_index(s, st->index);
av_add_index_entry(st, st->parser->frame_offset, pkt->dts,
0, 0, AVINDEX_KEYFRAME);
s->cur_st = st;
st->cur_ptr = st->cur_pkt.data;
st->cur_len = st->cur_pkt.size;
- if (st->need_parsing && !st->parser) {
+ if (st->need_parsing && !st->parser && !(s->flags & AVFMT_FLAG_NOPARSE)) {
st->parser = av_parser_init(st->codec->codec_id);
if (!st->parser) {
/* no parser available: just output the raw packets */
st->need_parsing = AVSTREAM_PARSE_NONE;
}else if(st->need_parsing == AVSTREAM_PARSE_HEADERS){
st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
- }
- if(st->parser && (s->iformat->flags & AVFMT_GENERIC_INDEX)){
- st->parser->next_frame_offset=
- st->parser->cur_offset= st->cur_pkt.pos;
+ }else if(st->need_parsing == AVSTREAM_PARSE_FULL_ONCE){
+ st->parser->flags |= PARSER_FLAG_ONCE;
}
}
}
AVPacket *next_pkt= &pktl->pkt;
if(genpts && next_pkt->dts != AV_NOPTS_VALUE){
+ int wrap_bits = s->streams[next_pkt->stream_index]->pts_wrap_bits;
while(pktl && next_pkt->pts == AV_NOPTS_VALUE){
if( pktl->pkt.stream_index == next_pkt->stream_index
- && next_pkt->dts < pktl->pkt.dts
- && pktl->pkt.pts != pktl->pkt.dts //not b frame
- /*&& pktl->pkt.dts != AV_NOPTS_VALUE*/){
+ && (0 > av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1)))
+ && av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
next_pkt->pts= pktl->pkt.dts;
}
pktl= pktl->next;
return -1;
for(i = 0; i < s->nb_streams; i++) {
st = s->streams[i];
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
return i;
}
- if (first_audio_index < 0 && st->codec->codec_type == CODEC_TYPE_AUDIO)
+ if (first_audio_index < 0 && st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
first_audio_index = i;
}
return first_audio_index >= 0 ? first_audio_index : 0;
/**
* Flush the frame reader.
*/
-void av_read_frame_flush(AVFormatContext *s)
+void ff_read_frame_flush(AVFormatContext *s)
{
AVStream *st;
int i, j;
a = - 1;
b = nb_entries;
+ //optimize appending index entries at the end
+ if(b && entries[b-1].timestamp < wanted_timestamp)
+ a= b-1;
+
while (b - a > 1) {
m = (a + b) >> 1;
timestamp = entries[m].timestamp;
index = av_index_search_timestamp(st, timestamp, flags);
+ if(index < 0 && st->nb_index_entries && timestamp < st->index_entries[0].timestamp)
+ return -1;
+
if(index < 0 || index==st->nb_index_entries-1){
int i;
AVPacket pkt;
break;
av_free_packet(&pkt);
if(stream_index == pkt.stream_index){
- if((pkt.flags & PKT_FLAG_KEY) && pkt.dts > timestamp)
+ if((pkt.flags & AV_PKT_FLAG_KEY) && pkt.dts > timestamp)
break;
}
}
if (index < 0)
return -1;
- av_read_frame_flush(s);
+ ff_read_frame_flush(s);
if (s->iformat->read_seek){
if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0)
return 0;
int ret;
AVStream *st;
- av_read_frame_flush(s);
+ ff_read_frame_flush(s);
if(flags & AVSEEK_FLAG_BYTE)
return av_seek_frame_byte(s, stream_index, timestamp, flags);
if(min_ts > ts || max_ts < ts)
return -1;
- av_read_frame_flush(s);
+ ff_read_frame_flush(s);
if (s->iformat->read_seek2)
return s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags);
/*******************************************************/
/**
- * Returns TRUE if the stream has accurate duration in any stream.
+ * Return TRUE if the stream has accurate duration in any stream.
*
* @return TRUE if the stream has accurate duration for at least one component.
*/
}
#define DURATION_MAX_READ_SIZE 250000
+#define DURATION_MAX_RETRY 3
/* only usable for MPEG-PS streams */
static void av_estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset)
AVPacket pkt1, *pkt = &pkt1;
AVStream *st;
int read_size, i, ret;
- int64_t end_time;
+ int64_t end_time, start_time[MAX_STREAMS];
int64_t filesize, offset, duration;
+ int retry=0;
ic->cur_st = NULL;
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
+ if(st->start_time != AV_NOPTS_VALUE){
+ start_time[i]= st->start_time;
+ }else if(st->first_dts != AV_NOPTS_VALUE){
+ start_time[i]= st->first_dts;
+ }else
+ av_log(st->codec, AV_LOG_WARNING, "start time is not set in av_estimate_timings_from_pts\n");
+
if (st->parser) {
av_parser_close(st->parser);
st->parser= NULL;
}
}
- /* we read the first packets to get the first PTS (not fully
- accurate, but it is enough now) */
- url_fseek(ic->pb, 0, SEEK_SET);
- read_size = 0;
- 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->start_time == AV_NOPTS_VALUE)
- break;
- }
- if (i == ic->nb_streams)
- break;
-
- do{
- ret = av_read_packet(ic, pkt);
- }while(ret == AVERROR(EAGAIN));
- if (ret != 0)
- break;
- read_size += pkt->size;
- st = ic->streams[pkt->stream_index];
- if (pkt->pts != AV_NOPTS_VALUE) {
- if (st->start_time == AV_NOPTS_VALUE)
- st->start_time = pkt->pts;
- }
- av_free_packet(pkt);
- }
-
/* estimate the end time (duration) */
/* XXX: may need to support wrapping */
filesize = ic->file_size;
- offset = filesize - DURATION_MAX_READ_SIZE;
+ end_time = AV_NOPTS_VALUE;
+ do{
+ offset = filesize - (DURATION_MAX_READ_SIZE<<retry);
if (offset < 0)
offset = 0;
url_fseek(ic->pb, offset, SEEK_SET);
read_size = 0;
for(;;) {
- if (read_size >= DURATION_MAX_READ_SIZE)
+ if (read_size >= DURATION_MAX_READ_SIZE<<(FFMAX(retry-1,0)))
break;
do{
read_size += pkt->size;
st = ic->streams[pkt->stream_index];
if (pkt->pts != AV_NOPTS_VALUE &&
- st->start_time != AV_NOPTS_VALUE) {
+ start_time[pkt->stream_index] != AV_NOPTS_VALUE) {
end_time = pkt->pts;
- duration = end_time - st->start_time;
+ duration = end_time - start_time[pkt->stream_index];
+ if (duration < 0)
+ duration += 1LL<<st->pts_wrap_bits;
if (duration > 0) {
if (st->duration == AV_NOPTS_VALUE ||
st->duration < duration)
}
av_free_packet(pkt);
}
+ }while( end_time==AV_NOPTS_VALUE
+ && filesize > (DURATION_MAX_READ_SIZE<<retry)
+ && ++retry <= DURATION_MAX_RETRY);
fill_all_stream_timings(ic);
{
int val;
switch(enc->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
val = enc->sample_rate && enc->channels && enc->sample_fmt != SAMPLE_FMT_NONE;
if(!enc->frame_size &&
(enc->codec_id == CODEC_ID_VORBIS ||
enc->codec_id == CODEC_ID_AAC ||
+ enc->codec_id == CODEC_ID_MP1 ||
+ enc->codec_id == CODEC_ID_MP2 ||
enc->codec_id == CODEC_ID_MP3 ||
enc->codec_id == CODEC_ID_SPEEX))
return 0;
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
val = enc->width && enc->pix_fmt != PIX_FMT_NONE;
break;
default:
return enc->codec_id != CODEC_ID_NONE && val != 0;
}
+static int has_decode_delay_been_guessed(AVStream *st)
+{
+ return st->codec->codec_id != CODEC_ID_H264 ||
+ st->codec_info_nb_frames >= 4 + st->codec->has_b_frames;
+}
+
static int try_decode_frame(AVStream *st, AVPacket *avpkt)
{
int16_t *samples;
return ret;
}
- if(!has_codec_parameters(st->codec)){
+ if(!has_codec_parameters(st->codec) || !has_decode_delay_been_guessed(st)){
switch(st->codec->codec_type) {
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
avcodec_get_frame_defaults(&picture);
ret = avcodec_decode_video2(st->codec, &picture,
&got_picture, avpkt);
break;
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
data_size = FFMAX(avpkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE);
samples = av_malloc(data_size);
if (!samples)
return ret;
}
-unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id)
+unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id)
{
while (tags->id != CODEC_ID_NONE) {
if (tags->id == id)
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))
+ if (ff_toupper4(tag) == ff_toupper4(tags[i].tag))
return tags[i].id;
}
return CODEC_ID_NONE;
int i, count, ret, read_size, j;
AVStream *st;
AVPacket pkt1, *pkt;
- int64_t last_dts[MAX_STREAMS];
- int64_t duration_gcd[MAX_STREAMS]={0};
- int duration_count[MAX_STREAMS]={0};
- double (*duration_error)[MAX_STD_TIMEBASES];
int64_t old_offset = url_ftell(ic->pb);
- int64_t codec_info_duration[MAX_STREAMS]={0};
- int codec_info_nb_frames[MAX_STREAMS]={0};
-
- duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error));
- if (!duration_error) return AVERROR(ENOMEM);
+ struct {
+ int64_t last_dts;
+ int64_t duration_gcd;
+ int duration_count;
+ double duration_error[MAX_STD_TIMEBASES];
+ int64_t codec_info_duration;
+ } info[MAX_STREAMS] = {{0}};
for(i=0;i<ic->nb_streams;i++) {
+ AVCodec *codec;
st = ic->streams[i];
- if(st->codec->codec_type == CODEC_TYPE_VIDEO){
+ if (st->codec->codec_id == CODEC_ID_AAC) {
+ st->codec->sample_rate = 0;
+ st->codec->frame_size = 0;
+ st->codec->channels = 0;
+ }
+ if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
/* if(!st->time_base.num)
st->time_base= */
if(!st->codec->time_base.num)
st->codec->time_base= st->time_base;
}
//only for the split stuff
- if (!st->parser) {
+ if (!st->parser && !(ic->flags & AVFMT_FLAG_NOPARSE)) {
st->parser = av_parser_init(st->codec->codec_id);
if(st->need_parsing == AVSTREAM_PARSE_HEADERS && st->parser){
st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
}
}
+ assert(!st->codec->codec);
+ codec = avcodec_find_decoder(st->codec->codec_id);
+
+ /* Force decoding of at least one frame of codec data
+ * this makes sure the codec initializes the channel configuration
+ * and does not trust the values from the container.
+ */
+ if (codec && codec->capabilities & CODEC_CAP_CHANNEL_CONF)
+ st->codec->channels = 0;
+
+ //try to just open decoders, in case this is enough to get parameters
+ if(!has_codec_parameters(st->codec)){
+ if (codec)
+ avcodec_open(st->codec, codec);
+ }
}
for(i=0;i<MAX_STREAMS;i++){
- last_dts[i]= AV_NOPTS_VALUE;
+ info[i].last_dts= AV_NOPTS_VALUE;
}
count = 0;
if (!has_codec_parameters(st->codec))
break;
/* variable fps and no guess at the real fps */
- if( tb_unreliable(st->codec)
- && duration_count[i]<20 && st->codec->codec_type == CODEC_TYPE_VIDEO)
+ if( tb_unreliable(st->codec) && !(st->r_frame_rate.num && st->avg_frame_rate.num)
+ && info[i].duration_count<20 && st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
break;
if(st->parser && st->parser->parser->split && !st->codec->extradata)
break;
/* we did not get all the codec info, but we read too much data */
if (read_size >= ic->probesize) {
ret = count;
- av_log(ic, AV_LOG_WARNING, "MAX_READ_SIZE:%d reached\n", ic->probesize);
+ av_log(ic, AV_LOG_DEBUG, "Probe buffer size limit %d reached\n", ic->probesize);
break;
}
pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end);
if(av_dup_packet(pkt) < 0) {
- av_free(duration_error);
return AVERROR(ENOMEM);
}
read_size += pkt->size;
st = ic->streams[pkt->stream_index];
- if(codec_info_nb_frames[st->index]>1) {
- if (st->time_base.den > 0 && av_rescale_q(codec_info_duration[st->index], st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration){
+ if(st->codec_info_nb_frames>1) {
+ if (st->time_base.den > 0 && av_rescale_q(info[st->index].codec_info_duration, st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration){
av_log(ic, AV_LOG_WARNING, "max_analyze_duration reached\n");
break;
}
- codec_info_duration[st->index] += pkt->duration;
+ info[st->index].codec_info_duration += pkt->duration;
}
- if (pkt->duration != 0)
- codec_info_nb_frames[st->index]++;
-
{
int index= pkt->stream_index;
- int64_t last= last_dts[index];
+ int64_t last= info[index].last_dts;
int64_t duration= pkt->dts - last;
if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && duration>0){
double dur= duration * av_q2d(st->time_base);
-// if(st->codec->codec_type == CODEC_TYPE_VIDEO)
+// if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
// av_log(NULL, AV_LOG_ERROR, "%f\n", dur);
- if(duration_count[index] < 2)
- memset(duration_error[index], 0, sizeof(*duration_error));
+ if(info[index].duration_count < 2)
+ memset(info[index].duration_error, 0, sizeof(info[index].duration_error));
for(i=1; i<MAX_STD_TIMEBASES; i++){
int framerate= get_std_framerate(i);
int ticks= lrintf(dur*framerate/(1001*12));
double error= dur - ticks*1001*12/(double)framerate;
- duration_error[index][i] += error*error;
+ info[index].duration_error[i] += error*error;
}
- duration_count[index]++;
+ info[index].duration_count++;
// ignore the first 4 values, they might have some random jitter
- if (duration_count[index] > 3)
- duration_gcd[index] = av_gcd(duration_gcd[index], duration);
+ if (info[index].duration_count > 3)
+ info[index].duration_gcd = av_gcd(info[index].duration_gcd, duration);
}
- if(last == AV_NOPTS_VALUE || duration_count[index]<=1)
- last_dts[pkt->stream_index]= pkt->dts;
+ if(last == AV_NOPTS_VALUE || info[index].duration_count <= 1)
+ info[pkt->stream_index].last_dts = pkt->dts;
}
if(st->parser && st->parser->parser->split && !st->codec->extradata){
int i= st->parser->parser->split(st->codec, pkt->data, pkt->size);
decompress the frame. We try to avoid that in most cases as
it takes longer and uses more memory. For MPEG-4, we need to
decompress for QuickTime. */
- if (!has_codec_parameters(st->codec))
+ if (!has_codec_parameters(st->codec) || !has_decode_delay_been_guessed(st))
try_decode_frame(st, pkt);
+ st->codec_info_nb_frames++;
count++;
}
}
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
- if(codec_info_nb_frames[i]>2)
+ if(st->codec_info_nb_frames>2 && !st->avg_frame_rate.num && info[i].codec_info_duration)
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
- (codec_info_nb_frames[i]-2)*(int64_t)st->time_base.den,
- codec_info_duration[i] *(int64_t)st->time_base.num, 60000);
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+ (st->codec_info_nb_frames-2)*(int64_t)st->time_base.den,
+ info[i].codec_info_duration*(int64_t)st->time_base.num, 60000);
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample)
st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
// the check for tb_unreliable() is not completely correct, since this is not about handling
// a unreliable/inexact time base, but a time base that is finer than necessary, as e.g.
// ipmovie.c produces.
- if (tb_unreliable(st->codec) && duration_count[i] > 15 && duration_gcd[i] > 1)
- av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, st->time_base.den, st->time_base.num * duration_gcd[i], INT_MAX);
- if(duration_count[i]
+ if (tb_unreliable(st->codec) && info[i].duration_count > 15 && info[i].duration_gcd > 1 && !st->r_frame_rate.num)
+ av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, st->time_base.den, st->time_base.num * info[i].duration_gcd, INT_MAX);
+ if(info[i].duration_count && !st->r_frame_rate.num
&& tb_unreliable(st->codec) /*&&
//FIXME we should not special-case MPEG-2, but this needs testing with non-MPEG-2 ...
- st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){
+ st->time_base.num*duration_sum[i]/info[i].duration_count*101LL > st->time_base.den*/){
int num = 0;
double best_error= 2*av_q2d(st->time_base);
- best_error= best_error*best_error*duration_count[i]*1000*12*30;
+ best_error= best_error*best_error*info[i].duration_count*1000*12*30;
for(j=1; j<MAX_STD_TIMEBASES; j++){
- double error= duration_error[i][j] * get_std_framerate(j);
-// if(st->codec->codec_type == CODEC_TYPE_VIDEO)
+ double error= info[i].duration_error[j] * get_std_framerate(j);
+// if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
// av_log(NULL, AV_LOG_ERROR, "%f %f\n", get_std_framerate(j) / 12.0/1001, error);
if(error < best_error){
best_error= error;
st->r_frame_rate.den = st->time_base.num;
}
}
- }else if(st->codec->codec_type == CODEC_TYPE_AUDIO) {
+ }else if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if(!st->codec->bits_per_coded_sample)
st->codec->bits_per_coded_sample= av_get_bits_per_sample(st->codec->codec_id);
}
/* correct DTS for B-frame streams with no timestamps */
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if(b-frames){
ppktl = &ic->packet_buffer;
while(ppkt1){
}
#endif
- av_free(duration_error);
-
return ret;
}
av_free(st->index_entries);
av_free(st->codec->extradata);
av_free(st->codec);
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if FF_API_OLD_METADATA
av_free(st->filename);
#endif
av_free(st->priv_data);
av_free(st);
}
for(i=s->nb_programs-1; i>=0; i--) {
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if FF_API_OLD_METADATA
av_freep(&s->programs[i]->provider_name);
av_freep(&s->programs[i]->name);
#endif
flush_packet_queue(s);
av_freep(&s->priv_data);
while(s->nb_chapters--) {
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if FF_API_OLD_METADATA
av_free(s->chapters[s->nb_chapters]->title);
#endif
av_metadata_free(&s->chapters[s->nb_chapters]->metadata);
}
av_freep(&s->chapters);
av_metadata_free(&s->metadata);
+ av_freep(&s->key);
av_free(s);
}
AVStream *st;
int i;
- if (s->nb_streams >= MAX_STREAMS)
+ if (s->nb_streams >= MAX_STREAMS){
+ av_log(s, AV_LOG_ERROR, "Too many streams\n");
return NULL;
+ }
st = av_mallocz(sizeof(AVStream));
if (!st)
return NULL;
dynarray_add(&s->chapters, &s->nb_chapters, chapter);
}
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if FF_API_OLD_METADATA
av_free(chapter->title);
#endif
- av_metadata_set(&chapter->metadata, "title", title);
+ av_metadata_set2(&chapter->metadata, "title", title, 0);
chapter->id = id;
chapter->time_base= time_base;
chapter->start = start;
return 0;
}
+static int validate_codec_tag(AVFormatContext *s, AVStream *st)
+{
+ const AVCodecTag *avctag;
+ int n;
+ enum CodecID id = CODEC_ID_NONE;
+ unsigned int tag = 0;
+
+ /**
+ * Check that tag + id is in the table
+ * If neither is in the table -> OK
+ * If tag is in the table with another id -> FAIL
+ * If id is in the table with another tag -> FAIL unless strict < normal
+ */
+ for (n = 0; s->oformat->codec_tag[n]; n++) {
+ avctag = s->oformat->codec_tag[n];
+ while (avctag->id != CODEC_ID_NONE) {
+ if (ff_toupper4(avctag->tag) == ff_toupper4(st->codec->codec_tag)) {
+ id = avctag->id;
+ if (id == st->codec->codec_id)
+ return 1;
+ }
+ if (avctag->id == st->codec->codec_id)
+ tag = avctag->tag;
+ avctag++;
+ }
+ }
+ if (id != CODEC_ID_NONE)
+ return 0;
+ if (tag && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
+ return 0;
+ return 1;
+}
+
int av_write_header(AVFormatContext *s)
{
int ret, i;
AVStream *st;
// some sanity checks
+ if (s->nb_streams == 0) {
+ av_log(s, AV_LOG_ERROR, "no streams\n");
+ return AVERROR(EINVAL);
+ }
+
for(i=0;i<s->nb_streams;i++) {
st = s->streams[i];
switch (st->codec->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
if(st->codec->sample_rate<=0){
av_log(s, AV_LOG_ERROR, "sample rate not set\n");
- return -1;
+ return AVERROR(EINVAL);
}
if(!st->codec->block_align)
st->codec->block_align = st->codec->channels *
av_get_bits_per_sample(st->codec->codec_id) >> 3;
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too?
av_log(s, AV_LOG_ERROR, "time base not set\n");
- return -1;
+ return AVERROR(EINVAL);
}
- if(st->codec->width<=0 || st->codec->height<=0){
+ if((st->codec->width<=0 || st->codec->height<=0) && !(s->oformat->flags & AVFMT_NODIMENSIONS)){
av_log(s, AV_LOG_ERROR, "dimensions not set\n");
- return -1;
+ return AVERROR(EINVAL);
}
if(av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)){
av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between encoder and muxer layer\n");
- return -1;
+ return AVERROR(EINVAL);
}
break;
}
if(s->oformat->codec_tag){
+ if(st->codec->codec_tag && st->codec->codec_id == CODEC_ID_RAWVIDEO && av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) == 0 && !validate_codec_tag(s, st)){
+ //the current rawvideo encoding system ends up setting the wrong codec_tag for avi, we override it here
+ st->codec->codec_tag= 0;
+ }
if(st->codec->codec_tag){
- //FIXME
- //check that tag + id is in the table
- //if neither is in the table -> OK
- //if tag is in the table with another id -> FAIL
- //if id is in the table with another tag -> FAIL unless strict < ?
+ if (!validate_codec_tag(s, st)) {
+ char tagbuf[32];
+ av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag);
+ av_log(s, AV_LOG_ERROR,
+ "Tag %s/0x%08x incompatible with output codec id '%d'\n",
+ tagbuf, st->codec->codec_tag, st->codec->codec_id);
+ return AVERROR_INVALIDDATA;
+ }
}else
st->codec->codec_tag= av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id);
}
return AVERROR(ENOMEM);
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_OLD_METADATA
ff_metadata_mux_compat(s);
#endif
+ /* set muxer identification string */
+ if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
+ AVMetadata *m;
+ AVMetadataTag *t;
+
+ if (!(m = av_mallocz(sizeof(AVMetadata))))
+ return AVERROR(ENOMEM);
+ av_metadata_set2(&m, "encoder", LIBAVFORMAT_IDENT, 0);
+ metadata_conv(&m, s->oformat->metadata_conv, NULL);
+ if ((t = av_metadata_get(m, "", NULL, AV_METADATA_IGNORE_SUFFIX)))
+ av_metadata_set2(&s->metadata, t->key, t->value, 0);
+ av_metadata_free(&m);
+ }
+
if(s->oformat->write_header){
ret = s->oformat->write_header(s);
if (ret < 0)
st = s->streams[i];
switch (st->codec->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
den = (int64_t)st->time_base.num * st->codec->sample_rate;
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
den = (int64_t)st->time_base.num * st->codec->time_base.den;
break;
default:
if(pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY){
st->pts_buffer[0]= pkt->pts;
for(i=1; i<delay+1 && st->pts_buffer[i] == AV_NOPTS_VALUE; i++)
- st->pts_buffer[i]= (i-delay-1) * pkt->duration;
+ st->pts_buffer[i]= pkt->pts + (i-delay-1) * pkt->duration;
for(i=0; i<delay && st->pts_buffer[i] > st->pts_buffer[i+1]; i++)
FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
/* update pts */
switch (st->codec->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
frame_size = get_audio_frame_size(st->codec, pkt->size);
/* HACK/FIXME, we skip the initial 0 size packets as they are most
av_frac_add(&st->pts, (int64_t)st->time_base.den * frame_size);
}
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
av_frac_add(&st->pts, (int64_t)st->time_base.den * st->codec->time_base.num);
break;
default:
{
AVStream *st = s->streams[ pkt ->stream_index];
AVStream *st2= s->streams[ next->stream_index];
- int64_t left = st2->time_base.num * (int64_t)st ->time_base.den;
- int64_t right= st ->time_base.num * (int64_t)st2->time_base.den;
-
- if (pkt->dts == AV_NOPTS_VALUE)
- return 0;
-
- return next->dts * left > pkt->dts * right; //FIXME this can overflow
+ int64_t a= st2->time_base.num * (int64_t)st ->time_base.den;
+ int64_t b= st ->time_base.num * (int64_t)st2->time_base.den;
+ return av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN) < next->dts;
}
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){
}
/**
- * Interleaves an AVPacket correctly so it can be muxed.
+ * Interleave an AVPacket correctly so it can be muxed.
* @param out the interleaved packet will be output here
* @param in the input packet
* @param flush 1 if no further packets are available as input and all
AVStream *st= s->streams[ pkt->stream_index];
//FIXME/XXX/HACK drop zero sized packets
- if(st->codec->codec_type == CODEC_TYPE_AUDIO && pkt->size==0)
+ if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->size==0)
return 0;
//av_log(NULL, AV_LOG_DEBUG, "av_interleaved_write_frame %d %"PRId64" %"PRId64"\n", pkt->size, pkt->dts, pkt->pts);
fail:
if(ret == 0)
ret=url_ferror(s->pb);
- for(i=0;i<s->nb_streams;i++)
+ for(i=0;i<s->nb_streams;i++) {
av_freep(&s->streams[i]->priv_data);
+ av_freep(&s->streams[i]->index_entries);
+ }
av_freep(&s->priv_data);
return ret;
}
-void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx)
+void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx)
{
int i, j;
AVProgram *program=NULL;
else av_log(NULL, AV_LOG_INFO, ", %1.0fk %s", d/1000, postfix);
}
+static void dump_metadata(void *ctx, AVMetadata *m, const char *indent)
+{
+ if(m && !(m->count == 1 && av_metadata_get(m, "language", NULL, 0))){
+ AVMetadataTag *tag=NULL;
+
+ av_log(ctx, AV_LOG_INFO, "%sMetadata:\n", indent);
+ while((tag=av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
+ if(strcmp("language", tag->key))
+ av_log(ctx, AV_LOG_INFO, "%s %-16s: %s\n", indent, tag->key, tag->value);
+ }
+ }
+}
+
/* "user interface" functions */
static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
{
av_log(NULL, AV_LOG_INFO, "[0x%x]", st->id);
if (lang)
av_log(NULL, AV_LOG_INFO, "(%s)", lang->value);
- av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g);
+ av_log(NULL, AV_LOG_DEBUG, ", %d, %d/%d", st->codec_info_nb_frames, st->time_base.num/g, st->time_base.den/g);
av_log(NULL, AV_LOG_INFO, ": %s", buf);
if (st->sample_aspect_ratio.num && // default
av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)) {
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
display_aspect_ratio.num, display_aspect_ratio.den);
}
- if(st->codec->codec_type == CODEC_TYPE_VIDEO){
+ if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
if(st->avg_frame_rate.den && st->avg_frame_rate.num)
print_fps(av_q2d(st->avg_frame_rate), "fps");
if(st->r_frame_rate.den && st->r_frame_rate.num)
print_fps(1/av_q2d(st->codec->time_base), "tbc");
}
av_log(NULL, AV_LOG_INFO, "\n");
+ dump_metadata(NULL, st->metadata, " ");
}
void dump_format(AVFormatContext *ic,
index,
is_output ? ic->oformat->name : ic->iformat->name,
is_output ? "to" : "from", url);
+ dump_metadata(NULL, ic->metadata, " ");
if (!is_output) {
av_log(NULL, AV_LOG_INFO, " Duration: ");
if (ic->duration != AV_NOPTS_VALUE) {
int secs, us;
av_log(NULL, AV_LOG_INFO, ", start: ");
secs = ic->start_time / AV_TIME_BASE;
- us = ic->start_time % AV_TIME_BASE;
+ us = abs(ic->start_time % AV_TIME_BASE);
av_log(NULL, AV_LOG_INFO, "%d.%06d",
secs, (int)av_rescale(us, 1000000, AV_TIME_BASE));
}
}
av_log(NULL, AV_LOG_INFO, "\n");
}
+ for (i = 0; i < ic->nb_chapters; i++) {
+ AVChapter *ch = ic->chapters[i];
+ av_log(NULL, AV_LOG_INFO, " Chapter #%d.%d: ", index, i);
+ av_log(NULL, AV_LOG_INFO, "start %f, ", ch->start * av_q2d(ch->time_base));
+ av_log(NULL, AV_LOG_INFO, "end %f\n", ch->end * av_q2d(ch->time_base));
+
+ dump_metadata(NULL, ch->metadata, " ");
+ }
if(ic->nb_programs) {
int j, k, total = 0;
for(j=0; j<ic->nb_programs; j++) {
"name", NULL, 0);
av_log(NULL, AV_LOG_INFO, " Program %d %s\n", ic->programs[j]->id,
name ? name->value : "");
+ dump_metadata(NULL, ic->programs[j]->metadata, " ");
for(k=0; k<ic->programs[j]->nb_stream_indexes; k++) {
dump_stream_format(ic, ic->programs[j]->stream_index[k], index, is_output);
printed[ic->programs[j]->stream_index[k]] = 1;
if (!printed[i])
dump_stream_format(ic, i, index, is_output);
- if (ic->metadata) {
- AVMetadataTag *tag=NULL;
- av_log(NULL, AV_LOG_INFO, " Metadata\n");
- while((tag=av_metadata_get(ic->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
- av_log(NULL, AV_LOG_INFO, " %-16s: %s\n", tag->key, tag->value);
- }
- }
av_free(printed);
}
#if LIBAVFORMAT_VERSION_MAJOR < 53
+#include "libavcore/parseutils.h"
+
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{
- return av_parse_video_frame_size(width_ptr, height_ptr, str);
+ return av_parse_video_size(width_ptr, height_ptr, str);
}
int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
{
AVRational frame_rate;
- int ret = av_parse_video_frame_rate(&frame_rate, arg);
+ int ret = av_parse_video_rate(&frame_rate, arg);
*frame_rate_num= frame_rate.num;
*frame_rate_den= frame_rate.den;
return ret;
return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
}
+uint64_t ff_ntp_time(void)
+{
+ return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
+}
+
int64_t parse_date(const char *datestr, int duration)
{
const char *p;
#undef fprintf
#define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
PRINT("stream #%d:\n", pkt->stream_index);
- PRINT(" keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0));
+ PRINT(" keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));
PRINT(" duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE);
/* DTS is _always_ valid after av_read_frame() */
PRINT(" dts=");
pkt_dump_internal(avcl, NULL, level, pkt, dump_payload);
}
-void url_split(char *proto, int proto_size,
- char *authorization, int authorization_size,
- char *hostname, int hostname_size,
- int *port_ptr,
- char *path, int path_size,
- const char *url)
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+attribute_deprecated
+void ff_url_split(char *proto, int proto_size,
+ char *authorization, int authorization_size,
+ char *hostname, int hostname_size,
+ int *port_ptr,
+ char *path, int path_size,
+ const char *url)
+{
+ av_url_split(proto, proto_size,
+ authorization, authorization_size,
+ hostname, hostname_size,
+ port_ptr,
+ path, path_size,
+ url);
+}
+#endif
+
+void av_url_split(char *proto, int proto_size,
+ char *authorization, int authorization_size,
+ char *hostname, int hostname_size,
+ int *port_ptr,
+ char *path, int path_size,
+ const char *url)
{
const char *p, *ls, *at, *col, *brk;
}
}
-char *ff_data_to_hex(char *buff, const uint8_t *src, int s)
+char *ff_data_to_hex(char *buff, const uint8_t *src, int s, int lowercase)
{
int i;
- static const char hex_table[16] = { '0', '1', '2', '3',
- '4', '5', '6', '7',
- '8', '9', 'A', 'B',
- 'C', 'D', 'E', 'F' };
+ static const char hex_table_uc[16] = { '0', '1', '2', '3',
+ '4', '5', '6', '7',
+ '8', '9', 'A', 'B',
+ 'C', 'D', 'E', 'F' };
+ static const char hex_table_lc[16] = { '0', '1', '2', '3',
+ '4', '5', '6', '7',
+ '8', '9', 'a', 'b',
+ 'c', 'd', 'e', 'f' };
+ const char *hex_table = lowercase ? hex_table_lc : hex_table_uc;
for(i = 0; i < s; i++) {
buff[i * 2] = hex_table[src[i] >> 4];
return buff;
}
+int ff_hex_to_data(uint8_t *data, const char *p)
+{
+ int c, len, v;
+
+ len = 0;
+ v = 1;
+ for (;;) {
+ p += strspn(p, SPACE_CHARS);
+ if (*p == '\0')
+ break;
+ c = toupper((unsigned char) *p++);
+ if (c >= '0' && c <= '9')
+ c = c - '0';
+ else if (c >= 'A' && c <= 'F')
+ c = c - 'A' + 10;
+ else
+ break;
+ v = (v << 4) | c;
+ if (v & 0x100) {
+ if (data)
+ data[len] = v;
+ len++;
+ v = 1;
+ }
+ }
+ return len;
+}
+
void av_set_pts_info(AVStream *s, int pts_wrap_bits,
unsigned int pts_num, unsigned int pts_den)
{
if(!s->time_base.num || !s->time_base.den)
s->time_base.num= s->time_base.den= 0;
}
+
+int ff_url_join(char *str, int size, const char *proto,
+ const char *authorization, const char *hostname,
+ int port, const char *fmt, ...)
+{
+#if CONFIG_NETWORK
+ struct addrinfo hints, *ai;
+#endif
+
+ str[0] = '\0';
+ if (proto)
+ av_strlcatf(str, size, "%s://", proto);
+ if (authorization && authorization[0])
+ av_strlcatf(str, size, "%s@", authorization);
+#if CONFIG_NETWORK && defined(AF_INET6)
+ /* Determine if hostname is a numerical IPv6 address,
+ * properly escape it within [] in that case. */
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_NUMERICHOST;
+ if (!getaddrinfo(hostname, NULL, &hints, &ai)) {
+ if (ai->ai_family == AF_INET6) {
+ av_strlcat(str, "[", size);
+ av_strlcat(str, hostname, size);
+ av_strlcat(str, "]", size);
+ } else {
+ av_strlcat(str, hostname, size);
+ }
+ freeaddrinfo(ai);
+ } else
+#endif
+ /* Not an IPv6 address, just output the plain string. */
+ av_strlcat(str, hostname, size);
+
+ if (port >= 0)
+ av_strlcatf(str, size, ":%d", port);
+ if (fmt) {
+ va_list vl;
+ int len = strlen(str);
+
+ va_start(vl, fmt);
+ vsnprintf(str + len, size > len ? size - len : 0, fmt, vl);
+ va_end(vl);
+ }
+ return strlen(str);
+}
+
+int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
+ AVFormatContext *src)
+{
+ AVPacket local_pkt;
+
+ local_pkt = *pkt;
+ local_pkt.stream_index = dst_stream;
+ if (pkt->pts != AV_NOPTS_VALUE)
+ local_pkt.pts = av_rescale_q(pkt->pts,
+ src->streams[pkt->stream_index]->time_base,
+ dst->streams[dst_stream]->time_base);
+ if (pkt->dts != AV_NOPTS_VALUE)
+ local_pkt.dts = av_rescale_q(pkt->dts,
+ src->streams[pkt->stream_index]->time_base,
+ dst->streams[dst_stream]->time_base);
+ return av_write_frame(dst, &local_pkt);
+}
+
+void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,
+ void *context)
+{
+ const char *ptr = str;
+
+ /* Parse key=value pairs. */
+ for (;;) {
+ const char *key;
+ char *dest = NULL, *dest_end;
+ int key_len, dest_len = 0;
+
+ /* Skip whitespace and potential commas. */
+ while (*ptr && (isspace(*ptr) || *ptr == ','))
+ ptr++;
+ if (!*ptr)
+ break;
+
+ key = ptr;
+
+ if (!(ptr = strchr(key, '=')))
+ break;
+ ptr++;
+ key_len = ptr - key;
+
+ callback_get_buf(context, key, key_len, &dest, &dest_len);
+ dest_end = dest + dest_len - 1;
+
+ if (*ptr == '\"') {
+ ptr++;
+ while (*ptr && *ptr != '\"') {
+ if (*ptr == '\\') {
+ if (!ptr[1])
+ break;
+ if (dest && dest < dest_end)
+ *dest++ = ptr[1];
+ ptr += 2;
+ } else {
+ if (dest && dest < dest_end)
+ *dest++ = *ptr;
+ ptr++;
+ }
+ }
+ if (*ptr == '\"')
+ ptr++;
+ } else {
+ for (; *ptr && !(isspace(*ptr) || *ptr == ','); ptr++)
+ if (dest && dest < dest_end)
+ *dest++ = *ptr;
+ }
+ if (dest)
+ *dest = 0;
+ }
+}
+