sdrplay: internal decimation

JvanKatwijk · Jul 19, 2017 · c7efc55 · c7efc55
1 parent 413f1e1
commit c7efc55
Show file tree

Hide file tree

Showing 46 changed files with 5,349 additions and 128 deletions.
diff --git a/Makefile b/Makefile
diff --git a/gui.cpp b/gui.cpp
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the  WFM-RPI
  *    Many of the ideas as implemented in the WFM_RPI are derived from
@@ -125,7 +125,7 @@ int16_t	latency		= 1;
 	fmRate		= inputRate % 256000 == 0 ? 256000 :
 	                  inputRate % 192000 == 0 ? 192000 :
 	                  inputRate % 240000 == 0 ? 240000 :
-	                  inputRate < Khz (400) ? inputRate : 
+	                  inputRate <= Khz (400) ? inputRate : 
 	                  inputRate < Khz (850) ? inputRate / 2 :
 	                  inputRate < Khz (1300) ? inputRate / 4 :
 	                  inputRate < Khz (1900) ? inputRate / 6 :

diff --git a/gui.h b/gui.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C)  2014
+ *    Copyright (C)  2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/fm-constants.h b/includes/fm-constants.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C)  2011, 2012, 2013
+ *    Copyright (C)  2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/fm/fm-decoder.h b/includes/fm/fm-decoder.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2015
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J program suite.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/fm/fm-demodulator.h b/includes/fm/fm-demodulator.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/fm/fm-levels.h b/includes/fm/fm-levels.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/fm/fm-processor.h b/includes/fm/fm-processor.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/output/audio-base.h b/includes/output/audio-base.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C)  2009, 2010, 2011
+ *    Copyright (C)  2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in ESDR are derived from

diff --git a/includes/output/audiosink.h b/includes/output/audiosink.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C)  2009, 2010, 2011
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in ESDR are derived from

diff --git a/includes/output/tcp-streamer.h b/includes/output/tcp-streamer.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/popup-keypad.h b/includes/popup-keypad.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the  SDR-J series.
  *    Many of the ideas as implemented in the SDR-J are derived from

diff --git a/includes/rds/charsets.h b/includes/rds/charsets.h
@@ -1,11 +1,10 @@
 #
 /*
- *
- *    Copyright (C) 2013
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
- *    This file is part of the SDR-J (JSDR).
+ *    This file is part of the SDR-J.
  *    SDR-J is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or

diff --git a/includes/rds/rds-blocksynchronizer.h b/includes/rds/rds-blocksynchronizer.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This part of the FM demodulation software is largely a
  *    rewrite and local adaptation of FMSTACK software

diff --git a/includes/rds/rds-decoder.h b/includes/rds/rds-decoder.h
@@ -1,10 +1,10 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
- *	cuteSDR (c) M Wheatly 2011
+ *	  based on cuteSDR (c) M Wheatly 2011
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/rds/rds-group.h b/includes/rds/rds-group.h
@@ -1,14 +1,10 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
- *    Many of the ideas as implemented in SDR-J are derived from
- *    other work, made available through the GNU general Public License. 
- *    All copyrights of the original authors are recognized.
- *
  *    SDR-J is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or

diff --git a/includes/rds/rds-groupdecoder.h b/includes/rds/rds-groupdecoder.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This part of the FM demodulation software is largely
  *    a rewrite and local adaptation of FMSTACK software
@@ -14,11 +14,7 @@
  *    Last changed    : 09.03.2010
  * 
  *    This file is part of the SDR-J.
- *    Many of the ideas as implemented in SDR-J are derived from
- *    other work, made available through the GNU general Public License. 
- *    All copyrights of the original authors are recognized.
- *
- *    SDR-J is free software; you can redistribute it and/or modify
+  *    SDR-J is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.

diff --git a/includes/various/converter.h b/includes/various/converter.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2010, 2011, 2012
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/fft-filters.h b/includes/various/fft-filters.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/fft.h b/includes/various/fft.h
@@ -1,9 +1,9 @@
 #
 /*
  *
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/fir-filters.h b/includes/various/fir-filters.h
@@ -1,33 +1,30 @@
 #
 /*
  *
- *    Copyright (C) 2010, 2011, 2012
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    JFF Consultancy
+ *    Lazy Chair Computing
  *
- *    This file is part of the JFF SDR (JSDR).
- *    Many of the ideas as implemented in ESDR are derived from
- *    other work, made available through the GNU general Public License. 
- *    All copyrights of the original authors are recognized.
+ *    This file is part of the sdr-j software suite.
  *
- *    JSDR is free software; you can redistribute it and/or modify
+ *    SDR-J is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *
- *    JSDR is distributed in the hope that it will be useful,
+ *    SDR-J is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
  *
  *    You should have received a copy of the GNU General Public License
- *    along with ESDR; if not, write to the Free Software
+ *    along with SDR-J; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 
-#ifndef FIR_FILTERS
-#define FIR_FILTERS
+#ifndef __FIR_FILTERS__
+#define __FIR_FILTERS__
 
 #include	"fm-constants.h"
 #include	<stdlib.h>

diff --git a/includes/various/iir-filters.h b/includes/various/iir-filters.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/oscillator.h b/includes/various/oscillator.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/pllC.h b/includes/various/pllC.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2010, 2011
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/program-list.h b/includes/various/program-list.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2014
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the  SDR-J series.
  *    Many of the ideas as implemented in the SDR-J are derived from

diff --git a/includes/various/resampler.h b/includes/various/resampler.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2010, 2011, 2012
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J.
  *    Many of the ideas as implemented in SDR-J are derived from

diff --git a/includes/various/sincos.h b/includes/various/sincos.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J (JSDR).
  *    Many of the ideas as implemented in JSDR are derived from

diff --git a/includes/various/squelchClass.h b/includes/various/squelchClass.h
@@ -1,8 +1,8 @@
 #
 /*
- *    Copyright (C) 2008, 2009, 2010
+ *    Copyright (C) 2015 .. 2017
  *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair programming
+ *    Lazy Chair Computing
  *
  *    This file is part of the SDR-J (JSDR).
  *    Many of the ideas as implemented in SDR-J are derived from