VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 07:07:48 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemon: Set effective number of sample bits as deprecated

Browse Source
This commit is contained in:
f4exb 2018-08-21 16:04:10 +02:00
parent 22b5f7fdde
commit 157a77835e
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdrdaemon/channel/sdrdaemonchannelsink.cpp
View File

@ -48,7 +48,6 @@ SDRDaemonChannelSink::SDRDaemonChannelSink(DeviceSourceAPI *deviceAPI) :
m_centerFrequency(0), m_centerFrequency(0),
m_sampleRate(48000), m_sampleRate(48000),
m_sampleBytes(SDR_RX_SAMP_SZ/8), m_sampleBytes(SDR_RX_SAMP_SZ/8),
m_sampleBits(8),
m_nbBlocksFEC(0), m_nbBlocksFEC(0),
m_txDelay(100) m_txDelay(100)
{ {
@ -105,7 +104,7 @@ void SDRDaemonChannelSink::feed(const SampleVector::const_iterator& begin, const
metaData.m_centerFrequency = m_centerFrequency; metaData.m_centerFrequency = m_centerFrequency;
metaData.m_sampleRate = m_sampleRate; metaData.m_sampleRate = m_sampleRate;
metaData.m_sampleBytes = m_sampleBytes; metaData.m_sampleBytes = m_sampleBytes;
metaData.m_sampleBits = m_sampleBits; metaData.m_sampleBits = 0; // TODO: deprecated
metaData.m_nbOriginalBlocks = SDRDaemonNbOrginalBlocks; metaData.m_nbOriginalBlocks = SDRDaemonNbOrginalBlocks;
metaData.m_nbFECBlocks = m_nbBlocksFEC; metaData.m_nbFECBlocks = m_nbBlocksFEC;
metaData.m_tv_sec = tv.tv_sec; metaData.m_tv_sec = tv.tv_sec;

2
sdrdaemon/channel/sdrdaemonchannelsink.h
View File

@ -63,7 +63,6 @@ public:
void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; } void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; }
void setSampleBytes(uint8_t sampleBytes) { m_sampleBytes = sampleBytes; } void setSampleBytes(uint8_t sampleBytes) { m_sampleBytes = sampleBytes; }
void setSampleBits(uint8_t sampleBits) { m_sampleBits = sampleBits; }
void setNbBlocksFEC(int nbBlocksFEC); void setNbBlocksFEC(int nbBlocksFEC);
void setTxDelay(int txDelay); void setTxDelay(int txDelay);
@ -92,7 +91,6 @@ private:
uint64_t m_centerFrequency; uint64_t m_centerFrequency;
uint32_t m_sampleRate; uint32_t m_sampleRate;
uint8_t m_sampleBytes; uint8_t m_sampleBytes;
uint8_t m_sampleBits;
int m_nbBlocksFEC; int m_nbBlocksFEC;
int m_txDelay; int m_txDelay;
}; };

2
sdrdaemon/channel/sdrdaemondatablock.h
View File

@ -37,7 +37,7 @@ struct SDRDaemonMetaDataFEC
uint32_t m_centerFrequency; //!< 4 center frequency in kHz uint32_t m_centerFrequency; //!< 4 center frequency in kHz
uint32_t m_sampleRate; //!< 8 sample rate in Hz uint32_t m_sampleRate; //!< 8 sample rate in Hz
uint8_t m_sampleBytes; //!< 9 number of bytes per sample (2 or 3) uint8_t m_sampleBytes; //!< 9 number of bytes per sample (2 or 3)
uint8_t m_sampleBits; //!< 10 number of effective bits per sample (8 t0 24) 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_nbOriginalBlocks; //!< 11 number of blocks with original (protected) data
uint8_t m_nbFECBlocks; //!< 12 number of blocks carrying FEC uint8_t m_nbFECBlocks; //!< 12 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; //!< 16 seconds of timestamp at start time of super-frame processing