Mercurial > libavformat.hg
changeset 3445:4a1ecbbf5725 libavformat
Make timestamp debugging work nicer.
| author | michael |
|---|---|
| date | Mon, 09 Jun 2008 13:38:56 +0000 |
| parents | 59989e1a2154 |
| children | 7d73c4a64714 |
| files | avformat.h utils.c |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Mon Jun 09 08:44:45 2008 +0000 +++ b/avformat.h Mon Jun 09 13:38:56 2008 +0000 @@ -22,7 +22,7 @@ #define FFMPEG_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 15 +#define LIBAVFORMAT_VERSION_MINOR 16 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -549,6 +549,12 @@ unsigned int nb_chapters; AVChapter **chapters; + + /** + * Flags to enable debuging. + */ + int debug; +#define FF_FDEBUG_TS 0x0001 } AVFormatContext; typedef struct AVPacketList {
--- a/utils.c Mon Jun 09 08:44:45 2008 +0000 +++ b/utils.c Mon Jun 09 13:38:56 2008 +0000 @@ -326,6 +326,8 @@ {"cryptokey", "decryption key", OFFSET(key), FF_OPT_TYPE_BINARY, 0, 0, 0, D}, {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), FF_OPT_TYPE_INT, 1<<20, 0, INT_MAX, D}, {"rtbufsize", "max memory used for buffering real-time frames", OFFSET(max_picture_buffer), FF_OPT_TYPE_INT, 3041280, 0, INT_MAX, D}, /* defaults to 1s of 15fps 352x288 YUYV422 video */ +{"fdebug", "print specific debug info", OFFSET(debug), FF_OPT_TYPE_FLAGS, DEFAULT, 0, INT_MAX, E|D, "fdebug"}, +{"ts", NULL, 0, FF_OPT_TYPE_CONST, FF_FDEBUG_TS, INT_MIN, INT_MAX, E|D, "fdebug"}, {NULL}, }; @@ -880,7 +882,7 @@ } st = s->streams[s->cur_pkt.stream_index]; - if(st->codec->debug & FF_DEBUG_PTS) + if(s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n", s->cur_pkt.stream_index, s->cur_pkt.pts, @@ -905,7 +907,7 @@ } } } - if(st->codec->debug & FF_DEBUG_PTS) + if(s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n", pkt->stream_index, pkt->pts,