VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 13:00:26 -04:00
Code Issues Projects Releases Wiki Activity

Fixed sample rate recalculation

Browse Source
This commit is contained in:
f4exb 2016-02-23 04:50:15 +01:00
parent 942a7ca803
commit 248d5ecdba
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Readme.md
View File

@ -47,7 +47,7 @@ If you use your own location for gr.osmocom install directory you need to specif
`-DGNURADIO_OSMOSDR_LIBRARIES=/opt/install/gr-osmosdr/lib/libgnuradio-osmosdr.so -DGNURADIO_OSMOSDR_INCLUDE_DIRS=/opt/install/gr-osmosdr/include`
<h3>v4l-\*</h3>
<h3>v4l-*</h3>
Use `cmake ../ -DV4L-RTL=ON` to build the Linux kernel driver for RTL-SDR (Experimental). Needs a recent kernel and libv4l2. Will need extra work to support SDRPlay. Needs `cp KERNEL_SOURCE/include/linux/compiler.h /usr/include/linux/` and `cp KERNEL_SOURCE/include/uapi/linux/videodev2.h /usr/include/uapi/linux/` and package `libv4l-dev`.
@ -99,7 +99,7 @@ If you use your own location for librtlsdr install directory you need to specify
`-DLIBRTLSDR_LIBRARIES=/opt/install/librtlsdr/lib/librtlsdr.so -DLIBRTLSDR_INCLUDE_DIR=/opt/install/librtlsdr/include`
<h1>Plugins for special devices</h1>
<h1>Plugins for special sample sources</h1>
<h2>File input</h2>
@ -113,7 +113,7 @@ Warning: this is experimental and not fully debugged yet.
This is the client side of the SDRdaemon server. See the [SDRdaemon](https://github.com/f4exb/sdrdaemon) project in this Github repository. You must specify the address and UDP port to which the server connects and samples will flow into the SDRangel application (default is `127.0.0.1`port `9090`). It uses the meta data to retrieve the sample flow characteristics such as sample rate and receiveng center frequency.
There is an automated skew rate compensation in place. During rate readjustemnt streaming is suspended for about one second.
There is an automated skew rate compensation in place. During rate readjustemnt streaming can be suspended or signal glitches can occur for about one second.
Note that this plugin does not require any of the hardware support libraries nor the libusb library. It is alwasys available in the list of devices as `SDRdaemon[0]` even if no physical device is connected.

6
plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp
View File

@ -109,7 +109,7 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length)
{
m_sampleBytes = metaData->m_sampleBytes & 0x0F;
uint32_t frameSize = m_iqSampleSize * metaData->m_nbSamples * metaData->m_nbBlocks;
uint32_t sampleRate = metaData->m_sampleRate;
int sampleRate = metaData->m_sampleRate;
if (sampleRate != m_sampleRateStream)
{
@ -120,7 +120,9 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length)
sampleRate = m_sampleRate;
}
sampleRate += (((int) (sampleRate * m_skewRate)) / m_rateDivider) * m_rateDivider;
sampleRate += sampleRate * m_skewRate;
sampleRate = (sampleRate / m_rateDivider) * m_rateDivider;
//sampleRate += (((int) (sampleRate * m_skewRate)) / m_rateDivider) * m_rateDivider;
if (metaData->m_sampleBytes & 0x10)
{

9
plugins/samplesource/sdrdaemon/sdrdaemongui.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>343</width>
<width>375</width>
<height>207</height>
</rect>
</property>
@ -120,11 +120,6 @@
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
</font>
</property>
<property name="toolTip">
<string>Nominal sample rate from stream data (kS/s)</string>
</property>
@ -214,7 +209,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>Record absolute time</string>
<string>Stream timestamp</string>
</property>
<property name="text">
<string>2015-01-01 00:00:00.000</string>