mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 16:22:37 +00:00
avformat/img2dec: support nanosecond file times
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
513a431e07
commit
f683895dee
@ -265,6 +265,8 @@ is 5.
|
|||||||
If set to 1, will set frame timestamp to modification time of image file. Note
|
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
|
that monotonity of timestamps is not provided: images go in the same order as
|
||||||
without this option. Default value is 0.
|
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
|
@item video_size
|
||||||
Set the video size of the images to read. If not specified the video
|
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.
|
size is guessed from the first image file in the sequence.
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define _BSD_SOURCE
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include "libavutil/avstring.h"
|
#include "libavutil/avstring.h"
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
@ -200,7 +201,13 @@ int ff_img_read_header(AVFormatContext *s1)
|
|||||||
st->need_parsing = AVSTREAM_PARSE_FULL;
|
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);
|
avpriv_set_pts_info(st, 64, 1, 1);
|
||||||
else
|
else
|
||||||
avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num);
|
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))
|
if (stat(filename, &img_stat))
|
||||||
return AVERROR(EIO);
|
return AVERROR(EIO);
|
||||||
pkt->pts = (int64_t)img_stat.st_mtime;
|
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);
|
av_add_index_entry(s1->streams[0], s->img_number, pkt->pts, 0, 0, AVINDEX_KEYFRAME);
|
||||||
} else if (!s->is_pipe) {
|
} else if (!s->is_pipe) {
|
||||||
pkt->pts = s->pts;
|
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 },
|
{ "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 },
|
{ "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 },
|
{ "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 },
|
{ NULL },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user