diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-12-04 20:56:32 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-12-07 11:18:28 +0100 |
| commit | e5b666441987856316faa8b8928f40ec956906ac (patch) | |
| tree | e372f5027117ba33a4deb9cf180864d77d7e2dd0 | |
| parent | 1595ddaa5fc1dcc4e04168e43fc82e3c71fdb3fd (diff) | |
lms: Move {under,over}run checks into separate method
Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef
| -rw-r--r-- | Transceiver52M/device/lms/LMSDevice.cpp | 26 | ||||
| -rw-r--r-- | Transceiver52M/device/lms/LMSDevice.h | 1 |
2 files changed, 16 insertions, 11 deletions
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 9804bbd..fa9e395 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -499,13 +499,26 @@ GSM::Time LMSDevice::minLatency() { return GSM::Time(6,7); } +void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun) +{ + lms_stream_status_t status; + if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) == 0) { + if (status.underrun > m_last_rx_underruns[chan]) + *underrun = true; + m_last_rx_underruns[chan] = status.underrun; + + if (status.overrun > m_last_rx_overruns[chan]) + *overrun = true; + m_last_rx_overruns[chan] = status.overrun; + } +} + // NOTE: Assumes sequential reads int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun, TIMESTAMP timestamp, bool * underrun, unsigned *RSSI) { int rc = 0; unsigned int i; - lms_stream_status_t status; lms_stream_meta_t rx_metadata = {}; rx_metadata.flushPartialPacket = false; rx_metadata.waitForTimestamp = false; @@ -528,16 +541,7 @@ int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun, } if (timestamp != (TIMESTAMP)rx_metadata.timestamp) LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp; - - if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) { - if (status.underrun > m_last_rx_underruns[i]) - *underrun = true; - m_last_rx_underruns[i] = status.underrun; - - if (status.overrun > m_last_rx_overruns[i]) - *overrun = true; - m_last_rx_overruns[i] = status.overrun; - } + update_stream_stats(i, underrun, overrun); thread_enable_cancel(true); } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index d1a8813..fde2408 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -67,6 +67,7 @@ private: int get_ant_idx(const std::string & name, bool dir_tx, size_t chan); bool flush_recv(size_t num_pkts); + void update_stream_stats(size_t chan, bool * underrun, bool * overrun); public: |