virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avutil/parseutils: accept everything in av_parse_time that ff_iso8601_to_unix_time accepts

Browse Source 
Also parse timezone information previously ignored in ff_iso8601_to_unix_time.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2016-02-04 02:50:42 +01:00
parent 3235241061
commit f834f0cab6
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavutil/parseutils.c
View File

@ -565,13 +565,18 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
int today = 0, negative = 0, microseconds = 0; int today = 0, negative = 0, microseconds = 0;
int i; int i;
static const char * const date_fmt[] = { static const char * const date_fmt[] = {
"%Y-%m-%d", "%Y - %m - %d",
"%Y%m%d", "%Y%m%d",
}; };
static const char * const time_fmt[] = { static const char * const time_fmt[] = {
"%H:%M:%S", "%H:%M:%S",
"%H%M%S", "%H%M%S",
}; };
static const char * const tz_fmt[] = {
"%H:%M",
"%H%M",
"%H",
};
p = timestr; p = timestr;
q = NULL; q = NULL;
@ -600,8 +605,11 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
} }
p = q; p = q;
if (*p == 'T' || *p == 't' || *p == ' ') if (*p == 'T' || *p == 't')
p++; p++;
else
while (av_isspace(*p))
p++;
/* parse the hour-minute-second part */ /* parse the hour-minute-second part */
for (i = 0; i < FF_ARRAY_ELEMS(time_fmt); i++) { for (i = 0; i < FF_ARRAY_ELEMS(time_fmt); i++) {
@ -655,7 +663,23 @@ int av_parse_time(int64_t *timeval, const char *timestr, int 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;
} else { } else {
int is_utc = *q == 'Z' || *q == 'z'; int is_utc = *q == 'Z' || *q == 'z';
int tzoffset = 0;
q += is_utc; q += is_utc;
if (!today && !is_utc && (*q == '+' || *q == '-')) {
struct tm tz = { 0 };
int sign = (*q == '+' ? -1 : 1);
q++;
p = q;
for (i = 0; i < FF_ARRAY_ELEMS(tz_fmt); i++) {
q = av_small_strptime(p, tz_fmt[i], &tz);
if (q)
break;
}
if (!q)
return AVERROR(EINVAL);
tzoffset = sign * (tz.tm_hour * 60 + tz.tm_min) * 60;
is_utc = 1;
}
if (today) { /* fill in today's date */ if (today) { /* fill in today's date */
struct tm dt2 = is_utc ? *gmtime_r(&now, &tmbuf) : *localtime_r(&now, &tmbuf); struct tm dt2 = is_utc ? *gmtime_r(&now, &tmbuf) : *localtime_r(&now, &tmbuf);
dt2.tm_hour = dt.tm_hour; dt2.tm_hour = dt.tm_hour;
@ -664,6 +688,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
dt = dt2; dt = dt2;
} }
t = is_utc ? av_timegm(&dt) : mktime(&dt); t = is_utc ? av_timegm(&dt) : mktime(&dt);
t += tzoffset;
} }
/* Check that we are at the end of the string */ /* Check that we are at the end of the string */
@ -860,7 +885,10 @@ int main(void)
"now", "now",
"12:35:46", "12:35:46",
"2000-12-20 0:02:47.5z", "2000-12-20 0:02:47.5z",
"2012 - 02-22 17:44:07",
"2000-12-20T010247.6", "2000-12-20T010247.6",
"2000-12-12 1:35:46+05:30",
"2112-12-12 22:30:40-02",
}; };
static const char * const duration_string[] = { static const char * const duration_string[] = {
"2:34:56.79", "2:34:56.79",

3
tests/ref/fate/parseutils
View File

@ -74,7 +74,10 @@ Testing av_parse_time()
now -> 1331972053.200000 = 2012-03-17T08:14:13Z now -> 1331972053.200000 = 2012-03-17T08:14:13Z
12:35:46 -> 1331984146.000000 = 2012-03-17T11:35:46Z 12:35:46 -> 1331984146.000000 = 2012-03-17T11:35:46Z
2000-12-20 0:02:47.5z -> 977270567.500000 = 2000-12-20T00:02:47Z 2000-12-20 0:02:47.5z -> 977270567.500000 = 2000-12-20T00:02:47Z
2012 - 02-22 17:44:07 -> 1329929047.000000 = 2012-02-22T16:44:07Z
2000-12-20T010247.6 -> 977270567.600000 = 2000-12-20T00:02:47Z 2000-12-20T010247.6 -> 977270567.600000 = 2000-12-20T00:02:47Z
2000-12-12 1:35:46+05:30 -> 976565146.000000 = 2000-12-11T20:05:46Z
2112-12-12 22:30:40-02 -> 4511032240.000000 = 2112-12-13T00:30:40Z
2:34:56.79 -> +9296790000 2:34:56.79 -> +9296790000
-1:23:45.67 -> -5025670000 -1:23:45.67 -> -5025670000
42.1729 -> +42172900 42.1729 -> +42172900