From e8a8ef6f3d4c2caaf74cf7832eda505ba00258e9 Mon Sep 17 00:00:00 2001
From: Andreas Baulig <free.geronimo@hotmail.de>
Date: Wed, 4 Aug 2021 13:38:42 +0000
Subject: [PATCH] Switch FileRecord timestamp resolution to milliseconds

---
 plugins/samplesink/fileoutput/fileoutput.cpp    | 5 +++--
 plugins/samplesink/fileoutput/fileoutput.h      | 2 +-
 plugins/samplesource/fileinput/fileinputgui.cpp | 4 ++--
 sdrbase/dsp/filerecord.cpp                      | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/samplesink/fileoutput/fileoutput.cpp b/plugins/samplesink/fileoutput/fileoutput.cpp
index 718aed34d..cba8e6407 100644
--- a/plugins/samplesink/fileoutput/fileoutput.cpp
+++ b/plugins/samplesink/fileoutput/fileoutput.cpp
@@ -19,6 +19,7 @@
 #include <QDebug>
 #include <QNetworkReply>
 #include <QBuffer>
+#include <QDateTime>
 
 #include "SWGDeviceSettings.h"
 #include "SWGDeviceState.h"
@@ -74,8 +75,8 @@ void FileOutput::openFileStream()
 	int actualSampleRate = m_settings.m_sampleRate * (1<<m_settings.m_log2Interp);
     header.sampleRate = actualSampleRate;
     header.centerFrequency = m_settings.m_centerFrequency;
-    m_startingTimeStamp = time(0);
-    header.startTimeStamp = m_startingTimeStamp;
+    m_startingTimeStamp = QDateTime::currentMSecsSinceEpoch();
+    header.startTimeStamp = (quint64)m_startingTimeStamp;
     header.sampleSize = SDR_RX_SAMP_SZ;
 
     FileRecord::writeHeader(m_ofstream, header);
diff --git a/plugins/samplesink/fileoutput/fileoutput.h b/plugins/samplesink/fileoutput/fileoutput.h
index 3863419fc..3381198a2 100644
--- a/plugins/samplesink/fileoutput/fileoutput.h
+++ b/plugins/samplesink/fileoutput/fileoutput.h
@@ -233,7 +233,7 @@ private:
 	FileOutputWorker* m_fileOutputWorker;
     QThread m_fileOutputWorkerThread;
 	QString m_deviceDescription;
-	std::time_t m_startingTimeStamp;
+	qint64 m_startingTimeStamp;
 	const QTimer& m_masterTimer;
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp
index 84bbc8968..d7d42b92c 100644
--- a/plugins/samplesource/fileinput/fileinputgui.cpp
+++ b/plugins/samplesource/fileinput/fileinputgui.cpp
@@ -367,8 +367,8 @@ void FileInputGUI::updateWithStreamTime()
 	QString s_timems = t.toString("HH:mm:ss.zzz");
 	ui->relTimeText->setText(s_timems);
 
-    qint64 startingTimeStampMsec = m_startingTimeStamp * 1000LL;
-	QDateTime dt = QDateTime::fromMSecsSinceEpoch(startingTimeStampMsec);
+    qint64 startingTimeStampMsec = m_startingTimeStamp;
+    QDateTime dt = QDateTime::fromMSecsSinceEpoch(startingTimeStampMsec);
     dt = dt.addSecs(t_sec);
     dt = dt.addMSecs(t_msec);
 	QString s_date = dt.toString("yyyy-MM-dd HH:mm:ss.zzz");
diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp
index 899eed818..84b05052b 100644
--- a/sdrbase/dsp/filerecord.cpp
+++ b/sdrbase/dsp/filerecord.cpp
@@ -183,8 +183,8 @@ void FileRecord::writeHeader()
     Header header;
     header.sampleRate = m_sampleRate;
     header.centerFrequency = m_centerFrequency;
-    std::time_t ts = time(0);
-    header.startTimeStamp = ts + (m_msShift / 1000);
+    qint64 ts = QDateTime::currentMSecsSinceEpoch();
+    header.startTimeStamp = (quint64)(ts + m_msShift);
     header.sampleSize = SDR_RX_SAMP_SZ;
     header.filler = 0;