Commit Graph

168 Commits

Author SHA1 Message Date
Charles J. Cliffe
fa521ac30d Switch from portaudio callback to stream write
It’s already in a thread, not sure if callback was helping?
2014-11-22 22:56:33 -05:00
Charles J. Cliffe
39ba38b82a Cleanup / Reformat 2014-11-22 22:33:32 -05:00
Charles J. Cliffe
58708a720e SDR->Demod->Audio chain all using std::thread
2% CPU usage drop on 3.2G i7 desktop
2014-11-22 22:17:33 -05:00
Charles J. Cliffe
26168a2713 SDR and Audio thread now using std::thread
Next up, demod thread..
2014-11-22 20:57:06 -05:00
Charles J. Cliffe
35830afed0 new thread queue testing 2014-11-21 21:50:14 -05:00
Charles J. Cliffe
99aa87df63 Now working on gcc4.8, x86-64 on windows
Had to make my own portaudio and rtl-sdr binaries. The available
packages weren't compatible somehow.  Also wxWidgets wxPack doesn't
include OpenGL support but it's easy enough to compile.
2014-11-21 00:49:41 -05:00
Charles J. Cliffe
f6f4c3c057 Revert "switch from portaudio -> libao"
This reverts commit 8972e87765.
2014-11-20 20:28:40 -05:00
Charles J. Cliffe
28afe9d3be Merge branch 'dynamic_demod' of https://github.com/cjcliffe/CubicSDR into dynamic_demod
Conflicts:
	CMakeLists.txt
2014-11-20 20:12:38 -05:00
Charles J. Cliffe
9706ed8f7e Update to 64-bit, add test threadqueue 2014-11-20 20:10:28 -05:00
Charles J. Cliffe
8972e87765 switch from portaudio -> libao 2014-11-19 23:41:57 -05:00
Charles J. Cliffe
a9d46b7624 Preparing to change threading model 2014-11-19 17:41:49 -05:00
Charles J. Cliffe
9150439283 Thread priority bump, main thread sleep 2014-11-18 19:02:07 -05:00
Charles J. Cliffe
054ac3f840 Attempting to fix OSX portaudio jitter.. 2014-11-18 18:35:40 -05:00
Charles J. Cliffe
6624ec11a3 IQ->Demod->Audio threads now chained
No longer passing anything through the main thread which was causing
audio and IQ interrupts on UI events -- hopefully improves OSX jitter.

SDRThread can now have unlimited Demodulator bindings.. :)
2014-11-18 18:00:06 -05:00
Charles J. Cliffe
75c51f1236 missing return params 2014-11-17 23:25:14 -05:00
Charles J. Cliffe
dd42d112c9 Demodulator can now be initialized with parameters 2014-11-17 22:58:56 -05:00
Charles J. Cliffe
7f5031b6e5 cleanup 2014-11-17 21:35:10 -05:00
Charles J. Cliffe
532968a818 Source folder cleanup 2014-11-17 21:29:27 -05:00
Charles J. Cliffe
8c6eea44b8 fix win32 include on non win32 2014-11-17 19:48:28 -05:00
Charles J. Cliffe
7e174ab1dd All threads now using transaction objects and queue
Additional cleanup, remove outdated IQBufferThread experiment
2014-11-17 19:37:53 -05:00
Charles J. Cliffe
44542dd878 Merge pull request #5 from cjcliffe/master
Win32 timer class fix
2014-11-17 18:17:10 -05:00
Charles J. Cliffe
e91696c012 SDRThread now passes IQ Data transaction object
Also using sdr thread queue and standard thread event to send payload
now.
2014-11-17 18:14:37 -05:00
Charles J. Cliffe
b78fefb221 Win32 timer class fix 2014-11-17 18:12:20 -05:00
Charles J. Cliffe
a7d7ec0d93 Frame rate limiter 2014-11-16 23:20:48 -05:00
Charles J. Cliffe
82b6b67f3c Re-connect scope to demodulator output data 2014-11-16 19:14:15 -05:00
Charles J. Cliffe
1950c3109a Balanced thread performance w/ CPU usage
Seems smooth and responsive now.
2014-11-16 19:02:40 -05:00
Charles J. Cliffe
739854cd7f Demodulator and Audio threads working
Data now flows from SDR IQ Thread -> Demodulator Thread -> Audio Thread.
Seems to have added a significant audio delay though..
2014-11-16 17:33:54 -05:00
Charles J. Cliffe
2a34fc9cf9 New demodulator thread code 2014-11-16 16:51:45 -05:00
Charles J. Cliffe
16a9add9ef New threads partly implemented
Mid transition from 1 to 3 threads: SDR IQ, Demod and Audio separated,
AppFrame routes.
2014-11-16 16:50:37 -05:00
Charles J. Cliffe
2e5bdc2646 Separate visual components Scope/Spectrum/Waterfall
Each now on it's own canvas with shared GL Context
2014-11-15 23:41:41 -05:00
Charles J. Cliffe
541ab5614c Separate Primary GL Context and visuals canvas
Can now create multiple GL canvases with shared context
2014-11-12 21:55:11 -05:00
Charles J. Cliffe
02cd0f6516 FM Demodulator fixes
was an implicit float to int in the primary filter cutoff value causing
distortion.
2014-11-12 19:09:22 -05:00
Charles J. Cliffe
adc6fcce85 Waterfall tweaking, automatic range adjustment 2014-11-12 00:28:20 -05:00
Charles J. Cliffe
810533750f waterfall optimize, fm demod audio filtering
Moved waterfall increment into rendering to reduce audio processing
impact.

Added another test filter and resample stage to FM demod experiment to
clean up audio and remove high pitch on stereo channels until it can be
demodulated.
2014-11-11 21:42:18 -05:00
Charles J. Cliffe
86dadb8f2c Waterfall now being displayed 2048x512
Uses indexed color scheme, FFT image is byte array
2014-11-11 20:25:16 -05:00
Charles J. Cliffe
fe2e56231d gradient util, started waterfall implementation 2014-11-11 08:11:12 -05:00
Charles J. Cliffe
b270379361 Honor PA_RECOMMENDED_OUTPUT_DEVICE on Win32
PortAudio defaults to output on my Virtual Cable INPUT #A?? -- strange
but this gets around it neatly for now.
2014-11-09 21:21:11 -05:00
Charles J. Cliffe
9913629a7e Use first available RTL device 2014-11-09 20:55:21 -05:00
Charles J. Cliffe
a78a862cba Moved demodulation code into it's own class
Preparing to make it more dynamic, able to tune multiple frequencies at
once and support remaining demodulation modes (AM, USB, LSB)
2014-11-09 18:12:02 -05:00
Charles J. Cliffe
14d7e431bd PortAudio adjustments for OSX
Seems to be some sort of audio init race condition, intermittent crash
on startup
2014-11-09 05:18:33 -05:00
Charles J. Cliffe
b70b659a5f Removed OpenAL and now using PortAudio 2014-11-09 04:38:33 -05:00
Charles J. Cliffe
c3c204bc04 Pitch issue fixed, OpenAL weirdness
Might be time to retire OpenAL -- is behaving strangely on output
stream..
2014-11-08 20:50:28 -05:00
Charles J. Cliffe
5554c92199 minor variable changes
demodulated frequency still shifted by about half?
2014-11-08 18:48:03 -05:00
Charles J. Cliffe
6c1ec6eba2 new demod test
working but frequency seems to be shifted?
2014-11-08 17:08:00 -05:00
Charles J. Cliffe
bd7d748e58 Experimenting with FM demod options 2014-11-07 13:51:43 -05:00
Charles J. Cliffe
44e7744855 filtering / fm demod experiments 2014-11-07 01:47:57 -05:00
Charles J. Cliffe
b6a658b819 more liquid dsp experiments 2014-11-07 00:27:06 -05:00
Charles J. Cliffe
428525e807 experimental liquid-dsp testing 2014-11-06 21:30:47 -05:00
Charles J. Cliffe
2092505e20 Adding buffer and testing demod functionality 2014-11-06 01:33:59 -05:00
Charles J. Cliffe
e0344d8efc Now playing FM through OpenAL!
great success!
2014-11-05 21:05:56 -05:00
Charles J. Cliffe
f071b2b025 Added OpenAL /w audio init test 2014-11-05 19:10:18 -05:00
Charles J. Cliffe
d91cffbe58 Now plotting spectrum and demodulated FM 2014-11-05 18:12:42 -05:00
Charles J. Cliffe
39afec2172 testing fm demodulation 2014-11-04 23:05:04 -05:00
Charles J. Cliffe
f22a929828 Started demodulator class based on rtl_fm.c 2014-11-04 21:55:20 -05:00
Charles J. Cliffe
7eae5517fa remove example code 2014-11-04 19:54:00 -05:00
Charles J. Cliffe
a8f1a87505 Can now control SDRThread freq. via thread task
Basic left/right keys bound for shifting frequency test.
2014-11-04 19:52:11 -05:00
Charles J. Cliffe
9896808b22 Clean-up / re-factor
thread queue and task handler compiling and program functional
2014-11-04 18:39:08 -05:00
Charles J. Cliffe
8dee90cd63 Starting work on threading model, incomplete
Includes experimental averaging of spectrum
2014-11-04 17:25:04 -05:00
Charles J. Cliffe
1cd8565fb3 Experiment to remove DC / other spikes
Seemed logical to use the repeating parts of the forward/back FFT
results to overlap and cancel out spikes -- seems to work?
2014-10-31 20:41:49 -04:00
Charles J. Cliffe
c4099cb690 Re-align spectrum view
DC spike now showing?
2014-10-31 19:10:53 -04:00
Charles J. Cliffe
eb4e10140a Now showing 2.5MHz bandwidth over FM ranges
Moves frequency back/forth over the FM range
2014-10-31 01:37:01 -04:00
Charles J. Cliffe
7fe286cf0c Now plotting IQ spectrum
seems to only be showing half the bandwidth..
2014-10-30 22:51:33 -04:00
Charles J. Cliffe
2ef8010438 Rendering rtl-sdr I/Q data to the GL canvas 2014-10-28 22:59:17 -04:00
Charles J. Cliffe
23f8c6a197 Now passing IQ data from SDR Thread to AppFrame 2014-10-28 21:39:59 -04:00
Charles J. Cliffe
0e25cbcc1a OSX now compiling and working 2014-10-27 23:52:25 -04:00
Charles J. Cliffe
5f0bc4f4f8 fix issue with SDRThread logging 2014-10-27 21:26:12 -04:00
Charles J. Cliffe
d27d91c1ef Code re-factor / cleanup
GL Window now ready to draw signal lines
2014-10-27 21:22:29 -04:00
Charles J. Cliffe
c2a37e7622 Initial experiment /w wxWidgets opengl view and sdr sampling.
Includes working rtl-sdr sampling thread test.
2014-10-27 20:05:40 -04:00