[FFmpeg-devel] [PATCH 4/4] avformat/img2dec: support nanosecond file times

[Clément Bœsch]

On Sat, May 25, 2013 at 03:58:04PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  libavformat/img2dec.c |   15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
> index b847d6c..ea4ee0f 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"
> @@ -225,7 +226,13 @@ static int 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);
> @@ -393,6 +400,10 @@ static int 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;
> @@ -467,7 +478,7 @@ 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 },
>      { NULL },

0, 1 and 2 are not intuitive, especially without a documentation update.
Could you add some const?

Use case examples would be welcome. How does this behave when you mix this
with -vsync cfr/vfr?

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130527/9331e36d/attachment.asc>