VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 05:11:49 -05:00
Code Issues Projects Releases Wiki Activity

Remote: pass center frequency on 64 bits

Browse Source
This commit is contained in:
f4exb 2019-04-26 02:46:21 +02:00
parent 7199ff8271
commit 2833eb1b0e
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/remotesink/remotesink.cpp
View File

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

2
plugins/channeltx/remotesource/remotesource.cpp
View File

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

2
plugins/samplesink/remoteoutput/udpsinkfec.cpp
View File

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

2
plugins/samplesource/remoteinput/remoteinputbuffer.cpp
View File

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

18
sdrbase/channel/remotedatablock.h
View File

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