Get rid of strptime

strptime is not portable as it is not supported by MinGW and MSVC. We only use it for the GPS filters which use Qt anyways hence we can use QDateTime instead.

Author: jlskuz

.github/workflows/static-code-analysis.yml

@@ -14,7 +14,6 @@ jobs:
         -i src/modules/glaxnimate/glaxnimate/
         -i src/modules/plus/ebur128/
         -i src/modules/xml/common.c
-        -i src/win32/strptime.c
         --include=src/framework/mlt_log.h
         --include=src/framework/mlt_types.h
         --library=cppcheck.cfg

makefile

@@ -25,7 +25,6 @@ cppcheck:
 		-i src/modules/glaxnimate/glaxnimate/ \
 		-i src/modules/plus/ebur128/ \
 		-i src/modules/xml/common.c \
-		-i src/win32/strptime.c \
 		--include=src/framework/mlt_log.h \
 		--include=src/framework/mlt_types.h \
 		--library=cppcheck.cfg \

src/framework/CMakeLists.txt

@@ -111,7 +111,7 @@ if(WIN32)
     target_link_options(mlt PRIVATE -Wl,--output-def,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.def)
     install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.def" DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
-  target_sources(mlt PRIVATE ../win32/win32.c ../win32/strptime.c)
+  target_sources(mlt PRIVATE ../win32/win32.c)
   target_link_libraries(mlt PRIVATE Iconv::Iconv)
   if(NOT WINDOWS_DEPLOY)
     target_compile_definitions(mlt PRIVATE NODEPLOY)

src/framework/mlt_types.h

@@ -346,7 +346,6 @@ MLT_EXPORT FILE *win32_fopen(const char *filename_utf8, const char *mode_utf8);
 #include <sys/types.h>
 MLT_EXPORT int win32_stat(const char *filename_utf8, struct stat *buffer);
 #include <time.h>
-MLT_EXPORT char *strptime(const char *buf, const char *fmt, struct tm *tm);
 #define mlt_fopen win32_fopen
 #define mlt_stat win32_stat
 #define MLT_DIRLIST_DELIMITER ";"

src/modules/qt/filter_gpstext.cpp

@@ -425,7 +425,7 @@ static void process_filter_properties(mlt_filter filter, mlt_frame frame)
         if (strlen(read_gps_processing_start_time) != 0
             && strcmp(read_gps_processing_start_time, "yyyy-MM-dd hh:mm:ss"))
             gps_proc_t = datetimeXMLstring_to_mseconds(read_gps_processing_start_time,
-                                                       (char *) "%Y-%m-%d %H:%M:%S");
+                                                       (char *) "yyyy-MM-dd hh:mm:ss");
         if (gps_proc_t != pdata->gps_proc_start_t) {
             pdata->gps_proc_start_t = gps_proc_t;
             do_processing = 1;

src/modules/qt/gps_parser.cpp

@@ -22,6 +22,8 @@
 #define _GNU_SOURCE
 #endif
 #include "gps_parser.h"
+#include <QDateTime>
+#include <QTimeZone>
 
 #define _x (const xmlChar *)
 #define _s (const char *)
@@ -70,36 +72,25 @@ double get_avg_gps_time_ms(gps_private_data gdata)
  */
 int64_t datetimeXMLstring_to_mseconds(const char *text, char *format /* = NULL*/)
 {
-    char def_format[] = "%Y-%m-%dT%H:%M:%S";
     int64_t ret = 0;
-    int ms = 0;
-    struct tm tm_time;
-    //samples: 2020-07-11T09:03:23.000Z or 2021-02-27T12:10:00+00:00
-    tm_time.tm_isdst = -1; //force dst detection
 
-    if (format == NULL)
-        format = def_format;
+    QDateTime datetime;
+    if (format != NULL)
+        datetime = QDateTime::fromString(QString(text), QString(format));
+    else
+        datetime = QDateTime::fromString(QString(text), Qt::ISODateWithMs);
 
-    if (strptime(text, format, &tm_time) == NULL) {
+    if (!datetime.isValid()) {
         mlt_log_warning(
             NULL,
-            "filter_gpsText.c datetimeXMLstring_to_seconds strptime failed on string: %.25s",
+            "filter_gpsText.c datetimeXMLstring_to_seconds conversion failed on string: %.25s",
             text);
         return 0;
     }
 
-    ret = internal_timegm(&tm_time);
-
-    //check if we have miliseconds, 3 digits only
-    const char *ms_part = strchr(text, '.');
-    if (ms_part != NULL) {
-        ms = strtol(ms_part + 1, NULL, 10);
-        while (abs(ms) > 999)
-            ms /= 10;
-    }
-    ret = ret * 1000 + ms;
+    datetime.setTimeZone(QTimeZone::UTC);
 
-    // mlt_log_info(NULL, "datetimeXMLstring_to_mseconds: text:%s, ms:%d (/1000)", text, ret/1000);
+    ret = datetime.toMSecsSinceEpoch();
     return ret;
 }
 

src/tests/test_mod_qt_gps/test_mod_qt_gps.cpp

@@ -63,7 +63,7 @@ private Q_SLOTS:
 
         // Unknown input, with format string as hint
         const char *text = "12:10:00 27-02-2021";
-        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "%H:%M:%S %d-%m-%Y");
+        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "HH:mm:ss dd-MM-yyyy");
         QCOMPARE(gps_proc_t, 1614427800000);
 
         // Unknown input, without format string
@@ -73,7 +73,7 @@ private Q_SLOTS:
 
         // Valid input, but mismatching format string
         text = "2021-02-27T12:10:00+00:00";
-        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "%H:%M:%S %d-%m-%Y");
+        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "HH:mm:ss dd-MM-yyyy");
         QCOMPARE(gps_proc_t, 0);
     }