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

Remote: pass center frequency on 64 bits

pull/340/head
f4exb 2019-04-26 02:46:21 +02:00
rodzic 7199ff8271
commit 2833eb1b0e
5 zmienionych plików z 13 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
plugins/channelrx/remotesink/remotesink.cpp
Wyświetl plik

@ -143,7 +143,7 @@ void RemoteSink::feed(const SampleVector::const_iterator& begin, const SampleVec
}
boost::crc_32_type crc32;
crc32.process_bytes(&metaData, 20);
crc32.process_bytes(&metaData, 24);
metaData.m_crc32 = crc32.checksum();
RemoteSuperBlock& superBlock = m_dataBlock->m_superBlocks[0]; // first block
superBlock.init();

2
plugins/channeltx/remotesource/remotesource.cpp
Wyświetl plik

@ -321,7 +321,7 @@ void RemoteSource::handleDataBlock(RemoteDataBlock* dataBlock)
{
RemoteMetaDataFEC *metaData = (RemoteMetaDataFEC *) &(dataBlock->m_superBlocks[0].m_protectedBlock);
boost::crc_32_type crc32;
crc32.process_bytes(metaData, 20);
crc32.process_bytes(metaData, 24);
if (crc32.checksum() == metaData->m_crc32)
{

2
plugins/samplesink/remoteoutput/udpsinkfec.cpp
Wyświetl plik

@ -134,7 +134,7 @@ void UDPSinkFEC::write(const SampleVector::iterator& begin, uint32_t sampleChunk
metaData.m_tv_usec = ts_usecs % 1000000UL;
boost::crc_32_type crc32;
crc32.process_bytes(&metaData, 20);
crc32.process_bytes(&metaData, 24);
metaData.m_crc32 = crc32.checksum();

2
plugins/samplesource/remoteinput/remoteinputbuffer.cpp
Wyświetl plik

@ -284,7 +284,7 @@ void RemoteInputBuffer::writeData(char *array)
RemoteMetaDataFEC *metaData = (RemoteMetaDataFEC *) recoveredBlock;
boost::crc_32_type crc32;
crc32.process_bytes(metaData, 20);
crc32.process_bytes(metaData, 24);
if (crc32.checksum() == metaData->m_crc32)
{

18
sdrbase/channel/remotedatablock.h
Wyświetl plik

@ -38,16 +38,16 @@
#pragma pack(push, 1)
struct RemoteMetaDataFEC
{
uint32_t m_centerFrequency; //!< 4 center frequency in kHz
uint32_t m_sampleRate; //!< 8 sample rate in Hz
uint8_t m_sampleBytes; //!< 9 4 LSB: number of bytes per sample (2 or 4)
uint8_t m_sampleBits; //!< 10 number of effective bits per sample (deprecated)
uint8_t m_nbOriginalBlocks; //!< 11 number of blocks with original (protected) data
uint8_t m_nbFECBlocks; //!< 12 number of blocks carrying FEC
uint64_t m_centerFrequency; //!< 8 center frequency in kHz
uint32_t m_sampleRate; //!< 12 sample rate in Hz
uint8_t m_sampleBytes; //!< 13 4 LSB: number of bytes per sample (2 or 4)
uint8_t m_sampleBits; //!< 14 number of effective bits per sample (deprecated)
uint8_t m_nbOriginalBlocks; //!< 15 number of blocks with original (protected) data
uint8_t m_nbFECBlocks; //!< 16 number of blocks carrying FEC
uint32_t m_tv_sec; //!< 16 seconds of timestamp at start time of super-frame processing
uint32_t m_tv_usec; //!< 20 microseconds of timestamp at start time of super-frame processing
uint32_t m_crc32; //!< 24 CRC32 of the above
uint32_t m_tv_sec; //!< 20 seconds of timestamp at start time of super-frame processing
uint32_t m_tv_usec; //!< 24 microseconds of timestamp at start time of super-frame processing
uint32_t m_crc32; //!< 28 CRC32 of the above
bool operator==(const RemoteMetaDataFEC& rhs)
{