FT8 demod: implement callback as an interface class. Added test .wav file and file option in the sdrbench options

ft8/ft8.cpp

@@ -445,7 +445,7 @@ public:
     float down_hz_;
 
     static std::mutex cb_mu_;
-    cb_t cb_; // call-back into Python
+    CallbackInterface *cb_; // call-back interface
 
     std::mutex hack_mu_;
     int hack_size_;
@@ -469,7 +469,7 @@ public:
         int hints2[],
         double deadline,
         double final_deadline,
-        cb_t cb,
+        CallbackInterface *cb,
         std::vector<cdecode> prevdecs
     )
     {
@@ -3513,10 +3513,10 @@ public:
 
             float snr = guess_snr(m79);
 
-            if (cb_ != 0)
+            if (cb_)
             {
                 cb_mu_.lock();
-                int ret = cb_(
+                int ret = cb_->hcb(
                     a174,
                     best_hz + down_hz_,
                     best_off,
@@ -3603,7 +3603,7 @@ void entry(
     int hints2[],
     double time_left,
     double total_time_left,
-    cb_t cb,
+    CallbackInterface *cb,
     int nprevdecs,
     struct cdecode *xprevdecs
 )

ft8/ft8.h

@@ -22,16 +22,21 @@
 #define ft8_h
 
 namespace FT8 {
-// Callback function to get the results
-typedef int (*cb_t)(
-    int *a91,
-    float hz0,
-    float off,
-    const char *,
-    float snr,
-    int pass,
-    int correct_bits
-);
+// Callback interface to get the results
+class CallbackInterface
+{
+public:
+    virtual int hcb(
+        int *a91,
+        float hz0,
+        float off,
+        const char *,
+        float snr,
+        int pass,
+        int correct_bits
+    ) = 0; //!< virtual nathod called each time there is a result
+};
+
 // same as Python class CDECODE
 //
 struct cdecode
@@ -53,7 +58,7 @@ void entry(
     int hints2[],
     double time_left,
     double total_time_left,
-    cb_t cb,
+    CallbackInterface *cb,
     int,
     struct cdecode *
 );

sdrbench/mainbench.cpp

@@ -46,7 +46,8 @@ void MainBench::run()
         << " testType: " << (int) m_parser.getTestType()
         << " nsamples: " << m_parser.getNbSamples()
         << " repet: " << m_parser.getRepetition()
-        << " log2f: " << m_parser.getLog2Factor();
+        << " log2f: " << m_parser.getLog2Factor()
+        << " file: " << m_parser.getFileName();
 
     if (m_parser.getTestType() == ParserBench::TestDecimatorsII) {
         testDecimateII();
@@ -63,7 +64,7 @@ void MainBench::run()
     } else if (m_parser.getTestType() == ParserBench::TestGolay2312) {
         testGolay2312();
     } else if (m_parser.getTestType() == ParserBench::TestFT8) {
-        testFT8();
+        testFT8(m_parser.getFileName());
     } else {
         qDebug() << "MainBench::run: unknown test type: " << m_parser.getTestType();
     }

sdrbench/mainbench.h

@@ -54,7 +54,7 @@ private:
     void testDecimateFI();
     void testDecimateFF();
     void testGolay2312();
-    void testFT8();
+    void testFT8(const QString& wavFile); //!< use with sdrbench/samples/ft8/230105_091630.wav in -f option
     void decimateII(const qint16 *buf, int len);
     void decimateInfII(const qint16 *buf, int len);
     void decimateSupII(const qint16 *buf, int len);

sdrbench/parserbench.cpp

@@ -38,7 +38,11 @@ ParserBench::ParserBench() :
     m_log2FactorOption(QStringList() << "l" << "log2-factor",
         "Log2 factor for rate conversion.",
         "log2",
-        "2")
+        "2"),
+    m_fileOption(QStringList() << "f" << "file",
+        "File to be used for the test.",
+        "file",
+        "")
 {
     m_testStr = "decimateii";
     m_nbSamples = 1048576;
@@ -53,6 +57,7 @@ ParserBench::ParserBench() :
     m_parser.addOption(m_nbSamplesOption);
     m_parser.addOption(m_repetitionOption);
     m_parser.addOption(m_log2FactorOption);
+    m_parser.addOption(m_fileOption);
 }
 
 ParserBench::~ParserBench()
@@ -111,6 +116,10 @@ void ParserBench::parse(const QCoreApplication& app)
     } else {
         qWarning() << "ParserBench::parse: repetilog2 factortion invalid. Defaulting to " << m_log2Factor;
     }
+
+    // file
+
+    m_fileName = m_parser.value(m_fileOption);
 }
 
 ParserBench::TestType ParserBench::getTestType() const

sdrbench/parserbench.h

@@ -49,18 +49,21 @@ public:
     uint32_t getNbSamples() const { return m_nbSamples; }
     uint32_t getRepetition() const { return m_repetition; }
     uint32_t getLog2Factor() const { return m_log2Factor; }
+    const QString& getFileName() const { return m_fileName; }
 
 private:
     QString  m_testStr;
     uint32_t m_nbSamples;
     uint32_t m_repetition;
     uint32_t m_log2Factor;
+    QString m_fileName;
 
     QCommandLineParser m_parser;
     QCommandLineOption m_testOption;
     QCommandLineOption m_nbSamplesOption;
     QCommandLineOption m_repetitionOption;
     QCommandLineOption m_log2FactorOption;
+    QCommandLineOption m_fileOption;
 };
 
 

sdrbench/test_ft8.cpp

@@ -31,10 +31,28 @@ void MainBench::testFT8()
 }
 #else
 
-QMutex cycle_mu;
-std::map<std::string, bool> cycle_already;
+class TestFT8Callback : public FT8::CallbackInterface
+{
+public:
+    virtual int hcb(
+        int *a91,
+        float hz0,
+        float off,
+        const char *comment,
+        float snr,
+        int pass,
+        int correct_bits
+    );
+    const std::map<std::string, bool>& getMsgMap() {
+        return cycle_already;
+    }
+private:
+    QMutex cycle_mu;
+    std::map<std::string, bool> cycle_already;
+};
 
-int hcb(
+
+int TestFT8Callback::hcb(
     int *a91,
     float hz0,
     float off,
@@ -62,7 +80,7 @@ int hcb(
 
     cycle_mu.unlock();
 
-    printf("%d %3d %3d %5.2f %6.1f %s [%s:%s:%s] (%s)\n",
+    qDebug("TestFT8Callback::hcb: %d %3d %3d %5.2f %6.1f %s [%s:%s:%s] (%s)",
         pass,
         (int)snr,
         correct_bits,
@@ -79,14 +97,15 @@ int hcb(
     return 2; // 2 => new decode, do subtract.
 }
 
-void MainBench::testFT8()
+void MainBench::testFT8(const QString& wavFile)
 {
     qDebug("MainBench::testFT8: start");
     int hints[2] = { 2, 0 }; // CQ
     double budget = 2.5; // compute for this many seconds per cycle
+    TestFT8Callback testft8Callback;
 
     int rate;
-    std::vector<float> s = FT8::readwav("/home/f4exb/.local/share/WSJT-X/save/230105_091630.wav", rate); // FIXME: download file
+    std::vector<float> s = FT8::readwav(wavFile.toStdString().c_str(), rate);
     FT8::entry(
         s.data(),
         s.size(),
@@ -98,10 +117,46 @@ void MainBench::testFT8()
         hints,
         budget,
         budget,
-        hcb,
+        &testft8Callback,
         0,
         (struct FT8::cdecode *) 0
     );
-    qDebug("MainBench::testFT8: end");
+    qDebug("MainBench::testFT8: done");
+    const std::map<std::string, bool>& msgMap = testft8Callback.getMsgMap();
+
+    if (msgMap.size() != 15)
+    {
+        qDebug("MainBench::testFT8: failed: invlid size: %lu expected 15", msgMap.size());
+        return;
+    }
+
+    QStringList messages = {
+        "CQ DF5SF JN39",
+        "CQ DL1SVA JO64",
+        "CQ DL7CO JO42",
+        "CQ F4BAL JO10",
+        "CQ LA1XJA JO49",
+        "CQ ON7VG JO21",
+        "CQ OZ1BJF JO55",
+        "CQ S51TA JN75",
+        "HA3PT SQ8AA -18",
+        "JA2KFQ EI4KF -17",
+        "LY3PW DF2FE R-13",
+        "N9GQA DG9NAY JN58",
+        "OK1HEH OH8NW 73  ",
+        "UN6T EA1FQ IN53",
+        "W5SUM G8OO -18"
+    };
+
+    for (const auto &msg : messages)
+    {
+        if (msgMap.count(msg.toStdString()) != 1)
+        {
+            qDebug("MainBench::testFT8: failed: key: %s", qPrintable(msg));
+            return;
+        }
+    }
+
+    qDebug("MainBench::testFT8: success");
 }
 #endif