* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "avformat.h"
-#include <ctype.h>
-#ifdef CONFIG_WIN32
-#define strcasecmp _stricmp
-#include <sys/types.h>
-#include <sys/timeb.h>
-#elif defined(CONFIG_OS2)
-#include <string.h>
-#define strcasecmp stricmp
-#include <sys/time.h>
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#endif
-#include <time.h>
-#ifndef HAVE_STRPTIME
-#include "strptime.h"
-#endif
+#undef NDEBUG
+#include <assert.h>
AVInputFormat *first_iformat;
AVOutputFormat *first_oformat;
const char *ext, *p;
char ext1[32], *q;
+ if(!filename)
+ return 0;
+
ext = strrchr(filename, '.');
if (ext) {
ext++;
return 0;
}
+/* This is a hack - the packet memory allocation stuff is broken. The
+ packet is allocated if it was not really allocated */
+int av_dup_packet(AVPacket *pkt)
+{
+ if (pkt->destruct != av_destruct_packet) {
+ uint8_t *data;
+ /* we duplicate the packet and don't forget to put the padding
+ again */
+ data = av_malloc(pkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!data) {
+ return AVERROR_NOMEM;
+ }
+ memcpy(data, pkt->data, pkt->size);
+ memset(data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ pkt->data = data;
+ pkt->destruct = av_destruct_packet;
+ }
+ return 0;
+}
+
/* fifo handling */
int fifo_init(FifoBuffer *f, int size)
int filename_number_test(const char *filename)
{
char buf[1024];
+ if(!filename)
+ return -1;
return get_frame_filename(buf, sizeof(buf), filename, 1);
}
/************************************************************/
/* input media file */
+/**
+ * open a media file from an IO stream. 'fmt' must be specified.
+ */
+
+static const char* format_to_name(void* ptr)
+{
+ AVFormatContext* fc = (AVFormatContext*) ptr;
+ if(fc->iformat) return fc->iformat->name;
+ else if(fc->oformat) return fc->oformat->name;
+ else return "NULL";
+}
+
+static const AVClass av_format_context_class = { "AVFormatContext", format_to_name };
+
+AVFormatContext *av_alloc_format_context(void)
+{
+ AVFormatContext *ic;
+ ic = av_mallocz(sizeof(AVFormatContext));
+ if (!ic) return ic;
+ ic->av_class = &av_format_context_class;
+ return ic;
+}
+
+int av_open_input_stream(AVFormatContext **ic_ptr,
+ ByteIOContext *pb, const char *filename,
+ AVInputFormat *fmt, AVFormatParameters *ap)
+{
+ int err;
+ AVFormatContext *ic;
+
+ ic = av_alloc_format_context();
+ if (!ic) {
+ err = AVERROR_NOMEM;
+ goto fail;
+ }
+ ic->iformat = fmt;
+ if (pb)
+ ic->pb = *pb;
+ ic->duration = AV_NOPTS_VALUE;
+ ic->start_time = AV_NOPTS_VALUE;
+ pstrcpy(ic->filename, sizeof(ic->filename), filename);
+
+ /* allocate private data */
+ if (fmt->priv_data_size > 0) {
+ ic->priv_data = av_mallocz(fmt->priv_data_size);
+ if (!ic->priv_data) {
+ err = AVERROR_NOMEM;
+ goto fail;
+ }
+ } else {
+ ic->priv_data = NULL;
+ }
+
+ err = ic->iformat->read_header(ic, ap);
+ if (err < 0)
+ goto fail;
+
+ if (pb)
+ ic->data_offset = url_ftell(&ic->pb);
+
+ *ic_ptr = ic;
+ return 0;
+ fail:
+ if (ic) {
+ av_freep(&ic->priv_data);
+ }
+ av_free(ic);
+ *ic_ptr = NULL;
+ return err;
+}
+
#define PROBE_BUF_SIZE 2048
/**
int buf_size,
AVFormatParameters *ap)
{
- AVFormatContext *ic = NULL;
- int err, must_open_file;
- char buf[PROBE_BUF_SIZE];
+ int err, must_open_file, file_opened;
+ uint8_t buf[PROBE_BUF_SIZE];
AVProbeData probe_data, *pd = &probe_data;
-
- ic = av_mallocz(sizeof(AVFormatContext));
- if (!ic) {
- err = AVERROR_NOMEM;
- goto fail;
- }
- ic->duration = AV_NOPTS_VALUE;
- ic->start_time = AV_NOPTS_VALUE;
- pstrcpy(ic->filename, sizeof(ic->filename), filename);
- pd->filename = ic->filename;
+ ByteIOContext pb1, *pb = &pb1;
+
+ file_opened = 0;
+ pd->filename = "";
+ if (filename)
+ pd->filename = filename;
pd->buf = buf;
pd->buf_size = 0;
/* do not open file if the format does not need it. XXX: specific
hack needed to handle RTSP/TCP */
must_open_file = 1;
- if ((fmt && (fmt->flags & AVFMT_NOFILE))
-#ifdef CONFIG_NETWORK
- || (fmt == &rtp_demux && !strcmp(filename, "null"))
-#endif
- ) {
+ if (fmt && (fmt->flags & AVFMT_NOFILE)) {
must_open_file = 0;
}
if (!fmt || must_open_file) {
/* if no file needed do not try to open one */
- if (url_fopen(&ic->pb, filename, URL_RDONLY) < 0) {
+ if (url_fopen(pb, filename, URL_RDONLY) < 0) {
err = AVERROR_IO;
goto fail;
}
+ file_opened = 1;
if (buf_size > 0) {
- url_setbufsize(&ic->pb, buf_size);
+ url_setbufsize(pb, buf_size);
}
if (!fmt) {
/* read probe data */
- pd->buf_size = get_buffer(&ic->pb, buf, PROBE_BUF_SIZE);
- url_fseek(&ic->pb, 0, SEEK_SET);
+ pd->buf_size = get_buffer(pb, buf, PROBE_BUF_SIZE);
+ url_fseek(pb, 0, SEEK_SET);
}
}
/* if still no format found, error */
if (!fmt) {
err = AVERROR_NOFMT;
- goto fail1;
+ goto fail;
}
/* XXX: suppress this hack for redirectors */
#ifdef CONFIG_NETWORK
if (fmt == &redir_demux) {
- err = redir_open(ic_ptr, &ic->pb);
- url_fclose(&ic->pb);
- av_free(ic);
+ err = redir_open(ic_ptr, pb);
+ url_fclose(pb);
return err;
}
#endif
- ic->iformat = fmt;
-
/* check filename in case of an image number is expected */
- if (ic->iformat->flags & AVFMT_NEEDNUMBER) {
- if (filename_number_test(ic->filename) < 0) {
+ if (fmt->flags & AVFMT_NEEDNUMBER) {
+ if (filename_number_test(filename) < 0) {
err = AVERROR_NUMEXPECTED;
- goto fail1;
+ goto fail;
}
}
-
- /* allocate private data */
- if (fmt->priv_data_size > 0) {
- ic->priv_data = av_mallocz(fmt->priv_data_size);
- if (!ic->priv_data) {
- err = AVERROR_NOMEM;
- goto fail1;
- }
- } else
- ic->priv_data = NULL;
-
- /* default pts settings is MPEG like */
- av_set_pts_info(ic, 33, 1, 90000);
-
- err = ic->iformat->read_header(ic, ap);
- if (err < 0)
- goto fail1;
- *ic_ptr = ic;
+ err = av_open_input_stream(ic_ptr, pb, filename, fmt, ap);
+ if (err)
+ goto fail;
return 0;
- fail1:
- if (!fmt || must_open_file) {
- url_fclose(&ic->pb);
- }
fail:
- if (ic) {
- av_freep(&ic->priv_data);
- }
- av_free(ic);
+ if (file_opened)
+ url_fclose(pb);
*ic_ptr = NULL;
return err;
+
}
+/*******************************************************/
+
/**
- * Read a packet from a media file
+ * Read a transport packet from a media file. This function is
+ * absolete and should never be used. Use av_read_frame() instead.
+ *
* @param s media file handle
* @param pkt is filled
- * @return 0 if OK. AVERROR_xxx if error.
+ * @return 0 if OK. AVERROR_xxx if error.
*/
int av_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ return s->iformat->read_packet(s, pkt);
+}
+
+/**********************************************************/
+
+/* convert the packet time stamp units and handle wrapping. The
+ wrapping is handled by considering the next PTS/DTS as a delta to
+ the previous value. We handle the delta as a fraction to avoid any
+ rounding errors. */
+static inline int64_t convert_timestamp_units(AVStream *s,
+ int64_t *plast_pkt_pts,
+ int *plast_pkt_pts_frac,
+ int64_t *plast_pkt_stream_pts,
+ int64_t pts)
+{
+ int64_t stream_pts;
+ int64_t delta_pts;
+ int shift, pts_frac;
+
+ if (pts != AV_NOPTS_VALUE) {
+ stream_pts = pts;
+ if (*plast_pkt_stream_pts != AV_NOPTS_VALUE) {
+ shift = 64 - s->pts_wrap_bits;
+ delta_pts = ((stream_pts - *plast_pkt_stream_pts) << shift) >> shift;
+ /* XXX: overflow possible but very unlikely as it is a delta */
+ delta_pts = delta_pts * AV_TIME_BASE * s->time_base.num;
+ pts = *plast_pkt_pts + (delta_pts / s->time_base.den);
+ pts_frac = *plast_pkt_pts_frac + (delta_pts % s->time_base.den);
+ if (pts_frac >= s->time_base.den) {
+ pts_frac -= s->time_base.den;
+ pts++;
+ }
+ } else {
+ /* no previous pts, so no wrapping possible */
+// pts = av_rescale(stream_pts, (int64_t)AV_TIME_BASE * s->time_base.num, s->time_base.den);
+ pts = (int64_t)(((double)stream_pts * AV_TIME_BASE * s->time_base.num) /
+ (double)s->time_base.den);
+ pts_frac = 0;
+ }
+ *plast_pkt_stream_pts = stream_pts;
+ *plast_pkt_pts = pts;
+ *plast_pkt_pts_frac = pts_frac;
+ }
+ return pts;
+}
+
+/* get the number of samples of an audio frame. Return (-1) if error */
+static int get_audio_frame_size(AVCodecContext *enc, int size)
+{
+ int frame_size;
+
+ if (enc->frame_size <= 1) {
+ /* specific hack for pcm codecs because no frame size is
+ provided */
+ switch(enc->codec_id) {
+ case CODEC_ID_PCM_S16LE:
+ case CODEC_ID_PCM_S16BE:
+ case CODEC_ID_PCM_U16LE:
+ case CODEC_ID_PCM_U16BE:
+ if (enc->channels == 0)
+ return -1;
+ frame_size = size / (2 * enc->channels);
+ break;
+ case CODEC_ID_PCM_S8:
+ case CODEC_ID_PCM_U8:
+ case CODEC_ID_PCM_MULAW:
+ case CODEC_ID_PCM_ALAW:
+ if (enc->channels == 0)
+ return -1;
+ frame_size = size / (enc->channels);
+ break;
+ default:
+ /* used for example by ADPCM codecs */
+ if (enc->bit_rate == 0)
+ return -1;
+ frame_size = (size * 8 * enc->sample_rate) / enc->bit_rate;
+ break;
+ }
+ } else {
+ frame_size = enc->frame_size;
+ }
+ return frame_size;
+}
+
+
+/* return the frame duration in seconds, return 0 if not available */
+static void compute_frame_duration(int *pnum, int *pden,
+ AVFormatContext *s, AVStream *st,
+ AVCodecParserContext *pc, AVPacket *pkt)
+{
+ int frame_size;
+
+ *pnum = 0;
+ *pden = 0;
+ switch(st->codec.codec_type) {
+ case CODEC_TYPE_VIDEO:
+ *pnum = st->codec.frame_rate_base;
+ *pden = st->codec.frame_rate;
+ if (pc && pc->repeat_pict) {
+ *pden *= 2;
+ *pnum = (*pnum) * (2 + pc->repeat_pict);
+ }
+ break;
+ case CODEC_TYPE_AUDIO:
+ frame_size = get_audio_frame_size(&st->codec, pkt->size);
+ if (frame_size < 0)
+ break;
+ *pnum = frame_size;
+ *pden = st->codec.sample_rate;
+ break;
+ default:
+ break;
+ }
+}
+
+static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
+ AVCodecParserContext *pc, AVPacket *pkt)
+{
+ int num, den, presentation_delayed;
+
+ if (pkt->duration == 0) {
+ compute_frame_duration(&num, &den, s, st, pc, pkt);
+ if (den && num) {
+ pkt->duration = (num * (int64_t)AV_TIME_BASE) / den;
+ }
+ }
+
+ /* do we have a video B frame ? */
+ presentation_delayed = 0;
+ if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
+ /* XXX: need has_b_frame, but cannot get it if the codec is
+ not initialized */
+ if ((st->codec.codec_id == CODEC_ID_MPEG1VIDEO ||
+ st->codec.codec_id == CODEC_ID_MPEG2VIDEO ||
+ st->codec.codec_id == CODEC_ID_MPEG4 ||
+ st->codec.codec_id == CODEC_ID_H264) &&
+ pc && pc->pict_type != FF_B_TYPE)
+ presentation_delayed = 1;
+ }
+
+ /* interpolate PTS and DTS if they are not present */
+ if (presentation_delayed) {
+ /* DTS = decompression time stamp */
+ /* PTS = presentation time stamp */
+ if (pkt->dts == AV_NOPTS_VALUE) {
+ pkt->dts = st->cur_dts;
+ } else {
+ st->cur_dts = pkt->dts;
+ }
+ /* this is tricky: the dts must be incremented by the duration
+ of the frame we are displaying, i.e. the last I or P frame */
+ if (st->last_IP_duration == 0)
+ st->cur_dts += pkt->duration;
+ else
+ st->cur_dts += st->last_IP_duration;
+ st->last_IP_duration = pkt->duration;
+ /* cannot compute PTS if not present (we can compute it only
+ by knowing the futur */
+ } else {
+ /* presentation is not delayed : PTS and DTS are the same */
+ if (pkt->pts == AV_NOPTS_VALUE) {
+ if (pkt->dts == AV_NOPTS_VALUE) {
+ pkt->pts = st->cur_dts;
+ pkt->dts = st->cur_dts;
+ }
+ else {
+ st->cur_dts = pkt->dts;
+ pkt->pts = pkt->dts;
+ }
+ } else {
+ st->cur_dts = pkt->pts;
+ pkt->dts = pkt->pts;
+ }
+ st->cur_dts += pkt->duration;
+ }
+
+ /* update flags */
+ if (pc) {
+ pkt->flags = 0;
+ /* key frame computation */
+ switch(st->codec.codec_type) {
+ case CODEC_TYPE_VIDEO:
+ if (pc->pict_type == FF_I_TYPE)
+ pkt->flags |= PKT_FLAG_KEY;
+ break;
+ case CODEC_TYPE_AUDIO:
+ pkt->flags |= PKT_FLAG_KEY;
+ break;
+ default:
+ break;
+ }
+ }
+
+}
+
+static void av_destruct_packet_nofree(AVPacket *pkt)
+{
+ pkt->data = NULL; pkt->size = 0;
+}
+
+static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+{
+ AVStream *st;
+ int len, ret, i;
+
+ for(;;) {
+ /* select current input stream component */
+ st = s->cur_st;
+ if (st) {
+ if (!st->parser) {
+ /* no parsing needed: we just output the packet as is */
+ /* raw data support */
+ *pkt = s->cur_pkt;
+ compute_pkt_fields(s, st, NULL, pkt);
+ s->cur_st = NULL;
+ return 0;
+ } else if (s->cur_len > 0) {
+ len = av_parser_parse(st->parser, &st->codec, &pkt->data, &pkt->size,
+ s->cur_ptr, s->cur_len,
+ s->cur_pkt.pts, s->cur_pkt.dts);
+ s->cur_pkt.pts = AV_NOPTS_VALUE;
+ s->cur_pkt.dts = AV_NOPTS_VALUE;
+ /* increment read pointer */
+ s->cur_ptr += len;
+ s->cur_len -= len;
+
+ /* return packet if any */
+ if (pkt->size) {
+ got_packet:
+ pkt->duration = 0;
+ pkt->stream_index = st->index;
+ pkt->pts = st->parser->pts;
+ pkt->dts = st->parser->dts;
+ pkt->destruct = av_destruct_packet_nofree;
+ compute_pkt_fields(s, st, st->parser, pkt);
+ return 0;
+ }
+ } else {
+ /* free packet */
+ av_free_packet(&s->cur_pkt);
+ s->cur_st = NULL;
+ }
+ } else {
+ /* read next packet */
+ ret = av_read_packet(s, &s->cur_pkt);
+ if (ret < 0) {
+ if (ret == -EAGAIN)
+ return ret;
+ /* return the last frames, if any */
+ for(i = 0; i < s->nb_streams; i++) {
+ st = s->streams[i];
+ if (st->parser) {
+ av_parser_parse(st->parser, &st->codec,
+ &pkt->data, &pkt->size,
+ NULL, 0,
+ AV_NOPTS_VALUE, AV_NOPTS_VALUE);
+ if (pkt->size)
+ goto got_packet;
+ }
+ }
+ /* no more packets: really terminates parsing */
+ return ret;
+ }
+
+ st = s->streams[s->cur_pkt.stream_index];
+
+ /* convert the packet time stamp units and handle wrapping */
+ s->cur_pkt.pts = convert_timestamp_units(st,
+ &st->last_pkt_pts, &st->last_pkt_pts_frac,
+ &st->last_pkt_stream_pts,
+ s->cur_pkt.pts);
+ s->cur_pkt.dts = convert_timestamp_units(st,
+ &st->last_pkt_dts, &st->last_pkt_dts_frac,
+ &st->last_pkt_stream_dts,
+ s->cur_pkt.dts);
+#if 0
+ if (s->cur_pkt.stream_index == 0) {
+ if (s->cur_pkt.pts != AV_NOPTS_VALUE)
+ printf("PACKET pts=%0.3f\n",
+ (double)s->cur_pkt.pts / AV_TIME_BASE);
+ if (s->cur_pkt.dts != AV_NOPTS_VALUE)
+ printf("PACKET dts=%0.3f\n",
+ (double)s->cur_pkt.dts / AV_TIME_BASE);
+ }
+#endif
+
+ /* duration field */
+ s->cur_pkt.duration = av_rescale(s->cur_pkt.duration, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den);
+
+ s->cur_st = st;
+ s->cur_ptr = s->cur_pkt.data;
+ s->cur_len = s->cur_pkt.size;
+ if (st->need_parsing && !st->parser) {
+ st->parser = av_parser_init(st->codec.codec_id);
+ if (!st->parser) {
+ /* no parser available : just output the raw packets */
+ st->need_parsing = 0;
+ }
+ }
+ }
+ }
+}
+
+/**
+ * Return the next frame of a stream. The returned packet is valid
+ * until the next av_read_frame() or until av_close_input_file() and
+ * must be freed with av_free_packet. For video, the packet contains
+ * exactly one frame. For audio, it contains an integer number of
+ * frames if each frame has a known fixed size (e.g. PCM or ADPCM
+ * data). If the audio frames have a variable size (e.g. MPEG audio),
+ * then it contains one frame.
+ *
+ * pkt->pts, pkt->dts and pkt->duration are always set to correct
+ * values in AV_TIME_BASE unit (and guessed if the format cannot
+ * provided them). pkt->pts can be AV_NOPTS_VALUE if the video format
+ * has B frames, so it is better to rely on pkt->dts if you do not
+ * decompress the payload.
+ *
+ * Return 0 if OK, < 0 if error or end of file.
+ */
+int av_read_frame(AVFormatContext *s, AVPacket *pkt)
{
AVPacketList *pktl;
av_free(pktl);
return 0;
} else {
- return s->iformat->read_packet(s, pkt);
+ return av_read_frame_internal(s, pkt);
+ }
+}
+
+/* XXX: suppress the packet queue */
+static void flush_packet_queue(AVFormatContext *s)
+{
+ AVPacketList *pktl;
+
+ for(;;) {
+ pktl = s->packet_buffer;
+ if (!pktl)
+ break;
+ s->packet_buffer = pktl->next;
+ av_free_packet(&pktl->pkt);
+ av_free(pktl);
+ }
+}
+
+/*******************************************************/
+/* seek support */
+
+int av_find_default_stream_index(AVFormatContext *s)
+{
+ int i;
+ AVStream *st;
+
+ if (s->nb_streams <= 0)
+ return -1;
+ for(i = 0; i < s->nb_streams; i++) {
+ st = s->streams[i];
+ if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
+ return i;
+ }
+ }
+ return 0;
+}
+
+/* flush the frame reader */
+static void av_read_frame_flush(AVFormatContext *s)
+{
+ AVStream *st;
+ int i;
+
+ flush_packet_queue(s);
+
+ /* free previous packet */
+ if (s->cur_st) {
+ if (s->cur_st->parser)
+ av_free_packet(&s->cur_pkt);
+ s->cur_st = NULL;
+ }
+ /* fail safe */
+ s->cur_ptr = NULL;
+ s->cur_len = 0;
+
+ /* for each stream, reset read state */
+ for(i = 0; i < s->nb_streams; i++) {
+ st = s->streams[i];
+
+ if (st->parser) {
+ av_parser_close(st->parser);
+ st->parser = NULL;
+ }
+ st->cur_dts = 0; /* we set the current DTS to an unspecified origin */
}
}
+/* add a index entry into a sorted list updateing if it is already there */
+int av_add_index_entry(AVStream *st,
+ int64_t pos, int64_t timestamp, int distance, int flags)
+{
+ AVIndexEntry *entries, *ie;
+ int index;
+
+ entries = av_fast_realloc(st->index_entries,
+ &st->index_entries_allocated_size,
+ (st->nb_index_entries + 1) *
+ sizeof(AVIndexEntry));
+ st->index_entries= entries;
+
+ if(st->nb_index_entries){
+ index= av_index_search_timestamp(st, timestamp);
+ ie= &entries[index];
+
+ if(ie->timestamp != timestamp){
+ if(ie->timestamp < timestamp){
+ index++; //index points to next instead of previous entry, maybe nonexistant
+ ie= &st->index_entries[index];
+ }else
+ assert(index==0);
+
+ if(index != st->nb_index_entries){
+ assert(index < st->nb_index_entries);
+ memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(st->nb_index_entries - index));
+ }
+ st->nb_index_entries++;
+ }else{
+ if(ie->pos == pos && distance < ie->min_distance) //dont reduce the distance
+ distance= ie->min_distance;
+ }
+ }else{
+ index= st->nb_index_entries++;
+ ie= &entries[index];
+ }
+
+ ie->pos = pos;
+ ie->timestamp = timestamp;
+ ie->min_distance= distance;
+ ie->flags = flags;
+
+ return index;
+}
+
+/* build an index for raw streams using a parser */
+static void av_build_index_raw(AVFormatContext *s)
+{
+ AVPacket pkt1, *pkt = &pkt1;
+ int ret;
+ AVStream *st;
+
+ st = s->streams[0];
+ av_read_frame_flush(s);
+ url_fseek(&s->pb, s->data_offset, SEEK_SET);
+
+ for(;;) {
+ ret = av_read_frame(s, pkt);
+ if (ret < 0)
+ break;
+ if (pkt->stream_index == 0 && st->parser &&
+ (pkt->flags & PKT_FLAG_KEY)) {
+ av_add_index_entry(st, st->parser->frame_offset, pkt->dts,
+ 0, AVINDEX_KEYFRAME);
+ }
+ av_free_packet(pkt);
+ }
+}
+
+/* return TRUE if we deal with a raw stream (raw codec data and
+ parsing needed) */
+static int is_raw_stream(AVFormatContext *s)
+{
+ AVStream *st;
+
+ if (s->nb_streams != 1)
+ return 0;
+ st = s->streams[0];
+ if (!st->need_parsing)
+ return 0;
+ return 1;
+}
+
+/* return the largest index entry whose timestamp is <=
+ wanted_timestamp */
+int av_index_search_timestamp(AVStream *st, int wanted_timestamp)
+{
+ AVIndexEntry *entries= st->index_entries;
+ int nb_entries= st->nb_index_entries;
+ int a, b, m;
+ int64_t timestamp;
+
+ if (nb_entries <= 0)
+ return -1;
+
+ a = 0;
+ b = nb_entries - 1;
+
+ while (a < b) {
+ m = (a + b + 1) >> 1;
+ timestamp = entries[m].timestamp;
+ if (timestamp > wanted_timestamp) {
+ b = m - 1;
+ } else {
+ a = m;
+ }
+ }
+ return a;
+}
+
+#define DEBUG_SEEK
+
+int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts){
+ AVInputFormat *avif= s->iformat;
+ int64_t pos_min, pos_max, pos, pos_limit;
+ int64_t ts_min, ts_max, ts;
+ int64_t start_pos;
+ int index, no_change;
+ AVStream *st;
+
+ if (stream_index < 0) {
+ stream_index = av_find_default_stream_index(s);
+ if (stream_index < 0)
+ return -1;
+ }
+
+#ifdef DEBUG_SEEK
+ av_log(s, AV_LOG_DEBUG, "read_seek: %d %lld\n", stream_index, target_ts);
+#endif
+
+ ts_max=
+ ts_min= AV_NOPTS_VALUE;
+ pos_limit= -1; //gcc falsely says it may be uninitalized
+
+ st= s->streams[stream_index];
+ if(st->index_entries){
+ AVIndexEntry *e;
+
+ index= av_index_search_timestamp(st, target_ts);
+ e= &st->index_entries[index];
+
+ if(e->timestamp <= target_ts || e->pos == e->min_distance){
+ pos_min= e->pos;
+ ts_min= e->timestamp;
+#ifdef DEBUG_SEEK
+ av_log(s, AV_LOG_DEBUG, "unsing cached pos_min=0x%llx dts_min=%lld\n",
+ pos_min,ts_min);
+#endif
+ }else{
+ assert(index==0);
+ }
+ index++;
+ if(index < st->nb_index_entries){
+ e= &st->index_entries[index];
+ assert(e->timestamp >= target_ts);
+ pos_max= e->pos;
+ ts_max= e->timestamp;
+ pos_limit= pos_max - e->min_distance;
+#ifdef DEBUG_SEEK
+ av_log(s, AV_LOG_DEBUG, "unsing cached pos_max=0x%llx pos_limit=0x%llx dts_max=%lld\n",
+ pos_max,pos_limit, ts_max);
+#endif
+ }
+ }
+
+ if(ts_min == AV_NOPTS_VALUE){
+ pos_min = s->data_offset;
+ ts_min = avif->read_timestamp(s, stream_index, &pos_min, INT64_MAX);
+ if (ts_min == AV_NOPTS_VALUE)
+ return -1;
+ }
+
+ if(ts_max == AV_NOPTS_VALUE){
+ int step= 1024;
+ pos_max = url_filesize(url_fileno(&s->pb)) - 1;
+ do{
+ pos_max -= step;
+ ts_max = avif->read_timestamp(s, stream_index, &pos_max, pos_max + step);
+ step += step;
+ }while(ts_max == AV_NOPTS_VALUE && pos_max >= step);
+ if (ts_max == AV_NOPTS_VALUE)
+ return -1;
+
+ for(;;){
+ int64_t tmp_pos= pos_max + 1;
+ int64_t tmp_ts= avif->read_timestamp(s, stream_index, &tmp_pos, INT64_MAX);
+ if(tmp_ts == AV_NOPTS_VALUE)
+ break;
+ ts_max= tmp_ts;
+ pos_max= tmp_pos;
+ }
+ pos_limit= pos_max;
+ }
+
+ no_change=0;
+ while (pos_min < pos_limit) {
+#ifdef DEBUG_SEEK
+ av_log(s, AV_LOG_DEBUG, "pos_min=0x%llx pos_max=0x%llx dts_min=%lld dts_max=%lld\n",
+ pos_min, pos_max,
+ ts_min, ts_max);
+#endif
+ assert(pos_limit <= pos_max);
+
+ if(no_change==0){
+ int64_t approximate_keyframe_distance= pos_max - pos_limit;
+ // interpolate position (better than dichotomy)
+ pos = (int64_t)((double)(pos_max - pos_min) *
+ (double)(target_ts - ts_min) /
+ (double)(ts_max - ts_min)) + pos_min - approximate_keyframe_distance;
+ }else if(no_change==1){
+ // bisection, if interpolation failed to change min or max pos last time
+ pos = (pos_min + pos_limit)>>1;
+ }else{
+ // linear search if bisection failed, can only happen if there are very few or no keframes between min/max
+ pos=pos_min;
+ }
+ if(pos <= pos_min)
+ pos= pos_min + 1;
+ else if(pos > pos_limit)
+ pos= pos_limit;
+ start_pos= pos;
+
+ ts = avif->read_timestamp(s, stream_index, &pos, INT64_MAX); //may pass pos_limit instead of -1
+ if(pos == pos_max)
+ no_change++;
+ else
+ no_change=0;
+#ifdef DEBUG_SEEK
+av_log(s, AV_LOG_DEBUG, "%Ld %Ld %Ld / %Ld %Ld %Ld target:%Ld limit:%Ld start:%Ld noc:%d\n", pos_min, pos, pos_max, ts_min, ts, ts_max, target_ts, pos_limit, start_pos, no_change);
+#endif
+ assert(ts != AV_NOPTS_VALUE);
+ if (target_ts < ts) {
+ pos_limit = start_pos - 1;
+ pos_max = pos;
+ ts_max = ts;
+ } else {
+ pos_min = pos;
+ ts_min = ts;
+ /* check if we are lucky */
+ if (target_ts == ts)
+ break;
+ }
+ }
+
+ pos = pos_min;
+#ifdef DEBUG_SEEK
+ pos_min = pos;
+ ts_min = avif->read_timestamp(s, stream_index, &pos_min, INT64_MAX);
+ pos_min++;
+ ts_max = avif->read_timestamp(s, stream_index, &pos_min, INT64_MAX);
+ av_log(s, AV_LOG_DEBUG, "pos=0x%llx %lld<=%lld<=%lld\n",
+ pos, ts_min, target_ts, ts_max);
+#endif
+ /* do the seek */
+ url_fseek(&s->pb, pos, SEEK_SET);
+ st->cur_dts = ts_min;
+
+ return 0;
+}
+
+static int av_seek_frame_generic(AVFormatContext *s,
+ int stream_index, int64_t timestamp)
+{
+ int index;
+ AVStream *st;
+ AVIndexEntry *ie;
+
+ if (!s->index_built) {
+ if (is_raw_stream(s)) {
+ av_build_index_raw(s);
+ } else {
+ return -1;
+ }
+ s->index_built = 1;
+ }
+
+ if (stream_index < 0)
+ stream_index = 0;
+ st = s->streams[stream_index];
+ index = av_index_search_timestamp(st, timestamp);
+ if (index < 0)
+ return -1;
+
+ /* now we have found the index, we can seek */
+ ie = &st->index_entries[index];
+ av_read_frame_flush(s);
+ url_fseek(&s->pb, ie->pos, SEEK_SET);
+ st->cur_dts = ie->timestamp;
+ return 0;
+}
+
+/**
+ * Seek to the key frame just before the frame at timestamp
+ * 'timestamp' in 'stream_index'. If stream_index is (-1), a default
+ * stream is selected
+ */
+int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp)
+{
+ int ret;
+
+ av_read_frame_flush(s);
+
+ /* first, we try the format specific seek */
+ if (s->iformat->read_seek)
+ ret = s->iformat->read_seek(s, stream_index, timestamp);
+ else
+ ret = -1;
+ if (ret >= 0) {
+ return 0;
+ }
+
+ if(s->iformat->read_timestamp)
+ return av_seek_frame_binary(s, stream_index, timestamp);
+ else
+ return av_seek_frame_generic(s, stream_index, timestamp);
+}
+
+/*******************************************************/
/* return TRUE if the stream has accurate timings for at least one component */
static int av_has_timings(AVFormatContext *ic)
}
}
-static void flush_packet_queue(AVFormatContext *s)
-{
- AVPacketList *pktl;
-
- for(;;) {
- pktl = s->packet_buffer;
- if (!pktl)
- break;
- s->packet_buffer = pktl->next;
- av_free(pktl);
- }
-}
-
#define DURATION_MAX_READ_SIZE 250000
/* only usable for MPEG-PS streams */
int64_t start_time, end_time, end_time1;
int64_t filesize, offset, duration;
+ /* free previous packet */
+ if (ic->cur_st && ic->cur_st->parser)
+ av_free_packet(&ic->cur_pkt);
+ ic->cur_st = NULL;
+
+ /* flush packet queue */
+ flush_packet_queue(ic);
+
+
/* 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);
st = ic->streams[pkt->stream_index];
if (pkt->pts != AV_NOPTS_VALUE) {
if (st->start_time == AV_NOPTS_VALUE)
- st->start_time = (int64_t)((double)pkt->pts * ic->pts_num * (double)AV_TIME_BASE / ic->pts_den);
- }
- av_free_packet(pkt);
- }
+ st->start_time = av_rescale(pkt->pts, st->time_base.num * (int64_t)AV_TIME_BASE, st->time_base.den);
+ }
+ av_free_packet(pkt);
+ }
/* we compute the minimum start_time and use it as default */
start_time = MAXINT64;
st->start_time < start_time)
start_time = st->start_time;
}
- fprintf(stderr, "start=%lld\n", start_time);
if (start_time != MAXINT64)
ic->start_time = start_time;
if (offset < 0)
offset = 0;
- /* flush packet queue */
- flush_packet_queue(ic);
-
url_fseek(&ic->pb, offset, SEEK_SET);
read_size = 0;
for(;;) {
read_size += pkt->size;
st = ic->streams[pkt->stream_index];
if (pkt->pts != AV_NOPTS_VALUE) {
- end_time = (int64_t)((double)pkt->pts * ic->pts_num * (double)AV_TIME_BASE / ic->pts_den);
+ end_time = av_rescale(pkt->pts, st->time_base.num * (int64_t)AV_TIME_BASE, st->time_base.den);
duration = end_time - st->start_time;
if (duration > 0) {
if (st->duration == AV_NOPTS_VALUE ||
#endif
}
-/* state for codec information */
-#define CSTATE_NOTFOUND 0
-#define CSTATE_DECODING 1
-#define CSTATE_FOUND 2
-
static int has_codec_parameters(AVCodecContext *enc)
{
int val;
return (val != 0);
}
+static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
+{
+ int16_t *samples;
+ AVCodec *codec;
+ int got_picture, ret;
+ AVFrame picture;
+
+ codec = avcodec_find_decoder(st->codec.codec_id);
+ if (!codec)
+ return -1;
+ ret = avcodec_open(&st->codec, codec);
+ if (ret < 0)
+ return ret;
+ switch(st->codec.codec_type) {
+ case CODEC_TYPE_VIDEO:
+ ret = avcodec_decode_video(&st->codec, &picture,
+ &got_picture, (uint8_t *)data, size);
+ break;
+ case CODEC_TYPE_AUDIO:
+ samples = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ if (!samples)
+ goto fail;
+ ret = avcodec_decode_audio(&st->codec, samples,
+ &got_picture, (uint8_t *)data, size);
+ av_free(samples);
+ break;
+ default:
+ break;
+ }
+ fail:
+ avcodec_close(&st->codec);
+ return ret;
+}
+
+/* absolute maximum size we read until we abort */
+#define MAX_READ_SIZE 5000000
+
+/* maximum duration until we stop analysing the stream */
+#define MAX_STREAM_DURATION ((int)(AV_TIME_BASE * 1.0))
+
/**
* Read the beginning of a media file to get stream information. This
* is useful for file formats with no headers such as MPEG. This
*/
int av_find_stream_info(AVFormatContext *ic)
{
- int i, count, ret, got_picture, size, read_size;
- AVCodec *codec;
+ int i, count, ret, read_size;
AVStream *st;
- AVPacket *pkt;
- AVFrame picture;
+ AVPacket pkt1, *pkt;
AVPacketList *pktl=NULL, **ppktl;
- short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
- uint8_t *ptr;
- int min_read_size, max_read_size;
-
- /* typical mpeg ts rate is 40 Mbits. DVD rate is about 10
- Mbits. We read at most 0.2 second of file to find all streams */
-
- /* XXX: base it on stream bitrate when possible */
- if (ic->iformat == &mpegts_demux) {
- /* maximum number of bytes we accept to read to find all the streams
- in a file */
- min_read_size = 6000000;
- } else {
- min_read_size = 250000;
- }
- /* max read size is 2 seconds of video max */
- max_read_size = min_read_size * 10;
-
- /* set initial codec state */
- for(i=0;i<ic->nb_streams;i++) {
- st = ic->streams[i];
- if (has_codec_parameters(&st->codec))
- st->codec_info_state = CSTATE_FOUND;
- else
- st->codec_info_state = CSTATE_NOTFOUND;
- st->codec_info_nb_repeat_frames = 0;
- st->codec_info_nb_real_frames = 0;
- }
count = 0;
read_size = 0;
/* check if one codec still needs to be handled */
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
- if (st->codec_info_state != CSTATE_FOUND)
+ if (!has_codec_parameters(&st->codec))
break;
}
if (i == ic->nb_streams) {
/* NOTE: if the format has no header, then we need to read
some packets to get most of the streams, so we cannot
stop here */
- if (!(ic->iformat->flags & AVFMT_NOHEADER) ||
- read_size >= min_read_size) {
+ if (!(ic->ctx_flags & AVFMTCTX_NOHEADER)) {
/* if we found the info for all the codecs, we can stop */
ret = count;
break;
}
} else {
/* we did not get all the codec info, but we read too much data */
- if (read_size >= max_read_size) {
+ if (read_size >= MAX_READ_SIZE) {
ret = count;
break;
}
}
+ /* NOTE: a new stream can be added there if no header in file
+ (AVFMTCTX_NOHEADER) */
+ ret = av_read_frame_internal(ic, &pkt1);
+ if (ret < 0) {
+ /* EOF or error */
+ ret = -1; /* we could not have all the codec parameters before EOF */
+ if ((ic->ctx_flags & AVFMTCTX_NOHEADER) &&
+ i == ic->nb_streams)
+ ret = 0;
+ break;
+ }
+
pktl = av_mallocz(sizeof(AVPacketList));
if (!pktl) {
ret = AVERROR_NOMEM;
*ppktl = pktl;
ppktl = &pktl->next;
- /* NOTE: a new stream can be added there if no header in file
- (AVFMT_NOHEADER) */
pkt = &pktl->pkt;
- if (ic->iformat->read_packet(ic, pkt) < 0) {
- /* EOF or error */
- ret = -1; /* we could not have all the codec parameters before EOF */
- if ((ic->iformat->flags & AVFMT_NOHEADER) &&
- i == ic->nb_streams)
- ret = 0;
- break;
+ *pkt = pkt1;
+
+ /* duplicate the packet */
+ if (av_dup_packet(pkt) < 0) {
+ ret = AVERROR_NOMEM;
+ break;
}
- read_size += pkt->size;
- /* open new codecs */
- for(i=0;i<ic->nb_streams;i++) {
- st = ic->streams[i];
- if (st->codec_info_state == CSTATE_NOTFOUND) {
- /* set to found in case of error */
- st->codec_info_state = CSTATE_FOUND;
- codec = avcodec_find_decoder(st->codec.codec_id);
- if (codec) {
- if(codec->capabilities & CODEC_CAP_TRUNCATED)
- st->codec.flags |= CODEC_FLAG_TRUNCATED;
-
- ret = avcodec_open(&st->codec, codec);
- if (ret >= 0)
- st->codec_info_state = CSTATE_DECODING;
- }
- }
- }
+ read_size += pkt->size;
st = ic->streams[pkt->stream_index];
- if (st->codec_info_state == CSTATE_DECODING) {
- /* decode the data and update codec parameters */
- ptr = pkt->data;
- size = pkt->size;
- while (size > 0) {
- switch(st->codec.codec_type) {
- case CODEC_TYPE_VIDEO:
- ret = avcodec_decode_video(&st->codec, &picture,
- &got_picture, ptr, size);
- break;
- case CODEC_TYPE_AUDIO:
- ret = avcodec_decode_audio(&st->codec, samples,
- &got_picture, ptr, size);
- break;
- default:
- ret = -1;
- break;
- }
- if (ret < 0) {
- /* if error, simply ignore because another packet
- may be OK */
- break;
- }
- if (got_picture) {
- /* we got the parameters - now we can stop
- examining this stream */
- /* XXX: add a codec info so that we can decide if
- the codec can repeat frames */
- if (st->codec.codec_id == CODEC_ID_MPEG1VIDEO &&
- ic->iformat != &mpegts_demux &&
- st->codec.sub_id == 2) {
- /* for mpeg2 video, we want to know the real
- frame rate, so we decode 40 frames. In mpeg
- TS case we do not do it because it would be
- too long */
- st->codec_info_nb_real_frames++;
- st->codec_info_nb_repeat_frames += st->codec.coded_frame->repeat_pict;
-#if 0
- /* XXX: testing */
- if ((st->codec_info_nb_real_frames % 24) == 23) {
- st->codec_info_nb_repeat_frames += 2;
- }
-#endif
- /* stop after 40 frames */
- if (st->codec_info_nb_real_frames >= 40) {
- av_reduce(
- &st->r_frame_rate,
- &st->r_frame_rate_base,
- (int64_t)st->codec.frame_rate * st->codec_info_nb_real_frames,
- (st->codec_info_nb_real_frames + (st->codec_info_nb_repeat_frames >> 1)) * st->codec.frame_rate_base,
- 1<<30);
- goto close_codec;
- }
- } else {
- close_codec:
- st->codec_info_state = CSTATE_FOUND;
- avcodec_close(&st->codec);
- break;
- }
- }
- ptr += ret;
- size -= ret;
- }
+ st->codec_info_duration += pkt->duration;
+ if (pkt->duration != 0)
+ st->codec_info_nb_frames++;
+
+ /* if still no information, we try to open the codec and to
+ decompress the frame. We try to avoid that in most cases as
+ it takes longer and uses more memory. For MPEG4, we need to
+ decompress for Quicktime. */
+ if (!has_codec_parameters(&st->codec) &&
+ (st->codec.codec_id == CODEC_ID_FLV1 ||
+ st->codec.codec_id == CODEC_ID_H264 ||
+ st->codec.codec_id == CODEC_ID_H263 ||
+ st->codec.codec_id == CODEC_ID_VORBIS ||
+ (st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing)))
+ try_decode_frame(st, pkt->data, pkt->size);
+
+ if (st->codec_info_duration >= MAX_STREAM_DURATION) {
+ break;
}
count++;
}
- /* close each codec if there are opened */
- for(i=0;i<ic->nb_streams;i++) {
- st = ic->streams[i];
- if (st->codec_info_state == CSTATE_DECODING)
- avcodec_close(&st->codec);
- }
-
/* set real frame rate info */
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
+ /* compute the real frame rate for telecine */
+ if ((st->codec.codec_id == CODEC_ID_MPEG1VIDEO ||
+ st->codec.codec_id == CODEC_ID_MPEG2VIDEO) &&
+ st->codec.sub_id == 2) {
+ if (st->codec_info_nb_frames >= 20) {
+ float coded_frame_rate, est_frame_rate;
+ est_frame_rate = ((double)st->codec_info_nb_frames * AV_TIME_BASE) /
+ (double)st->codec_info_duration ;
+ coded_frame_rate = (double)st->codec.frame_rate /
+ (double)st->codec.frame_rate_base;
+#if 0
+ printf("telecine: coded_frame_rate=%0.3f est_frame_rate=%0.3f\n",
+ coded_frame_rate, est_frame_rate);
+#endif
+ /* if we detect that it could be a telecine, we
+ signal it. It would be better to do it at a
+ higher level as it can change in a film */
+ if (coded_frame_rate >= 24.97 &&
+ (est_frame_rate >= 23.5 && est_frame_rate < 24.5)) {
+ st->r_frame_rate = 24024;
+ st->r_frame_rate_base = 1001;
+ }
+ }
+ }
+ /* if no real frame rate, use the codec one */
if (!st->r_frame_rate){
st->r_frame_rate = st->codec.frame_rate;
st->r_frame_rate_base = st->codec.frame_rate_base;
}
}
-
av_estimate_timings(ic);
return ret;
}
+/*******************************************************/
+
+/**
+ * start playing a network based stream (e.g. RTSP stream) at the
+ * current position
+ */
+int av_read_play(AVFormatContext *s)
+{
+ if (!s->iformat->read_play)
+ return AVERROR_NOTSUPP;
+ return s->iformat->read_play(s);
+}
+
+/**
+ * pause a network based stream (e.g. RTSP stream). Use av_read_play()
+ * to resume it.
+ */
+int av_read_pause(AVFormatContext *s)
+{
+ if (!s->iformat->read_pause)
+ return AVERROR_NOTSUPP;
+ return s->iformat->read_pause(s);
+}
+
/**
* Close a media file (but not its codecs)
*
void av_close_input_file(AVFormatContext *s)
{
int i, must_open_file;
+ AVStream *st;
+
+ /* free previous packet */
+ if (s->cur_st && s->cur_st->parser)
+ av_free_packet(&s->cur_pkt);
if (s->iformat->read_close)
s->iformat->read_close(s);
for(i=0;i<s->nb_streams;i++) {
- av_free(s->streams[i]);
- }
- if (s->packet_buffer) {
- AVPacketList *p, *p1;
- p = s->packet_buffer;
- while (p != NULL) {
- p1 = p->next;
- av_free_packet(&p->pkt);
- av_free(p);
- p = p1;
+ /* free all data in a stream component */
+ st = s->streams[i];
+ if (st->parser) {
+ av_parser_close(st->parser);
}
- s->packet_buffer = NULL;
+ av_free(st->index_entries);
+ av_free(st);
}
+ flush_packet_queue(s);
must_open_file = 1;
- if ((s->iformat->flags & AVFMT_NOFILE)
-#ifdef CONFIG_NETWORK
- || (s->iformat == &rtp_demux && !strcmp(s->filename, "null"))
-#endif
- ) {
+ if (s->iformat->flags & AVFMT_NOFILE) {
must_open_file = 0;
}
if (must_open_file) {
/**
* Add a new stream to a media file. Can only be called in the
- * read_header function. If the flag AVFMT_NOHEADER is in the format
- * description, then new streams can be added in read_packet too.
+ * read_header function. If the flag AVFMTCTX_NOHEADER is in the
+ * format context, then new streams can be added in read_packet too.
*
*
* @param s media file handle
- * @param id file format dependent stream id
+ * @param id file format dependent stream id
*/
AVStream *av_new_stream(AVFormatContext *s, int id)
{
st->id = id;
st->start_time = AV_NOPTS_VALUE;
st->duration = AV_NOPTS_VALUE;
+
+ /* default pts settings is MPEG like */
+ av_set_pts_info(st, 33, 1, 90000);
+ st->last_pkt_pts = AV_NOPTS_VALUE;
+ st->last_pkt_dts = AV_NOPTS_VALUE;
+ st->last_pkt_stream_pts = AV_NOPTS_VALUE;
+ st->last_pkt_stream_dts = AV_NOPTS_VALUE;
+
s->streams[s->nb_streams++] = st;
return st;
}
int ret, i;
AVStream *st;
- /* default pts settings is MPEG like */
- av_set_pts_info(s, 33, 1, 90000);
ret = s->oformat->write_header(s);
if (ret < 0)
return ret;
switch (st->codec.codec_type) {
case CODEC_TYPE_AUDIO:
av_frac_init(&st->pts, 0, 0,
- (int64_t)s->pts_num * st->codec.sample_rate);
+ (int64_t)st->time_base.num * st->codec.sample_rate);
break;
case CODEC_TYPE_VIDEO:
av_frac_init(&st->pts, 0, 0,
- (int64_t)s->pts_num * st->codec.frame_rate);
+ (int64_t)st->time_base.num * st->codec.frame_rate);
break;
default:
break;
int ret, frame_size;
st = s->streams[stream_index];
- pts_mask = (1LL << s->pts_wrap_bits) - 1;
- ret = s->oformat->write_packet(s, stream_index, (uint8_t *)buf, size,
- st->pts.val & pts_mask);
+ pts_mask = (1LL << st->pts_wrap_bits) - 1;
+
+ /* HACK/FIXME we skip all zero size audio packets so a encoder can pass pts by outputing zero size packets */
+ if(st->codec.codec_type==CODEC_TYPE_AUDIO && size==0)
+ ret = 0;
+ else
+ ret = s->oformat->write_packet(s, stream_index, buf, size,
+ st->pts.val & pts_mask);
+
if (ret < 0)
return ret;
/* update pts */
switch (st->codec.codec_type) {
case CODEC_TYPE_AUDIO:
- if (st->codec.frame_size <= 1) {
- frame_size = size / st->codec.channels;
- /* specific hack for pcm codecs because no frame size is provided */
- switch(st->codec.codec_id) {
- case CODEC_ID_PCM_S16LE:
- case CODEC_ID_PCM_S16BE:
- case CODEC_ID_PCM_U16LE:
- case CODEC_ID_PCM_U16BE:
- frame_size >>= 1;
- break;
- default:
- break;
- }
- } else {
- frame_size = st->codec.frame_size;
+ frame_size = get_audio_frame_size(&st->codec, size);
+
+ /* HACK/FIXME, we skip the initial 0-size packets as they are most likely equal to the encoder delay,
+ but it would be better if we had the real timestamps from the encoder */
+ if (frame_size >= 0 && (size || st->pts.num!=st->pts.den>>1 || st->pts.val)) {
+ av_frac_add(&st->pts, (int64_t)st->time_base.den * frame_size);
}
- av_frac_add(&st->pts,
- (int64_t)s->pts_den * frame_size);
break;
case CODEC_TYPE_VIDEO:
- av_frac_add(&st->pts,
- (int64_t)s->pts_den * st->codec.frame_rate_base);
+ av_frac_add(&st->pts, (int64_t)st->time_base.den * st->codec.frame_rate_base);
break;
default:
break;
int i, flags;
char buf[256];
- fprintf(stderr, "%s #%d, %s, %s '%s':\n",
+ av_log(NULL, AV_LOG_DEBUG, "%s #%d, %s, %s '%s':\n",
is_output ? "Output" : "Input",
index,
is_output ? ic->oformat->name : ic->iformat->name,
is_output ? "to" : "from", url);
if (!is_output) {
- fprintf(stderr, " Duration: ");
+ av_log(NULL, AV_LOG_DEBUG, " Duration: ");
if (ic->duration != AV_NOPTS_VALUE) {
int hours, mins, secs, us;
secs = ic->duration / AV_TIME_BASE;
secs %= 60;
hours = mins / 60;
mins %= 60;
- fprintf(stderr, "%02d:%02d:%02d.%01d", hours, mins, secs,
+ av_log(NULL, AV_LOG_DEBUG, "%02d:%02d:%02d.%01d", hours, mins, secs,
(10 * us) / AV_TIME_BASE);
} else {
- fprintf(stderr, "N/A");
+ av_log(NULL, AV_LOG_DEBUG, "N/A");
}
- fprintf(stderr, ", bitrate: ");
+ av_log(NULL, AV_LOG_DEBUG, ", bitrate: ");
if (ic->bit_rate) {
- fprintf(stderr,"%d kb/s", ic->bit_rate / 1000);
+ av_log(NULL, AV_LOG_DEBUG,"%d kb/s", ic->bit_rate / 1000);
} else {
- fprintf(stderr, "N/A");
+ av_log(NULL, AV_LOG_DEBUG, "N/A");
}
- fprintf(stderr, "\n");
+ av_log(NULL, AV_LOG_DEBUG, "\n");
}
for(i=0;i<ic->nb_streams;i++) {
AVStream *st = ic->streams[i];
avcodec_string(buf, sizeof(buf), &st->codec, is_output);
- fprintf(stderr, " Stream #%d.%d", index, i);
+ av_log(NULL, AV_LOG_DEBUG, " Stream #%d.%d", index, i);
/* the pid is an important information, so we display it */
/* XXX: add a generic system */
if (is_output)
else
flags = ic->iformat->flags;
if (flags & AVFMT_SHOW_IDS) {
- fprintf(stderr, "[0x%x]", st->id);
+ av_log(NULL, AV_LOG_DEBUG, "[0x%x]", st->id);
}
- fprintf(stderr, ": %s\n", buf);
+ av_log(NULL, AV_LOG_DEBUG, ": %s\n", buf);
}
}
} AbvEntry;
static AbvEntry frame_abvs[] = {
- { "ntsc", 352, 240, 30000, 1001 },
- { "pal", 352, 288, 25, 1 },
+ { "ntsc", 720, 480, 30000, 1001 },
+ { "pal", 720, 576, 25, 1 },
+ { "qntsc", 352, 240, 30000, 1001 }, /* VCD compliant ntsc */
+ { "qpal", 352, 288, 25, 1 }, /* VCD compliant pal */
+ { "sntsc", 640, 480, 30000, 1001 }, /* square pixel ntsc */
+ { "spal", 768, 576, 25, 1 }, /* square pixel pal */
{ "film", 352, 240, 24, 1 },
{ "ntsc-film", 352, 240, 24000, 1001 },
{ "sqcif", 128, 96, 0, 0 },
}
else {
/* Finally we give up and parse it as double */
- *frame_rate_base = DEFAULT_FRAME_RATE_BASE;
+ *frame_rate_base = DEFAULT_FRAME_RATE_BASE; //FIXME use av_d2q()
*frame_rate = (int)(strtod(arg, 0) * (*frame_rate_base) + 0.5);
}
if (!*frame_rate || !*frame_rate_base)
return 0;
}
-int64_t av_gettime(void)
-{
-#ifdef CONFIG_WIN32
- struct _timeb tb;
- _ftime(&tb);
- return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000);
-#else
- struct timeval tv;
- gettimeofday(&tv,NULL);
- return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
-#endif
-}
-
-static time_t mktimegm(struct tm *tm)
-{
- time_t t;
-
- int y = tm->tm_year + 1900, m = tm->tm_mon + 1, d = tm->tm_mday;
-
- if (m < 3) {
- m += 12;
- y--;
- }
-
- t = 86400 *
- (d + (153 * m - 457) / 5 + 365 * y + y / 4 - y / 100 + y / 400 - 719469);
-
- t += 3600 * tm->tm_hour + 60 * tm->tm_min + tm->tm_sec;
-
- return t;
-}
-
/* Syntax:
* - If not a duration:
* [{YYYY-MM-DD|YYYYMMDD}]{T| }{HH[:MM[:SS[.m...]]][Z]|HH[MM[SS[.m...]]][Z]}
const char *q;
int is_utc, len;
char lastch;
+
+#undef time
time_t now = time(0);
len = strlen(datestr);
q = NULL;
if (!duration) {
for (i = 0; i < sizeof(date_fmt) / sizeof(date_fmt[0]); i++) {
- q = strptime(p, date_fmt[i], &dt);
+ q = small_strptime(p, date_fmt[i], &dt);
if (q) {
break;
}
p++;
for (i = 0; i < sizeof(time_fmt) / sizeof(time_fmt[0]); i++) {
- q = strptime(p, time_fmt[i], &dt);
+ q = small_strptime(p, time_fmt[i], &dt);
if (q) {
break;
}
}
} else {
- q = strptime(p, time_fmt[0], &dt);
+ q = small_strptime(p, time_fmt[0], &dt);
if (!q) {
dt.tm_sec = strtol(p, (char **)&q, 10);
dt.tm_min = 0;
const char *path, int number)
{
const char *p;
- char *q, buf1[20];
- int nd, len, c, percentd_found;
+ char *q, buf1[20], c;
+ int nd, len, percentd_found;
q = buf;
p = path;
nd = nd * 10 + *p++ - '0';
}
c = *p++;
- if (c == '*' && nd > 0) {
- // The nd field is actually the modulus
- number = number % nd;
- c = *p++;
- nd = 0;
- }
} while (isdigit(c));
switch(c) {
}
/**
- *
- * Print on stdout a nice hexa dump of a buffer
+ * Print nice hexa dump of a buffer
+ * @param f stream for output
* @param buf buffer
* @param size buffer size
*/
-void av_hex_dump(uint8_t *buf, int size)
+void av_hex_dump(FILE *f, uint8_t *buf, int size)
{
int len, i, j, c;
len = size - i;
if (len > 16)
len = 16;
- printf("%08x ", i);
+ fprintf(f, "%08x ", i);
for(j=0;j<16;j++) {
if (j < len)
- printf(" %02x", buf[i+j]);
+ fprintf(f, " %02x", buf[i+j]);
else
- printf(" ");
+ fprintf(f, " ");
}
- printf(" ");
+ fprintf(f, " ");
for(j=0;j<len;j++) {
c = buf[i+j];
if (c < ' ' || c > '~')
c = '.';
- printf("%c", c);
+ fprintf(f, "%c", c);
}
- printf("\n");
+ fprintf(f, "\n");
}
}
+/**
+ * Print on 'f' a nice dump of a packet
+ * @param f stream for output
+ * @param pkt packet to dump
+ * @param dump_payload true if the payload must be displayed too
+ */
+void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload)
+{
+ fprintf(f, "stream #%d:\n", pkt->stream_index);
+ fprintf(f, " keyframe=%d\n", ((pkt->flags & PKT_FLAG_KEY) != 0));
+ fprintf(f, " duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE);
+ /* DTS is _always_ valid after av_read_frame() */
+ fprintf(f, " dts=");
+ if (pkt->dts == AV_NOPTS_VALUE)
+ fprintf(f, "N/A");
+ else
+ fprintf(f, "%0.3f", (double)pkt->dts / AV_TIME_BASE);
+ /* PTS may be not known if B frames are present */
+ fprintf(f, " pts=");
+ if (pkt->pts == AV_NOPTS_VALUE)
+ fprintf(f, "N/A");
+ else
+ fprintf(f, "%0.3f", (double)pkt->pts / AV_TIME_BASE);
+ fprintf(f, "\n");
+ fprintf(f, " size=%d\n", pkt->size);
+ if (dump_payload)
+ av_hex_dump(f, pkt->data, pkt->size);
+}
+
void url_split(char *proto, int proto_size,
char *hostname, int hostname_size,
int *port_ptr,
* @param pts_num numerator to convert to seconds (MPEG: 1)
* @param pts_den denominator to convert to seconds (MPEG: 90000)
*/
-void av_set_pts_info(AVFormatContext *s, int pts_wrap_bits,
+void av_set_pts_info(AVStream *s, int pts_wrap_bits,
int pts_num, int pts_den)
{
s->pts_wrap_bits = pts_wrap_bits;
- s->pts_num = pts_num;
- s->pts_den = pts_den;
+ s->time_base.num = pts_num;
+ s->time_base.den = pts_den;
}
/* fraction handling */
projects / ffmpeg / blobdiff