From 23750b10f688da1a1f902c1172dadc59ad0c6ae7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 23 Feb 2016 18:19:35 +0100 Subject: [PATCH] SDRdaemon plugin: report LZ4 compression status --- plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h | 1 + plugins/samplesource/sdrdaemon/sdrdaemongui.cpp | 7 +++++++ plugins/samplesource/sdrdaemon/sdrdaemongui.h | 1 + plugins/samplesource/sdrdaemon/sdrdaemongui.ui | 2 +- plugins/samplesource/sdrdaemon/sdrdaemoninput.h | 14 ++++++++++---- .../samplesource/sdrdaemon/sdrdaemonudphandler.cpp | 3 ++- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h index 2f35f48bf..425ccef0e 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h @@ -73,6 +73,7 @@ public: bool isSync() const { return m_sync; } bool isSyncLocked() const { return m_syncLock; } uint32_t getFrameSize() const { return m_frameSize; } + bool isLz4Compressed() const { return m_lz4; } static const int m_udpPayloadSize; static const int m_sampleSize; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp index 4d0317877..71dfb1ad9 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp @@ -201,6 +201,7 @@ bool SDRdaemonGui::handleMessage(const Message& message) m_startingTimeStamp.tv_usec = ((SDRdaemonInput::MsgReportSDRdaemonStreamTiming&)message).get_tv_usec(); m_syncLocked = ((SDRdaemonInput::MsgReportSDRdaemonStreamTiming&)message).getSyncLock(); m_frameSize = ((SDRdaemonInput::MsgReportSDRdaemonStreamTiming&)message).getFrameSize(); + m_lz4 = ((SDRdaemonInput::MsgReportSDRdaemonStreamTiming&)message).getLz4Compression(); updateWithStreamTime(); return true; } @@ -312,6 +313,12 @@ void SDRdaemonGui::updateWithStreamTime() QString s = QString::number(m_frameSize / 1024.0, 'f', 0); ui->frameSizeText->setText(tr("%1").arg(s)); + + if (m_lz4) { + ui->lz4Compressed->setStyleSheet("QToolButton { background-color : green; }"); + } else { + ui->lz4Compressed->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); + } } void SDRdaemonGui::tick() diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.h b/plugins/samplesource/sdrdaemon/sdrdaemongui.h index 2f024d39e..3674b861a 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.h @@ -61,6 +61,7 @@ private: struct timeval m_startingTimeStamp; bool m_syncLocked; uint32_t m_frameSize; + bool m_lz4; int m_samplesCount; std::size_t m_tickCount; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui index 5d863e957..81e0be2ca 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui @@ -314,7 +314,7 @@ - + false diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h index 29a4f9d89..28ad15337 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h @@ -170,16 +170,19 @@ public: uint32_t get_tv_usec() const { return m_tv_usec; } bool getSyncLock() const { return m_syncLock; } uint32_t getFrameSize() const { return m_frameSize; } + bool getLz4Compression() const { return m_lz4; } static MsgReportSDRdaemonStreamTiming* create(uint32_t tv_sec, uint32_t tv_usec, bool syncLock, - uint32_t frameSize) + uint32_t frameSize, + bool lz4) { return new MsgReportSDRdaemonStreamTiming(tv_sec, tv_usec, syncLock, - frameSize); + frameSize, + lz4); } protected: @@ -187,16 +190,19 @@ public: uint32_t m_tv_usec; bool m_syncLock; uint32_t m_frameSize; + bool m_lz4; MsgReportSDRdaemonStreamTiming(uint32_t tv_sec, uint32_t tv_usec, bool syncLock, - uint32_t frameSize) : + uint32_t frameSize, + bool lz4) : Message(), m_tv_sec(tv_sec), m_tv_usec(tv_usec), m_syncLock(syncLock), - m_frameSize(frameSize) + m_frameSize(frameSize), + m_lz4(lz4) { } }; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp index 26bb5ad07..d72380057 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp @@ -210,7 +210,8 @@ void SDRdaemonUDPHandler::tick() m_tv_sec, m_tv_usec, m_sdrDaemonBuffer.isSyncLocked(), - m_sdrDaemonBuffer.getFrameSize()); + m_sdrDaemonBuffer.getFrameSize(), + m_sdrDaemonBuffer.isLz4Compressed()); m_outputMessageQueueToGUI->push(report); } }