Merge branch 'dexter' into next

1 files changed, 32 insertions, 37 deletions

diff --git a/src/FicSource.cpp b/src/FicSource.cpp
index 2b95085..d824058 100644
--- a/src/FicSource.cpp
+++ b/src/FicSource.cpp
@@ -2,7 +2,7 @@
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty
    the Queen in Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2018
+   Copyright (C) 2022
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://opendigitalradio.org
@@ -27,7 +27,6 @@
 #include "FicSource.h"
 #include "PcDebug.h"
 #include "Log.h"
-#include "TimestampDecoder.h"
 
 #include <stdexcept>
 #include <string>
@@ -36,46 +35,45 @@
 #include <string.h>
 
 
-const std::vector<PuncturingRule>& FicSource::get_rules()
-{
-    return d_puncturing_rules;
-}
-
-
 FicSource::FicSource(unsigned ficf, unsigned mid) :
     ModInput()
 {
 //    PDEBUG("FicSource::FicSource(...)\n");
 //    PDEBUG("  Start address: %i\n", d_start_address);
-//    PDEBUG("  Framesize: %i\n", d_framesize);
+//    PDEBUG("  Framesize: %i\n", m_framesize);
 //    PDEBUG("  Protection: %i\n", d_protection);
 
     if (ficf == 0) {
-        d_framesize = 0;
-        d_buffer.setLength(0);
+        m_buffer.setLength(0);
         return;
     }
 
     if (mid == 3) {
-        d_framesize = 32 * 4;
-        d_puncturing_rules.emplace_back(29 * 16, 0xeeeeeeee);
-        d_puncturing_rules.emplace_back(3 * 16, 0xeeeeeeec);
+        m_framesize = 32 * 4;
+        m_puncturing_rules.emplace_back(29 * 16, 0xeeeeeeee);
+        m_puncturing_rules.emplace_back(3 * 16, 0xeeeeeeec);
     } else {
-        d_framesize = 24 * 4;
-        d_puncturing_rules.emplace_back(21 * 16, 0xeeeeeeee);
-        d_puncturing_rules.emplace_back(3 * 16, 0xeeeeeeec);
+        m_framesize = 24 * 4;
+        m_puncturing_rules.emplace_back(21 * 16, 0xeeeeeeee);
+        m_puncturing_rules.emplace_back(3 * 16, 0xeeeeeeec);
     }
-    d_buffer.setLength(d_framesize);
+    m_buffer.setLength(m_framesize);
+}
+
+size_t FicSource::getFramesize() const
+{
+    return m_framesize;
 }
 
-size_t FicSource::getFramesize()
+const std::vector<PuncturingRule>& FicSource::get_rules() const
 {
-    return d_framesize;
+    return m_puncturing_rules;
 }
 
+
 void FicSource::loadFicData(const Buffer& fic)
 {
-    d_buffer = fic;
+    m_buffer = fic;
 }
 
 int FicSource::process(Buffer* outputData)
@@ -83,34 +81,31 @@ int FicSource::process(Buffer* outputData)
     PDEBUG("FicSource::process (outputData: %p, outputSize: %zu)\n",
             outputData, outputData->getLength());
 
-    if (d_buffer.getLength() != d_framesize) {
+    if (m_buffer.getLength() != m_framesize) {
         throw std::runtime_error(
-                "ERROR: FicSource::process.outputSize != d_framesize: " +
-                std::to_string(d_buffer.getLength()) + " != " +
-                std::to_string(d_framesize));
+                "ERROR: FicSource::process.outputSize != m_framesize: " +
+                std::to_string(m_buffer.getLength()) + " != " +
+                std::to_string(m_framesize));
     }
-    *outputData = d_buffer;
+    *outputData = m_buffer;
 
     return outputData->getLength();
 }
 
-void FicSource::loadTimestamp(const std::shared_ptr<struct frame_timestamp>& ts)
+void FicSource::loadTimestamp(const frame_timestamp& ts)
 {
-    d_ts = ts;
+    m_ts_valid = true;
+    m_ts = ts;
 }
 
-
 meta_vec_t FicSource::process_metadata(const meta_vec_t& metadataIn)
 {
-    if (not d_ts) {
-        return {};
-    }
-
-    using namespace std;
     meta_vec_t md_vec;
-    flowgraph_metadata meta;
-    meta.ts = d_ts;
-    md_vec.push_back(meta);
+    if (m_ts_valid) {
+        flowgraph_metadata meta;
+        meta.ts = m_ts;
+        md_vec.push_back(meta);
+    }
     return md_vec;
 }