diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-25 15:34:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-12 04:52:01 +0200 |
| commit | f683895dee05a1beab09261a5fcafa72eadbd75a (patch) | |
| tree | 430ba74fcb51be0ed0144969017973f236697f54 | |
| parent | 513a431e073ab725eb85fe7021591da9ad27a55f (diff) | |
| download | ffmpeg-f683895dee05a1beab09261a5fcafa72eadbd75a.tar.gz | |
avformat/img2dec: support nanosecond file times
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/demuxers.texi | 2 | ||||
| -rw-r--r-- | libavformat/img2dec.c | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index ada8644b76..f0a14e060d 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -265,6 +265,8 @@ is 5. If set to 1, will set frame timestamp to modification time of image file. Note that monotonity of timestamps is not provided: images go in the same order as without this option. Default value is 0. +If set to 2, will set frame timestamp to the modification time of the image file in +nanosecond precission. @item video_size Set the video size of the images to read. If not specified the video size is guessed from the first image file in the sequence. diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 5da123f4e0..330ec83448 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _BSD_SOURCE #include <sys/stat.h> #include "libavutil/avstring.h" #include "libavutil/log.h" @@ -200,7 +201,13 @@ int ff_img_read_header(AVFormatContext *s1) st->need_parsing = AVSTREAM_PARSE_FULL; } - if (s->ts_from_file) + if (s->ts_from_file == 2) { +#if !HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC + av_log(s1, AV_LOG_ERROR, "POSIX.1-2008 not supported, nanosecond file timestamps unavailable\n"); + return AVERROR(ENOSYS); +#endif + avpriv_set_pts_info(st, 64, 1, 1000000000); + } else if (s->ts_from_file) avpriv_set_pts_info(st, 64, 1, 1); else avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); @@ -394,6 +401,10 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) if (stat(filename, &img_stat)) return AVERROR(EIO); pkt->pts = (int64_t)img_stat.st_mtime; +#if HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC + if (s->ts_from_file == 2) + pkt->pts = 1000000000*pkt->pts + img_stat.st_mtim.tv_nsec; +#endif av_add_index_entry(s1->streams[0], s->img_number, pkt->pts, 0, 0, AVINDEX_KEYFRAME); } else if (!s->is_pipe) { pkt->pts = s->pts; @@ -468,7 +479,10 @@ static const AVOption options[] = { { "start_number_range", "set range for looking at the first sequence number", OFFSET(start_number_range), AV_OPT_TYPE_INT, {.i64 = 5}, 1, INT_MAX, DEC }, { "video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, { "frame_size", "force frame size in bytes", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, DEC }, - { "ts_from_file", "set frame timestamp from file's one", OFFSET(ts_from_file), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, DEC }, + { "ts_from_file", "set frame timestamp from file's one", OFFSET(ts_from_file), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, DEC, "ts_type" }, + { "none", "none", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, 0, 2, DEC, "ts_type" }, + { "sec", "second precission", 0, AV_OPT_TYPE_CONST, {.i64 = 1 }, 0, 2, DEC, "ts_type" }, + { "ns", "nano second precission", 0, AV_OPT_TYPE_CONST, {.i64 = 2 }, 0, 2, DEC, "ts_type" }, { NULL }, }; |