har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parseutils: add support for ms and us suffix for AV_OPT_TYPE_DURATION

Browse Source 
supported suffixes are:
- s: seconds (default when no suffix specified)
- m or ms: milliseconds
- u or us: microseconds
This commit is contained in:
Aurelien Jacobs 2018-03-01 19:30:42 +01:00
parent 6ce5dd228c
commit 61c972384d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavutil/parseutils.c
View File

@ -590,7 +590,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
int64_t t, now64; int64_t t, now64;
time_t now; time_t now;
struct tm dt = { 0 }, tmbuf; struct tm dt = { 0 }, tmbuf;
int today = 0, negative = 0, microseconds = 0; int today = 0, negative = 0, microseconds = 0, suffix = 1000000;
int i; int i;
static const char * const date_fmt[] = { static const char * const date_fmt[] = {
"%Y - %m - %d", "%Y - %m - %d",
@ -689,6 +689,17 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
if (duration) { if (duration) {
t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec; t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
if (*q == 'm') {
suffix = 1000;
microseconds /= 1000;
q++;
} else if (*q == 'u') {
suffix = 1;
microseconds = 0;
q++;
}
if (*q == 's')
q++;
} else { } else {
int is_utc = *q == 'Z' || *q == 'z'; int is_utc = *q == 'Z' || *q == 'z';
int tzoffset = 0; int tzoffset = 0;
@ -724,7 +735,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
if (*q) if (*q)
return AVERROR(EINVAL); return AVERROR(EINVAL);
t *= 1000000; t *= suffix;
t += microseconds; t += microseconds;
*timeval = negative ? -t : t; *timeval = negative ? -t : t;
return 0; return 0;