From 57231cdb32ba1602b535e66c1bb9c3068ccd53e1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 7 Jul 2016 02:25:32 +0200 Subject: [PATCH] SDRdaemonFEC support. removed output meta --- plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp | 7 ------- plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h | 2 -- .../samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp index e7859bb16..cda24a6ec 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp @@ -37,7 +37,6 @@ SDRdaemonFECBuffer::SDRdaemonFECBuffer(uint32_t throttlems) : m_bufferLenSec(0.0f) { m_currentMeta.init(); - m_outputMeta.init(); m_framesNbBytes = nbDecoderSlots * sizeof(BufferFrame); m_wrDeltaEstimate = m_framesNbBytes / 2; m_paramsCM256.BlockBytes = sizeof(ProtectedBlock); // never changes @@ -95,12 +94,6 @@ void SDRdaemonFECBuffer::initDecodeSlot(int slotIndex) int pseudoWriteIndex = slotIndex * sizeof(BufferFrame); m_wrDeltaEstimate = pseudoWriteIndex - m_readIndex; - if (m_decoderSlots[slotIndex].m_metaRetrieved) { // meta data was retrieved in the current slot - m_outputMeta = m_decoderSlots[slotIndex].m_blockZero.m_metaData; - } else { - m_outputMeta = m_currentMeta; // use stored current meta - } - // collect stats before voiding the slot m_curNbBlocks = m_decoderSlots[slotIndex].m_blockCount; m_curNbRecovery = m_decoderSlots[slotIndex].m_recoveryCount; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h index 86429975b..233926669 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h @@ -96,7 +96,6 @@ public: // meta data const MetaDataFEC& getCurrentMeta() const { return m_currentMeta; } - const MetaDataFEC& getOutputMeta() const { return m_outputMeta; } // stats int getCurNbBlocks() const { return m_curNbBlocks; } @@ -156,7 +155,6 @@ private: }; MetaDataFEC m_currentMeta; //!< Stored current meta data - MetaDataFEC m_outputMeta; //!< Meta data corresponding to currently served frame cm256_encoder_params m_paramsCM256; //!< CM256 decoder parameters block DecoderSlot m_decoderSlots[nbDecoderSlots]; //!< CM256 decoding control/buffer slots BufferFrame m_frames[nbDecoderSlots]; //!< Samples buffer diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp index 28320d48d..ea4bed67b 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp @@ -143,7 +143,7 @@ void SDRdaemonFECUDPHandler::dataReadyRead() void SDRdaemonFECUDPHandler::processData() { m_sdrDaemonBuffer.writeData(m_udpBuf, m_udpReadBytes); - const SDRdaemonFECBuffer::MetaDataFEC& metaData = m_sdrDaemonBuffer.getOutputMeta(); + const SDRdaemonFECBuffer::MetaDataFEC& metaData = m_sdrDaemonBuffer.getCurrentMeta(); bool change = false; m_tv_sec = metaData.m_tv_sec;