mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

SDRdaemonFEC plugin: clean up commented out code

pull/27/head
f4exb 2016-07-28 23:50:18 +02:00
rodzic 904577eae8
commit 59a9bb0a8e
2 zmienionych plików z 0 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp
Wyświetl plik

@ -187,9 +187,6 @@ void SDRdaemonFECBuffer::checkSlotData(int slotIndex)
<< " m_blockCount: " << m_decoderSlots[slotIndex].m_blockCount << " m_blockCount: " << m_decoderSlots[slotIndex].m_blockCount
<< " m_recoveryCount: " << m_decoderSlots[slotIndex].m_recoveryCount; << " m_recoveryCount: " << m_decoderSlots[slotIndex].m_recoveryCount;
} }
// copy retrieved data to main buffer
copyOriginalBlocks(slotIndex);
} }
void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) void SDRdaemonFECBuffer::writeData(char *array, uint32_t length)
@ -233,8 +230,6 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length)
if (blockIndex < m_nbOriginalBlocks) // original data if (blockIndex < m_nbOriginalBlocks) // original data
{ {
m_decoderSlots[decoderIndex].m_cm256DescriptorBlocks[blockCount].Block = (void *) storeOriginalBlock(decoderIndex, blockIndex, superBlock->protectedBlock); m_decoderSlots[decoderIndex].m_cm256DescriptorBlocks[blockCount].Block = (void *) storeOriginalBlock(decoderIndex, blockIndex, superBlock->protectedBlock);
// m_decoderSlots[decoderIndex].m_originalBlocks[blockIndex] = superBlock->protectedBlock;
// m_decoderSlots[decoderIndex].m_cm256DescriptorBlocks[blockCount].Block = (void *) &m_decoderSlots[decoderIndex].m_originalBlocks[blockIndex];
m_decoderSlots[decoderIndex].m_originalCount++; m_decoderSlots[decoderIndex].m_originalCount++;
} }
else // recovery data else // recovery data
@ -299,7 +294,6 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length)
} }
storeOriginalBlock(decoderIndex, blockIndex, *recoveredBlock); storeOriginalBlock(decoderIndex, blockIndex, *recoveredBlock);
// m_decoderSlots[decoderIndex].m_originalBlocks[blockIndex] = *recoveredBlock;
qDebug() << "SDRdaemonFECBuffer::writeData: recovered block #" << blockIndex; qDebug() << "SDRdaemonFECBuffer::writeData: recovered block #" << blockIndex;
} // restore missing blocks } // restore missing blocks
@ -308,7 +302,6 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length)
if (m_decoderSlots[decoderIndex].m_metaRetrieved) // block zero with its meta data has been received if (m_decoderSlots[decoderIndex].m_metaRetrieved) // block zero with its meta data has been received
{ {
// MetaDataFEC *metaData = (MetaDataFEC *) &m_decoderSlots[decoderIndex].m_originalBlocks[0];
MetaDataFEC *metaData = getMetaData(decoderIndex); MetaDataFEC *metaData = getMetaData(decoderIndex);
if (!(*metaData == m_currentMeta)) if (!(*metaData == m_currentMeta))

5
plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h
Wyświetl plik

@ -259,11 +259,6 @@ private:
memset((void *) m_frames[slotIndex].m_blocks, 0, (m_nbOriginalBlocks - 1) * sizeof(ProtectedBlock)); memset((void *) m_frames[slotIndex].m_blocks, 0, (m_nbOriginalBlocks - 1) * sizeof(ProtectedBlock));
} }
inline void copyOriginalBlocks(int slotIndex)
{
// memcpy((void *) &m_frames[slotIndex].m_blocks[0], (const void *) &m_decoderSlots[slotIndex].m_originalBlocks[1], (m_nbOriginalBlocks - 1)*sizeof(ProtectedBlock));
}
void initDecodeAllSlots(); void initDecodeAllSlots();
void initReadIndex(); void initReadIndex();
void rwCorrectionEstimate(int slotIndex); void rwCorrectionEstimate(int slotIndex);