VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-01 05:22:26 -04:00
Code Issues Projects Releases Wiki Activity

Broken.

Browse Source
This commit is contained in:
John Greb 2015-05-18 21:43:04 +01:00
parent f2c1b6e11e
commit 6547711c16
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/samplesource/v4l-msi/v4lsource.cpp
View File

@ -78,14 +78,16 @@ V4LThread::OpenSource(const char *filename)
qCritical("Cannot open /dev/swradio0 :%d", fd); qCritical("Cannot open /dev/swradio0 :%d", fd);
return; return;
} }
// sampletype depends on samplerate. Set that first
set_sample_rate((double)SAMPLERATE);
set_center_freq( (double)centerFreq );
pixelformat = V4L2_PIX_FMT_SDR_CS14LE; pixelformat = V4L2_PIX_FMT_SDR_CS14LE;
qCritical("Want Pixelformat : S14");
CLEAR(fmt); CLEAR(fmt);
fmt.type = V4L2_BUF_TYPE_SDR_CAPTURE; fmt.type = V4L2_BUF_TYPE_SDR_CAPTURE;
fmt.fmt.sdr.pixelformat = pixelformat; fmt.fmt.sdr.pixelformat = pixelformat;
xioctl(fd, VIDIOC_S_FMT, &fmt); xioctl(fd, VIDIOC_G_FMT, &fmt);
qCritical("Got Pixelformat : %4.4s", (char *)&fmt.fmt.sdr.pixelformat); qCritical(" Expecting format CS14LE, got : %4.4s", (char *)&fmt.fmt.sdr.pixelformat);
CLEAR(req); CLEAR(req);
req.count = 8; req.count = 8;
@ -118,9 +120,6 @@ V4LThread::OpenSource(const char *filename)
buf.index = i; buf.index = i;
xioctl(fd, VIDIOC_QBUF, &buf); xioctl(fd, VIDIOC_QBUF, &buf);
} }
set_sample_rate((double)SAMPLERATE);
set_center_freq( (double)centerFreq );
// start streaming // start streaming
type = V4L2_BUF_TYPE_SDR_CAPTURE; type = V4L2_BUF_TYPE_SDR_CAPTURE;
xioctl(fd, VIDIOC_STREAMON, &type); xioctl(fd, VIDIOC_STREAMON, &type);
@ -233,17 +232,19 @@ V4LThread::work(int noutput_items)
unsigned int pos = 0; unsigned int pos = 0;
// MSI format is 252 sample pairs :( 63 * 4) * 4bytes // MSI format is 252 sample pairs :( 63 * 4) * 4bytes
it = m_convertBuffer.begin(); it = m_convertBuffer.begin();
if (recebuf_len >= 16) { // in bytes if (recebuf_len >= 8) { // in bytes
b = (uint16_t *) recebuf_ptr; b = (uint16_t *) recebuf_ptr;
unsigned int len = 8 * noutput_items; // decimation (i+q * 4 : cmplx) unsigned int len = 8 * noutput_items; // decimation (i+q * 4 : cmplx)
if (len * 2 > recebuf_len) if (len * 2 > recebuf_len)
len = recebuf_len / 2; len = recebuf_len / 2;
// Decimate by two for lower cpu usage // Decimate by four for lower cpu usage
for (pos = 0; pos < len - 7; pos += 8) { // ??? seems to have gone a bit wrong.
xreal = CASTUP(b[pos+0]<<2) + CASTUP(b[pos+2]<<2) for (pos = 0; pos < len - 3; pos += 4) {
+ CASTUP(b[pos+4]<<2) + CASTUP(b[pos+6]<<2); xreal = CASTUP(b[pos+0]<<2) + CASTUP(b[pos+1]<<2)
yimag = CASTUP(b[pos+1]<<2) + CASTUP(b[pos+3]<<2) + CASTUP(b[pos+2]<<2) + CASTUP(b[pos+3]<<2);
+ CASTUP(b[pos+5]<<2) + CASTUP(b[pos+7]<<2); yimag = 0;
//CASTUP(b[pos+1]<<2) + CASTUP(b[pos+3]<<2)
//+ CASTUP(b[pos+5]<<2) + CASTUP(b[pos+7]<<2);
Sample s( (qint16)(xreal >> 2) , (qint16)(yimag >> 2) ); Sample s( (qint16)(xreal >> 2) , (qint16)(yimag >> 2) );
*it = s; *it = s;
it++; it++;
@ -253,8 +254,8 @@ V4LThread::work(int noutput_items)
recebuf_ptr = (void*)(b + pos); recebuf_ptr = (void*)(b + pos);
} }
// return now if there is still data in buffer, else free buffer and get another. // return now if there is still data in buffer, else free buffer and get another.
if (recebuf_len >= 16) if (recebuf_len >= 8)
return pos / 8; return pos / 4;
{ // free buffer, if there was one. { // free buffer, if there was one.
if (pos > 0) { if (pos > 0) {
CLEAR(buf); CLEAR(buf);
@ -291,5 +292,5 @@ V4LThread::work(int noutput_items)
recebuf_len = buf.bytesused; recebuf_len = buf.bytesused;
recebuf_mmap_index = buf.index; recebuf_mmap_index = buf.index;
} }
return pos / 8; return pos / 4;
} }

1
plugins/samplesource/v4l-msi/v4lthread.h
View File

@ -26,7 +26,6 @@
// lowest samplerate in the kernel is 1.2M, but this works better // lowest samplerate in the kernel is 1.2M, but this works better
#define SAMPLERATE 1536000 #define SAMPLERATE 1536000
//#define SAMPLERATE 768000
#define BLOCKSIZE 8192 #define BLOCKSIZE 8192
class V4LThread : public QThread { class V4LThread : public QThread {