Packman Build Service PMBS

qt-dab.changes Changed

qt-dab.spec Changed

qt-dab-2.02-missing-q_object.patch Added

_service Changed

_service:download_url:qt-dab-2.01.tar.gz/includes/support/viterbi-768.h Deleted

@@ -1,73 +0,0 @@
-#
-#ifndef	__VITERBI_768__
-#define	__VITERBI_768__
-/*
- * 	Viterbi.h according to the SPIRAL project
- */
-#include	"dab-constants.h"
-
-//	For our particular viterbi decoder, we have
-#define	RATE	4
-#define NUMSTATES 64
-#define DECISIONTYPE uint32_t
-//#define DECISIONTYPE uint8_t
-//#define DECISIONTYPE_BITSIZE 8
-#define DECISIONTYPE_BITSIZE 32
-#define COMPUTETYPE uint32_t
-
-//decision_t is a BIT vector
-typedef union {
-	DECISIONTYPE t[NUMSTATES/DECISIONTYPE_BITSIZE];
-	uint32_t w[NUMSTATES/32];
-	uint16_t s[NUMSTATES/16];
-	uint8_t c[NUMSTATES/8];
-} decision_t __attribute__ ((aligned (16)));
-
-typedef union {
-	COMPUTETYPE t[NUMSTATES];
-} metric_t __attribute__ ((aligned (16)));
-
-/* State info for instance of Viterbi decoder
- */
-
-struct v {
-/* path metric buffer 1 */
-	__attribute__ ((aligned (16))) metric_t metrics1;
-/* path metric buffer 2 */
-	__attribute__ ((aligned (16))) metric_t metrics2;
-/* Pointers to path metrics, swapped on every bit */
-	metric_t *old_metrics,*new_metrics;
-	decision_t *decisions;   /* decisions */
-};
-
-class	viterbi_768 {
-public:
-		viterbi_768	(int16_t, bool spiral = false);
-		~viterbi_768	(void);
-	void	deconvolve	(int16_t *, uint8_t *);
-private:
-
-	bool		spiral;
-	struct v	vp;
-	COMPUTETYPE Branchtab	[NUMSTATES / 2 * RATE] __attribute__ ((aligned (16)));
-//	int	parityb		(uint8_t);
-	int	parity		(int);
-	void	partab_init	(void);
-//	uint8_t	Partab	[256];
-	void	init_viterbi	(struct v *, int16_t);
-	void	update_viterbi_blk_GENERIC	(struct v *, COMPUTETYPE *,
-	                                         int16_t);
-	void	update_viterbi_blk_SPIRAL	(struct v *, COMPUTETYPE *,
-	                                         int16_t);
-	void	chainback_viterbi (struct v *, uint8_t *, int16_t, uint16_t);
-	struct v *viterbi_alloc (int32_t);
-	void	BFLY		(int32_t, int, COMPUTETYPE *,
-	                         struct v *, decision_t *);
-//	uint8_t *bits;
-	uint8_t *data;
-	COMPUTETYPE *symbols;
-	int16_t	frameBits;
-};
-
-#endif
-

_service:download_url:qt-dab-2.01.tar.gz/includes/support/viterbi.h-old Deleted

@@ -1,63 +0,0 @@
-#
-#ifndef	__VITERBI__
-#define	__VITERBI__
-/*
- * 	Viterbi.h according to the SPIRAL project
- */
-#include	"dab-constants.h"
-
-//	For our particular viterbi decoder, we have
-class	viterbi {
-#define	RATE		4
-#define NUMSTATES	64
-#define BITS_PER_BYTE	8
-
-//	decision_t is a BIT vector
-typedef union {
-	uint8_t t  [NUMSTATES / BITS_PER_BYTE];
-	uint32_t w [NUMSTATES / 32];
-	uint16_t s [NUMSTATES / 16];
-	uint8_t c  [NUMSTATES / 8];
-} decision_t __attribute__ ((aligned (16)));
-
-typedef union {
-	int16_t t[NUMSTATES];
-} metric_t __attribute__ ((aligned (16)));
-
-/*
- *	 State info for instance of Viterbi decoder
- */
-
-struct v {
-/* path metric buffer 1 */
-	__attribute__ ((aligned (16))) metric_t metrics1;
-/* path metric buffer 2 */
-	__attribute__ ((aligned (16))) metric_t metrics2;
-/* Pointers to path metrics, swapped on every bit */
-	metric_t *old_metrics,*new_metrics;
-	decision_t *decisions;   /* decisions */
-};
-
-public:
-		viterbi		(int16_t);
-		~viterbi	(void);
-	void	deconvolve	(int16_t *, uint8_t *);
-private:
-
-	struct v	vp;
-	int16_t Branchtab	[NUMSTATES / 2 * RATE] __attribute__ ((aligned (16)));
-	int16_t	parity		(int16_t);
-	void	init_viterbi	(struct v *, int16_t);
-	void	update_viterbi_blk_GENERIC	(struct v *, int16_t *,
-	                                         int16_t);
-
-	void	chainback_viterbi (struct v *, uint8_t *, int16_t, uint16_t);
-	void	BFLY		(int32_t, int, int16_t *,
-	                         struct v *, decision_t *);
-	uint8_t *data;
-	int16_t *symbols;
-	int16_t	frameBits;
-};
-
-#endif
-

_service:download_url:qt-dab-2.01.tar.gz/includes/support/viterbi_768 Deleted

_service:download_url:qt-dab-2.01.tar.gz/includes/support/viterbi_768/viterbi-768.h Deleted

@@ -1,73 +0,0 @@
-#
-#ifndef	__VITERBI_768__
-#define	__VITERBI_768__
-/*
- * 	Viterbi.h according to the SPIRAL project
- */
-#include	"dab-constants.h"
-
-//	For our particular viterbi decoder, we have
-#define	RATE	4
-#define NUMSTATES 64
-#define DECISIONTYPE uint32_t
-//#define DECISIONTYPE uint8_t
-//#define DECISIONTYPE_BITSIZE 8
-#define DECISIONTYPE_BITSIZE 32
-#define COMPUTETYPE uint32_t
-
-//decision_t is a BIT vector
-typedef union {
-	DECISIONTYPE t[NUMSTATES/DECISIONTYPE_BITSIZE];
-	uint32_t w[NUMSTATES/32];
-	uint16_t s[NUMSTATES/16];
-	uint8_t c[NUMSTATES/8];
-} decision_t __attribute__ ((aligned (16)));
-
-typedef union {
-	COMPUTETYPE t[NUMSTATES];
-} metric_t __attribute__ ((aligned (16)));
-
-/* State info for instance of Viterbi decoder
- */
-
-struct v {
-/* path metric buffer 1 */
-	__attribute__ ((aligned (16))) metric_t metrics1;
-/* path metric buffer 2 */
-	__attribute__ ((aligned (16))) metric_t metrics2;
-/* Pointers to path metrics, swapped on every bit */
-	metric_t *old_metrics,*new_metrics;
-	decision_t *decisions;   /* decisions */
-};
-
-class	viterbi_768 {
-public:
-		viterbi_768	(int16_t, bool spiral = false);
-		~viterbi_768	(void);
-	void	deconvolve	(int16_t *, uint8_t *);
-private:
-
-	bool		spiral;
-	struct v	vp;
-	COMPUTETYPE Branchtab	[NUMSTATES / 2 * RATE] __attribute__ ((aligned (16)));
-//	int	parityb		(uint8_t);
-	int	parity		(int);
-	void	partab_init	(void);
-//	uint8_t	Partab	[256];
-	void	init_viterbi	(struct v *, int16_t);
-	void	update_viterbi_blk_GENERIC	(struct v *, COMPUTETYPE *,
-	                                         int16_t);
-	void	update_viterbi_blk_SPIRAL	(struct v *, COMPUTETYPE *,
-	                                         int16_t);
-	void	chainback_viterbi (struct v *, uint8_t *, int16_t, uint16_t);
-	struct v *viterbi_alloc (int32_t);
-	void	BFLY		(int32_t, int, COMPUTETYPE *,
-	                         struct v *, decision_t *);
-//	uint8_t *bits;
-	uint8_t *data;
-	COMPUTETYPE *symbols;
-	int16_t	frameBits;
-};
-
-#endif
-

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi.cpp-old Deleted

@@ -1,296 +0,0 @@
-#
-/*
- *    Copyright (C) 2013
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB program
- *    Qt-DAB 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.
- *
- *    Qt-DAB 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 Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *	This viterbi decoder is used for deconvolving the data segments
- *	for audio and/or data. The code is
- *	as given by the Spiral Project. All rights gratefully acknowledged.
- *	decoder
- */
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	"mm_malloc.h"
-#include	"viterbi.h"
-#include	<cstring>
-#ifdef	__MINGW32__
-#include <intrin.h>
-#include <malloc.h>
-#include <windows.h>
-#endif
-
-//
-//	It took a while to discover that the polynomes I used
-//	in a "home" made implementation was bitreversed!!
-//	The official one is on top.
-#define K 7
-#define POLYS {0155, 0117, 0123, 0155}
-//#define	POLYS	{109, 79, 83, 109}
-// In the reversed form the polys look:
-//#define POLYS { 0133, 0171, 0145, 0133 }
-//#define POLYS { 91, 121, 101, 91 }
-
-#define	METRICSHIFT	0
-#define	PRECISIONSHIFT	0
-#define	RENORMALIZE_THRESHOLD	137
-
-//
-/* ADDSHIFT and SUBSHIFT make sure that the thing returned is a byte. */
-#if (K-1<8)
-#define ADDSHIFT (8-(K-1))
-#define SUBSHIFT 0
-#elif (K-1>8)
-#define ADDSHIFT 0
-#define SUBSHIFT ((K-1)-8)
-#else
-#define ADDSHIFT 0
-#define SUBSHIFT 0
-#endif
-
-static uint8_t Partab [] = 
-{ 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0};
-
-//
-//	One could create the table above, i.e. a 256 entry
-//	odd-parity lookup table by the following function
-//	It is now precomputed
-static
-void	partab_init (void){
-int16_t i,cnt,ti;
-
-	for (i = 0; i < 256; i++){
-	   cnt = 0;
-	   ti = i;
-	   while (ti != 0) {
-	      if (ti & 1) cnt++;
-	      ti >>= 1;
-	   }
-	   Partab [i] = cnt & 1;
-	}
-}
-
-int16_t  viterbi::parity (int16_t x){
-	/* Fold down to one byte */
-	x ^= (x >> 8);
-	return Partab [x];
-}
-
-static inline
-void	renormalize (int16_t* X, int16_t threshold){
-int32_t	i;
-
-	if (X [0] > threshold){
-	   int16_t min = X [0];
-	   for (i = 0; i < NUMSTATES; i++)
-	      if (min > X[i])
-	         min = X[i];
-	   for (i = 0; i < NUMSTATES; i++)
-	      X[i] -= min;
-      }
-}
-
-	viterbi::viterbi	(int16_t wordlength) {
-int polys [RATE] = POLYS;
-	frameBits	= wordlength;
-
-int16_t	i, state;
-#ifdef	__MINGW32__
-uint32_t	size;
-	size	= 2 * ((wordlength + (K - 1)) / 8 + 1 + 16) & ~0x0F;
-	data	= (uint8_t *)_aligned_malloc (size, 16);
-	size	= 2 * (RATE * (wordlength + (K - 1)) * sizeof (int16_t) + 1 + 16) & ~0x0F;
-	symbols	= (int16_t *)_aligned_malloc (size, 16);
-	size	= 2 * ((wordlength + (K - 1)) * sizeof (decision_t) + 16) & ~0x0F;
-	vp. decisions = (decision_t  *)_aligned_malloc (size, 16);
-#else
-	if (posix_memalign ((void**)&data, 16,
-	                        (wordlength + (K - 1))/ 8 + 1)){
-	   printf("Allocation of data array failed\n");
-	}
-	if (posix_memalign ((void**)&symbols, 16,
-	                     RATE * (wordlength + (K - 1)) * sizeof(int16_t))){
-	   printf("Allocation of symbols array failed\n");
-	}
-	if (posix_memalign ((void**)&(vp. decisions),
-	                    16,
-	                    2 * (wordlength + (K - 1)) * sizeof (decision_t))){
-	   printf ("Allocation of vp decisions failed\n");
-	}
-#endif
-
-	for (state = 0; state < NUMSTATES / 2; state++) {
-	   for (i = 0; i < RATE; i++)
-	      Branchtab [i * NUMSTATES / 2 + state] =
-	                     (polys[i] < 0) ^
-	                        parity((2 * state) & abs (polys[i])) ? 255 : 0;
-	}
-	init_viterbi (&vp, 0);
-}
-
-
-	viterbi::~viterbi	(void) {
-#ifdef	__MINGW32__
-	_aligned_free (vp. decisions);
-	_aligned_free (data);
-	_aligned_free (symbols);
-#else
-	free (vp. decisions);
-	free (data);
-	free (symbols);
-#endif
-}
-
-static int maskTable [] = {128, 64, 32, 16, 8, 4, 2, 1};
-static	inline
-uint8_t getbit (uint8_t v, int32_t o) {
-	return  (v & maskTable [o]) ? 1 : 0;
-}
-	
-void	viterbi::deconvolve	(int16_t *input, uint8_t *output) {
-int16_t	i;
-
-	init_viterbi (&vp, 0);
-	for (i = 0; i < (uint16_t)(frameBits + (K - 1)) * RATE; i ++) {
-	   int16_t temp = input [i] + 127;
-	   if (temp < 0) temp = 0;
-	   if (temp > 255) temp = 255;
-	   symbols [i] = temp;
-	}
-
-	update_viterbi_blk_GENERIC (&vp, symbols, frameBits + (K - 1));
-	chainback_viterbi (&vp, data, frameBits, 0);
-
-	for (i = 0; i < (int16_t)frameBits; i ++)
-	   output [i] = getbit (data [i >> 3], i & 07);
-}
-
-/* C-language butterfly */
-void	viterbi::BFLY (int i, int s, int16_t * syms,

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768 Deleted

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old Deleted

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old/README Deleted

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old/spiral-no-sse.c Deleted

@@ -1,1689 +0,0 @@
-/***************************************************************
-This code was generated by Spiral 6.0 beta, www.spiral.net --
-Copyright (c) 2005-2008, Carnegie Mellon University.
-All rights reserved.
-The code is distributed under the GNU General Public License (GPL)
-(see http://www.gnu.org/copyleft/gpl.html)
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-******************************************************************/
-#include	"spiral-no-sse.h"
-
-void init_FULL_SPIRAL() {
-}
-
-void FULL_SPIRAL_no_sse (int amount, unsigned int  *Y, unsigned int  *X, unsigned int  *syms, unsigned int  *dec, unsigned int  *Branchtab) {
-int i3;
-    for(i3 = 0; i3 < amount; i3++) {
-//    for(i3 = 0; i3 <= amount; i3++) {
-        int a2082, a2083, a2084, a2085, a2086, a2087, a2088
-                , a2089, a2090, a2091, a2092, a2093, a2094, a2095, a2096
-                , a2097, a2098, a2099, a2100, a2101, a2102, a2103, a2104
-                , a2105, a2106, a2107, a2108, a2109, a2110, a2111, a2112
-                , a2113, a2114, a2115, a2116, a2117, a2118, a2119, a2120
-                , a2121, a2122, a2123, a2124, a2125, a2126, a2127, a2128
-                , a2129, a2130, a2131, a2132, a2133, a2134, a2135, a2136
-                , a2137, a2138, a2139, a2140, a2141, a2142, a2143, a2144
-                , a2145, a2146, a2147, a2148, a2149, a2150, a2151, a2152
-                , a2153, a2154, a2155, a2156, a2157, a2158, a2159, a2160
-                , a2161, a2162, a2163, a2164, a2165, a2166, a2167, a2168
-                , a2169, a2170, a2171, a2172, a2173, a2174, a2175, a2176
-                , a2177, a2178, a2179, a2180, a2181, a2182, a2183, a2184
-                , a2185, a2186, a2187, a2188, a2189, a2190, a2191, a2192
-                , a2193, a2194, a2195, a2196, a2197, a2198, a2199, a2200
-                , a2201, a2202, a2203, a2204, a2205, a2206, a2207, a2208
-                , a2209, a2210, a2211, a2212, a2213, a2214, a2215, a2216
-                , a2217, a2218, a2219, a2220, a2221, a2222, a2223, a2224
-                , a2225, a2226, a2227, a2228, a2229, a2230, a2231, a2232
-                , a2233, a2234, a2235, a2236, a2237, a2238, a2239, a2240
-                , a2241, a2242, a2243, a2244, a2245, a2246, a2247, a2248
-                , a2249, a2250, a2251, a2252, a2253, a2254, a2255, a2256
-                , a2257, a2258, a2259, a2260, a2261, a2262, a2263, a2264
-                , a2265, a2266, a2267, a2268, a2269, a2270, a2271, a2272
-                , a2273, a2274, a2275, a2276, a2277, a2278, a2279, a2280
-                , a2281, a2282, a2283, a2284, a2285, a2286, a2287, a2288
-                , a2289, a2290, a2291, a2292, a2293, a2294, a2295, a2296
-                , a2297, a2298, a2299, a2300, a2301, a2302, a2303, a2304
-                , a2305, a2306, a2307, a2308, a2309, a2310, a2311, a2312
-                , a2313, a2314, a2315, a2316, a2317, a2318, a2319, a2320
-                , a2321, a2322, a2323, a2324, a2325, a2326, a2327, a2328
-                , a2329, a2330, a2331, a2332, a2333, a2334, a2335, a2336
-                , a2337, a2338, a2339, a2340, a2341, a2342, a2343, a2344
-                , a2345, a2346, a2347, a2348, a2349, a2350, a2351, a2352
-                , a2353, a2354, a2355, a2356, a2357, a2358, a2359, a2360
-                , a2361, a2362, a2363, a2364, a2365, a2366, a2367, a2368
-                , a2369, a2370, a2371, a2372, a2373, a2374, a2375, a2376
-                , a2377, a2378, a2379, a2380, a2381, a2382, a2383, a2384
-                , a2385, a2386, a2387, a2388, a2389, a2390, a2391, a2392
-                , a2393, a2394, a2395, a2396, a2397, a2398, a2399, a2400
-                , a2401, a2402, a2403, a2404, a2405, a2406, a2407, a2408
-                , a2409, a2410, a2411, a2412, a2413, a2414, a2415, a2416
-                , a2417, a2418, a2419, a2420, a2421, a2422, a2423, a2424
-                , a2425, a2426, a2427, a2428, a2429, a2430, a2431, a2432
-                , a2433, a2434, a2435, a2436, a2437, a2438, a2439, a2440
-                , a2441, a2442, a2443, a2444, a2445, a2446, a2447, a2448
-                , a2449, a2450, a2451, a2452, a2453, a2454, a2455, a2456
-                , a2457, a2458, a2459, a2460, a2461, a2462, a2463, a2464
-                , a2465, a2466, a2467, a2468, a2469, a2470, a2471, a2472
-                , a2473, a2474, a2475, a2476, a2477, a2478, a2479, a2480
-                , a2481, a2482, a2483, a2484, a2485, a2486, a2487, a2488
-                , a2489, a2490, a2491, a2492, a2493, a2494, a2495, a2496
-                , a2497, a2498, a2499, a2500, a2501, a2502, a2503, a2504
-                , a2505, a2506, a2507, a2508, a2509, a2510, a2511, a2512
-                , a2513, a2514, a2515, a2516, a2517, a2518, a2519, a2520
-                , a2521, a2522, a2523, a2524, a2525, a2526, a2527, a2528
-                , a2529, a2530, a2531, a2532, a2533, a2534, a2535, a2536
-                , a2537, a2538, a2539, a2540, a2541, a2542, a2543, a2544
-                , a2545, a2546, a2547, a2548, a2549, a2550, a2551;
-        unsigned int d133, d134, d135, d136, d137, d138, d139
-                , d140, d141, d142, d143, d144, d145, d146, d147
-                , d148, d149, d150, d151, d152, d153, d154, d155
-                , d156, d157, d158, d159, d160, d161, d162, d163
-                , d164, d165, d166, d167, d168, d169, d170, d171
-                , d172, d173, d174, d175, d176, d177, d178, d179
-                , d180, d181, d182, d183, d184, d185, d186, d187
-                , d188, d189, d190, d191, d192, d193, d194, d195
-                , d196, d197, d198, d199, d200, d201, d202, d203
-                , d204, d205, d206, d207, d208, d209, d210, d211
-                , d212, d213, d214, d215, d216, d217, d218, d219
-                , d220, d221, d222, d223, d224, d225, d226, d227
-                , d228, d229, d230, d231, d232, d233, d234, d235
-                , d236, d237, d238, d239, d240, d241, d242, d243
-                , d244, d245, d246, d247, d248, d249, d250, d251
-                , d252, d253, d254, d255, d256, d257, d258, d259
-                , d260, m265, m266, m267, m268, m269, m270, m271
-                , m272, m273, m274, m275, m276, m277, m278, m279
-                , m280, m281, m282, m283, m284, m285, m286, m287
-                , m288, m289, m290, m291, m292, m293, m294, m295
-                , m296, m297, m298, m299, m300, m301, m302, m303
-                , m304, m305, m306, m307, m308, m309, m310, m311
-                , m312, m313, m314, m315, m316, m317, m318, m319
-                , m320, m321, m322, m323, m324, m325, m326, m327
-                , m328, m329, m330, m331, m332, m333, m334, m335
-                , m336, m337, m338, m339, m340, m341, m342, m343
-                , m344, m345, m346, m347, m348, m349, m350, m351
-                , m352, m353, m354, m355, m356, m357, m358, m359
-                , m360, m361, m362, m363, m364, m365, m366, m367
-                , m368, m369, m370, m371, m372, m373, m374, m375
-                , m376, m377, m378, m379, m380, m381, m382, m383
-                , m384, m385, m387, m388, m389, m390, m391, m392
-                , m393, m394, m395, m396, m397, m398, m399, m400
-                , m401, m402, m403, m404, m405, m406, m407, m408
-                , m409, m410, m411, m412, m413, m414, m415, m416
-                , m417, m418, m419, m420, m421, m422, m423, m424
-                , m425, m426, m427, m428, m429, m430, m431, m432
-                , m433, m434, m435, m436, m437, m438, m439, m440
-                , m441, m442, m443, m444, m445, m446, m447, m448
-                , m449, m450, m451, m452, m453, m454, m455, m456
-                , m457, m458, m459, m460, m461, m462, m463, m464
-                , m465, m466, m467, m468, m469, m470, m471, m472
-                , m473, m474, m475, m476, m477, m478, m479, m480
-                , m481, m482, m483, m484, m485, m486, m487, m488
-                , m489, m490, m491, m492, m493, m494, m495, m496
-                , m497, m498, m499, m500, m501, m502, m503, m504
-                , m505, m506, m507, m508, m509, m510, m511, m512
-                , m513, m514, m515, m516, m517, m518, m519, m520
-                , m521, s130, s131, s132, s133, s134, s135, s136
-                , s137, s138, s139, s140, s141, s142, s143, s144
-                , s145, s146, s147, s148, s149, s150, s151, s152
-                , s153, s154, s155, s156, s157, s158, s159, s160
-                , s161, s162, s163, s164, s165, s166, s167, s168
-                , s169, s170, s171, s172, s173, s174, s175, s176
-                , s177, s178, s179, s180, s181, s182, s183, s184
-                , s185, s186, s187, s188, s189, s190, s191, s192
-                , s193, s194, s195, s196, s197, s198, s199, s200
-                , s201, s202, s203, s204, s205, s206, s207, s208
-                , s209, s210, s211, s212, s213, s214, s215, s216
-                , s217, s218, s219, s220, s221, s222, s223, s224
-                , s225, s226, s227, s228, s229, s230, s231, s232
-                , s233, s234, s235, s236, s237, s238, s239, s240
-                , s241, s242, s243, s244, s245, s246, s247, s248
-                , s249, s250, s251, s252, s253, s254, s255, s256
-                , s257, t325, t326, t327, t328, t329, t330, t331
-                , t332, t333, t334, t335, t336, t337, t338, t339
-                , t340, t341, t342, t343, t344, t345, t346, t347
-                , t348, t349, t350, t351, t352, t353, t354, t355
-                , t356, t357, t358, t359, t360, t361, t362, t363
-                , t364, t365, t366, t367, t368, t369, t370, t371
-                , t372, t373, t374, t375, t376, t377, t378, t379
-                , t380, t381, t382, t383, t384, t385, t387, t388
-                , t389, t390, t391, t392, t393, t394, t395, t396
-                , t397, t398, t399, t400, t401, t402, t403, t404
-                , t405, t406, t407, t408, t409, t410, t411, t412
-                , t413, t414, t415, t416, t417, t418, t419, t420
-                , t421, t422, t423, t424, t425, t426, t427, t428
-                , t429, t430, t431, t432, t433, t434, t435, t436
-                , t437, t438, t439, t440, t441, t442, t443, t444
-                , t445, t446, t447, t448, t449, t450, t451, t452
-                , t453, t454, t455, t456, t457, t458, t459, t460
-                , t461, t462, t463, t464, t465, t466, t467, t468
-                , t469, t470, t471, t472, t473, t474, t475, t476
-                , t477, t478, t479, t480, t481, t482, t483, t484
-                , t485, t486, t487, t488, t489, t490, t491, t492
-                , t493, t494, t495, t496, t497, t498, t499, t500
-                , t501, t502, t503, t504, t505, t506, t507, t508
-                , t509, t510, t511, t512, t513, t514, t515, t516
-                , t517, t518, t519, t520, t521, t522, t523, t524
-                , t525, t526, t527, t528, t529, t530, t531, t532
-                , t533, t534, t535, t536, t537, t538, t539, t540
-                , t541, t542, t543, t544, t545, t546, t547, t548
-                , t549, t550, t551, t552, t553, t554, t555, t556
-                , t557, t558, t559, t560, t561, t562, t563, t564
-                , t565, t566, t567, t568, t569, t570, t571, t572
-                , t573, t574, t575, t576, t577, t578, t579, t580
-                , t581, t582, t583, t584, t585, t586, t587, t588
-                , t589, t590, t591, t592, t593, t594, t595, t596
-                , t597, t598, t599, t600, t601, t602, t603, t604
-                , t605, t606, t607, t608, t609, t610, t611, t612
-                , t613, t614, t615, t616, t617, t618, t619, t620
-                , t621, t622, t623, t624, t625, t626, t627, t628
-                , t629, t630, t631, t632, t633, t634, t635, t636
-                , t637, t638, t639, t640, t641, t642, t643, t644
-                , t645;
-        a2082 = (8*i3);
-        a2083 = syms[a2082];
-        t325 = ((a2083)^(Branchtab[0]));
-        a2084 = (1 + a2082);
-        a2085 = syms[a2084];
-        a2086 = ((a2085)^(Branchtab[32]));
-        t326 = (t325 + a2086);

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old/spiral-no-sse.h Deleted

@@ -1,35 +0,0 @@
-/***************************************************************
-This code was generated by Spiral 6.0 beta, www.spiral.net --
-Copyright (c) 2005-2008, Carnegie Mellon University.
-All rights reserved.
-The code is distributed under the GNU General Public License (GPL)
-(see http://www.gnu.org/copyleft/gpl.html)
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-******************************************************************/
-
-#define K 7
-#define RATE 4
-#define POLYS { 109, 79, 83, 109 }
-#define NUMSTATES 64
-#define FRAMEBITS 2048
-#define DECISIONTYPE unsigned int
-#define DECISIONTYPE_BITSIZE 32
-#define COMPUTETYPE unsigned int
-#define EBN0 3
-#define TRIALS 10000
-#define __int32 int
-#define FUNC FULL_SPIRAL
-#define METRICSHIFT 0
-#define PRECISIONSHIFT 0
-#define RENORMALIZE_THRESHOLD 2000000000

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old/spiral-sse.c Deleted

@@ -1,698 +0,0 @@
-/***************************************************************
-This code was generated by Spiral 6.0 beta, www.spiral.net --
-Copyright (c) 2005-2008, Carnegie Mellon University.
-All rights reserved.
-The code is distributed under the GNU General Public License (GPL)
-(see http://www.gnu.org/copyleft/gpl.html)
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-******************************************************************/
-
-//#include <include/mm_malloc.h>
-//#include <pmmintrin.h>
-#include <emmintrin.h>
-#include <xmmintrin.h>
-#include <mmintrin.h>
-#include	"spiral-sse.h"
-void init_FULL_SPIRAL() {
-}
-
-void FULL_SPIRAL_sse(int amount, int32_t  *Y, int32_t  *X, int32_t  *syms, unsigned char  *dec, int32_t  *Branchtab) {
-int i9;
-//    for(i9 = 0; i9 <= amount; i9++) {
-    for(i9 = 0; i9 < amount; i9++) {
-        int32_t a1002, a1006, a1010, a1014, a822, a828, a834
-                , a840;
-        int a820, a850;
-        unsigned char s118, s125, s132, s139, s146, s153, s160
-                , s167, s174, s181, s188, s195, s202, s209, s216
-                , s223;
-        int32_t  *a1001, *a1005, *a1009, *a1013, *a821, *a827, *a833
-                , *a839, *b104;
-        unsigned char  *a1021, *a1030, *a1039, *a1048, *a1057, *a1066, *a1075
-                , *a1084, *a849, *a851, *a872, *a893, *a914, *a935, *a956
-                , *a977, *a998;
-        __m128i  *a1000, *a818, *a819, *a824, *a830, *a836, *a842
-                , *a852, *a853, *a854, *a855, *a856, *a859, *a862, *a865
-                , *a873, *a874, *a875, *a876, *a877, *a880, *a883, *a886
-                , *a894, *a895, *a896, *a897, *a898, *a901, *a904, *a907
-                , *a915, *a916, *a917, *a918, *a919, *a922, *a925, *a928
-                , *a936, *a937, *a938, *a939, *a940, *a943, *a946, *a949
-                , *a957, *a958, *a959, *a960, *a961, *a964, *a967, *a970
-                , *a978, *a979, *a980, *a981, *a982, *a985, *a988, *a991
-                , *a999;
-        __m128i a1003, a1004, a1007, a1008, a1011, a1012, a1015
-                , a1016, a1017, a1018, a1019, a1020, a1022, a1023, a1024
-                , a1025, a1026, a1027, a1028, a1029, a1031, a1032, a1033
-                , a1034, a1035, a1036, a1037, a1038, a1040, a1041, a1042
-                , a1043, a1044, a1045, a1046, a1047, a1049, a1050, a1051
-                , a1052, a1053, a1054, a1055, a1056, a1058, a1059, a1060
-                , a1061, a1062, a1063, a1064, a1065, a1067, a1068, a1069
-                , a1070, a1071, a1072, a1073, a1074, a1076, a1077, a1078
-                , a1079, a1080, a1081, a1082, a1083, a823, a825, a826
-                , a829, a831, a832, a835, a837, a838, a841, a843
-                , a844, a845, a846, a847, a848, a857, a858, a860
-                , a861, a863, a864, a866, a867, a868, a869, a870
-                , a871, a878, a879, a881, a882, a884, a885, a887
-                , a888, a889, a890, a891, a892, a899, a900, a902
-                , a903, a905, a906, a908, a909, a910, a911, a912
-                , a913, a920, a921, a923, a924, a926, a927, a929
-                , a930, a931, a932, a933, a934, a941, a942, a944
-                , a945, a947, a948, a950, a951, a952, a953, a954
-                , a955, a962, a963, a965, a966, a968, a969, a971
-                , a972, a973, a974, a975, a976, a983, a984, a986
-                , a987, a989, a990, a992, a993, a994, a995, a996
-                , a997, b105, b106, b107, b108, b109, b110, b111
-                , b112, b113, b114, b115, b116, b117, b118, b119
-                , b120, b121, b122, b123, b124, b125, b126, b127
-                , b128, b129, b130, b131, b132, b133, b134, b135
-                , b136, d37, d38, d39, d40, d41, d42, d43
-                , d44, d45, d46, d47, d48, d49, d50, d51
-                , d52, d53, d54, d55, d56, d57, d58, d59
-                , d60, d61, d62, d63, d64, d65, d66, d67
-                , d68, m100, m101, m102, m103, m104, m105, m106
-                , m107, m108, m109, m110, m111, m112, m113, m114
-                , m115, m116, m117, m118, m119, m120, m121, m122
-                , m123, m124, m125, m126, m127, m128, m129, m130
-                , m131, m132, m133, m134, m135, m136, m73, m74
-                , m75, m76, m77, m78, m79, m80, m81, m82
-                , m83, m84, m85, m86, m87, m88, m89, m90
-                , m91, m92, m93, m94, m95, m96, m97, m98
-                , m99, s114, s115, s116, s117, s119, s120, s121
-                , s122, s123, s124, s126, s127, s128, s129, s130
-                , s131, s133, s134, s135, s136, s137, s138, s140
-                , s141, s142, s143, s144, s145, s147, s148, s149
-                , s150, s151, s152, s154, s155, s156, s157, s158
-                , s159, s161, s162, s163, s164, s165, s166, s168
-                , s169, s170, s171, s172, s173, s175, s176, s177
-                , s178, s179, s180, s182, s183, s184, s185, s186
-                , s187, s189, s190, s191, s192, s193, s194, s196
-                , s197, s198, s199, s200, s201, s203, s204, s205
-                , s206, s207, s208, s210, s211, s212, s213, s214
-                , s215, s217, s218, s219, s220, s221, s222, s224
-                , s225, t39, t40, t41, t42, t43, t44, t45
-                , t46, t47, t48, t49, t50, t51, t52, t53
-                , t54, t55, t56, t57, t58, t59, t60, t61
-                , t62, t63, t64, t65, t66, t67, t68, t69
-                , t70;
-        a818 = ((__m128i  *) X);
-        s114 = *(a818);
-        a819 = (a818 + 8);
-        s115 = *(a819);
-        a820 = (8 * i9);
-        a821 = (syms + a820);
-        a822 = *(a821);
-        a823 = _mm_set1_epi32(a822);
-        a824 = ((__m128i  *) Branchtab);
-        a825 = *(a824);
-        a826 = _mm_xor_si128(a823, a825);
-        b104 = (a820 + syms);
-        a827 = (b104 + 1);
-        a828 = *(a827);
-        a829 = _mm_set1_epi32(a828);
-        a830 = (a824 + 8);
-        a831 = *(a830);
-        a832 = _mm_xor_si128(a829, a831);
-        a833 = (b104 + 2);
-        a834 = *(a833);
-        a835 = _mm_set1_epi32(a834);
-        a836 = (a824 + 16);
-        a837 = *(a836);
-        a838 = _mm_xor_si128(a835, a837);
-        a839 = (b104 + 3);
-        a840 = *(a839);
-        a841 = _mm_set1_epi32(a840);
-        a842 = (a824 + 24);
-        a843 = *(a842);
-        a844 = _mm_xor_si128(a841, a843);
-        b105 = _mm_add_epi32(a826, a832);
-        b106 = _mm_add_epi32(b105, a838);
-        t39 = _mm_add_epi32(b106, a844);
-        t40 = _mm_sub_epi32(_mm_set_epi32(1020, 1020, 1020, 1020), t39);
-        m73 = _mm_add_epi32(s114, t39);
-        m74 = _mm_add_epi32(s115, t40);
-        m75 = _mm_add_epi32(s114, t40);
-        m76 = _mm_add_epi32(s115, t39);
-        d37 = _mm_cmpgt_epi32(m73, m74);
-        d38 = _mm_cmpgt_epi32(m75, m76);
-        a845 = _mm_andnot_si128(d37, m73);
-        a846 = _mm_and_si128(d37, m74);
-        s116 = _mm_or_si128(a845, a846);
-        a847 = _mm_andnot_si128(d38, m75);
-        a848 = _mm_and_si128(d38, m76);
-        s117 = _mm_or_si128(a847, a848);
-        s118 = _mm_movemask_epi8(_mm_packs_epi16(_mm_unpacklo_epi16(_mm_packs_epi16(d37,_mm_setzero_si128()),_mm_packs_epi16(d38,_mm_setzero_si128())),_mm_setzero_si128()));
-        a849 = ((unsigned char  *) dec);
-        a850 = (16 * i9);
-        a851 = (a849 + a850);
-        *(a851) = s118;
-        s119 = _mm_unpacklo_epi32(s116, s117);
-        s120 = _mm_unpackhi_epi32(s116, s117);
-        a852 = ((__m128i  *) Y);
-        *(a852) = s119;
-        a853 = (a852 + 1);
-        *(a853) = s120;
-        a854 = (a818 + 1);
-        s121 = *(a854);
-        a855 = (a818 + 9);
-        s122 = *(a855);
-        a856 = (a824 + 1);
-        a857 = *(a856);
-        a858 = _mm_xor_si128(a823, a857);
-        a859 = (a824 + 9);
-        a860 = *(a859);
-        a861 = _mm_xor_si128(a829, a860);
-        a862 = (a824 + 17);
-        a863 = *(a862);
-        a864 = _mm_xor_si128(a835, a863);
-        a865 = (a824 + 25);
-        a866 = *(a865);
-        a867 = _mm_xor_si128(a841, a866);
-        b107 = _mm_add_epi32(a858, a861);
-        b108 = _mm_add_epi32(b107, a864);
-        t41 = _mm_add_epi32(b108, a867);
-        t42 = _mm_sub_epi32(_mm_set_epi32(1020, 1020, 1020, 1020), t41);
-        m77 = _mm_add_epi32(s121, t41);
-        m78 = _mm_add_epi32(s122, t42);
-        m79 = _mm_add_epi32(s121, t42);
-        m80 = _mm_add_epi32(s122, t41);
-        d39 = _mm_cmpgt_epi32(m77, m78);
-        d40 = _mm_cmpgt_epi32(m79, m80);
-        a868 = _mm_andnot_si128(d39, m77);
-        a869 = _mm_and_si128(d39, m78);
-        s123 = _mm_or_si128(a868, a869);
-        a870 = _mm_andnot_si128(d40, m79);
-        a871 = _mm_and_si128(d40, m80);
-        s124 = _mm_or_si128(a870, a871);
-        s125 = _mm_movemask_epi8(_mm_packs_epi16(_mm_unpacklo_epi16(_mm_packs_epi16(d39,_mm_setzero_si128()),_mm_packs_epi16(d40,_mm_setzero_si128())),_mm_setzero_si128()));
-        a872 = (a851 + 1);
-        *(a872) = s125;

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old/spiral-sse.h Deleted

@@ -1,36 +0,0 @@
-/***************************************************************
-This code was generated by Spiral 6.0 beta, www.spiral.net --
-Copyright (c) 2005-2008, Carnegie Mellon University.
-All rights reserved.
-The code is distributed under the GNU General Public License (GPL)
-(see http://www.gnu.org/copyleft/gpl.html)
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-******************************************************************/
-#include	<stdint.h>
-
-#define K 7
-#define RATE 4
-#define POLYS { 109, 79, 83, 109 }
-#define NUMSTATES 64
-#define FRAMEBITS 2048
-#define DECISIONTYPE unsigned int
-#define DECISIONTYPE_BITSIZE 32
-#define COMPUTETYPE uint32_t
-#define EBN0 3
-#define TRIALS 10000
-#define __int32 int
-#define FUNC FULL_SPIRAL
-#define METRICSHIFT 0
-#define PRECISIONSHIFT 0
-#define RENORMALIZE_THRESHOLD 2000000000

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768-old/viterbi-768.cpp Deleted

@@ -1,370 +0,0 @@
-#
-/*
- *    Copyright (C) 201 .. 2017
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of Qt-DAB
- *    Qt-DAB 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.
- *
- *    Qt-DAB 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 Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *	The convolutional decoder for the FIC blocks has fixed sized
- *	blocks, so we can use pre-generated code - for that specific
- *	sized blocks - generated by the spiral project
- */
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	"mm_malloc.h"
-#include	"viterbi-768.h"
-#include	<cstring>
-#ifdef  __MINGW32__
-#include	<intrin.h>
-#include	<malloc.h>
-#include	<windows.h>
-#endif
-
-//
-//	It took a while to discover that the polynomes we used
-//	in our own "straightforward" implementation was bitreversed!!
-//	The official one is on top.
-#define K 7
-#define POLYS { 0155, 0117, 0123, 0155}
-//#define	POLYS	{109, 79, 83, 109}
-// In the reversed form the polys look:
-//#define POLYS { 0133, 0171, 0145, 0133 }
-//#define POLYS { 91, 121, 101, 91 }
-
-#define	METRICSHIFT	0
-#define	PRECISIONSHIFT	0
-#define	RENORMALIZE_THRESHOLD	137
-
-//
-/* ADDSHIFT and SUBSHIFT make sure that the thing returned is a byte. */
-#if (K-1<8)
-#define ADDSHIFT (8-(K-1))
-#define SUBSHIFT 0
-#elif (K-1>8)
-#define ADDSHIFT 0
-#define SUBSHIFT ((K-1)-8)
-#else
-#define ADDSHIFT 0
-#define SUBSHIFT 0
-#endif
-
-
-static uint8_t Partab [] = 
-{ 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0};
-
-//
-//	One could create the table above, i.e. a 256 entry
-//	odd-parity lookup table by the following function
-//	It is now precomputed
-void	viterbi_768::partab_init (void){
-int16_t i,cnt,ti;
-
-	for (i = 0; i < 256; i++){
-	   cnt = 0;
-	   ti = i;
-	   while (ti != 0) {
-	      if (ti & 1) cnt++;
-	      ti >>= 1;
-	   }
-	   Partab [i] = cnt & 1;
-	}
-}
-
-int 	viterbi_768::parity (int x){
-	/* Fold down to one byte */
-	x ^= (x >> 16);
-	x ^= (x >> 8);
-	return Partab [x];
-}
-
-static inline
-void	renormalize (COMPUTETYPE* X, COMPUTETYPE threshold){
-int32_t	i;
-
-	if (X [0] > threshold){
-	   COMPUTETYPE min = X [0];
-	   for (i = 0; i < NUMSTATES; i++)
-	      if (min > X[i])
-	         min = X[i];
-	   for (i = 0; i < NUMSTATES; i++)
-	      X[i] -= min;
-      }
-}
-//
-//
-//	The main use of the viterbi decoder is in handling the FIC blocks
-//	There are (in mode 1) 3 ofdm blocks, giving 4 FIC blocks
-//	There all have a predefined length. In that case we use the
-//	"fast" (i.e. spiral) code, otherwise we use the generic code
-	viterbi_768::viterbi_768 (int16_t wordlength, bool spiral) {
-int polys [RATE] = POLYS;
-int16_t	i, state;
-#ifdef	__MINGW32__
-uint32_t	size;
-#endif
-
-	frameBits		= wordlength;
-	this	-> spiral	= spiral;
-//	partab_init	();
-
-// B I G N O T E	The spiral code uses (wordLength + (K - 1) * sizeof ...
-// However, the application then crashes, so something is not OK
-// By doubling the size, the problem disappears. It is not solved though
-// and not further investigation.
-#ifdef __MINGW32__
-	size = 2 * ((wordlength + (K - 1)) / 8 + 1 + 16) & ~0xF;
-	data	= (uint8_t *)_aligned_malloc (size, 16);
-	size = 2 * (RATE * (wordlength + (K - 1)) * sizeof(COMPUTETYPE) + 16) & ~0xF;
-	symbols	= (COMPUTETYPE *)_aligned_malloc (size, 16);
-	size	= 2 * (wordlength + (K - 1)) * sizeof (decision_t);	
-	size	= (size + 16) & ~0xF;
-	vp. decisions = (decision_t  *)_aligned_malloc (size, 16);
-#else
-	if (posix_memalign ((void**)&data, 16,
-	                        (wordlength + (K - 1))/ 8 + 1)){
-	   printf("Allocation of data array failed\n");
-	}
-	if (posix_memalign ((void**)&symbols, 16,
-	                     RATE * (wordlength + (K - 1)) * sizeof(COMPUTETYPE))){
-	   printf("Allocation of symbols array failed\n");
-	}
-	if (posix_memalign ((void**)&(vp. decisions),
-	                    16,
-	                    2 * (wordlength + (K - 1)) * sizeof (decision_t))){
-	   printf ("Allocation of vp decisions failed\n");
-	}
-#endif
-
-	for (state = 0; state < NUMSTATES / 2; state++) {
-	   for (i = 0; i < RATE; i++)
-	      Branchtab [i * NUMSTATES / 2 + state] =
-	                     (polys[i] < 0) ^
-	                        parity((2 * state) & abs (polys[i])) ? 255 : 0;
-	}
-//
-	init_viterbi (&vp, 0);
-}
-
-
-	viterbi_768::~viterbi_768	(void) {
-#ifdef	__MINGW32__
-	_aligned_free (vp. decisions);
-	_aligned_free (data);
-	_aligned_free (symbols);
-#else
-	free (vp. decisions);
-	free (data);
-	free (symbols);
-#endif
-}
-
-static int maskTable [] = {128, 64, 32, 16, 8, 4, 2, 1};
-static  inline
-uint8_t getbit (uint8_t v, int32_t o) {
-        return  (v & maskTable [o]) ? 1 : 0;
-}
-
-	
-// depends: POLYS, RATE, COMPUTETYPE
-// 	encode was only used for testing purposes
-//void encode (/*const*/ unsigned char *bytes, COMPUTETYPE *symbols, int nbits) {

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768/spiral-neon.h Deleted

@@ -1,36 +0,0 @@
-/***************************************************************
-This code was generated by Spiral 6.0 beta, www.spiral.net --
-Copyright (c) 2005-2008, Carnegie Mellon University.
-All rights reserved.
-The code is distributed under the GNU General Public License (GPL)
-(see http://www.gnu.org/copyleft/gpl.html)
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-******************************************************************/
-#include	<stdint.h>
-
-#define K 7
-#define RATE 4
-#define POLYS { 109, 79, 83, 109 }
-#define NUMSTATES 64
-#define FRAMEBITS 2048
-#define DECISIONTYPE unsigned int
-#define DECISIONTYPE_BITSIZE 32
-#define COMPUTETYPE uint32_t
-#define EBN0 3
-#define TRIALS 10000
-#define __int32 int
-#define FUNC FULL_SPIRAL
-#define METRICSHIFT 0
-#define PRECISIONSHIFT 0
-#define RENORMALIZE_THRESHOLD 2000000000

_service:download_url:qt-dab-2.01.tar.gz/src/support/viterbi_768/viterbi-768.cpp Deleted

@@ -1,380 +0,0 @@
-#
-/*
- *    Copyright (C) 2013
- *    Jan van Katwijk (J.vanKatwijk@gmail.com)
- *    Lazy Chair Computing
- *
- *    This file is part of the Qt-DAB
- *    Qt-DAB 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.
- *
- *    Qt-DAB 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 Qt-DAB; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *	The convolutional decoder for the FIC blocks has fixed sized
- *	blocks, so we can use pre-generated code - for that specific
- *	sized blocks - generated by the spiral project
- */
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	"mm_malloc.h"
-#include	"viterbi-768.h"
-#include	<cstring>
-#ifdef  __MINGW32__
-#include	<intrin.h>
-#include	<malloc.h>
-#include	<windows.h>
-#endif
-
-//
-//	It took a while to discover that the polynomes we used
-//	in our own "straightforward" implementation was bitreversed!!
-//	The official one is on top.
-#define K 7
-#define POLYS { 0155, 0117, 0123, 0155}
-//#define	POLYS	{109, 79, 83, 109}
-// In the reversed form the polys look:
-//#define POLYS { 0133, 0171, 0145, 0133 }
-//#define POLYS { 91, 121, 101, 91 }
-
-#define	METRICSHIFT	0
-#define	PRECISIONSHIFT	0
-#define	RENORMALIZE_THRESHOLD	137
-
-//
-/* ADDSHIFT and SUBSHIFT make sure that the thing returned is a byte. */
-#if (K-1<8)
-#define ADDSHIFT (8-(K-1))
-#define SUBSHIFT 0
-#elif (K-1>8)
-#define ADDSHIFT 0
-#define SUBSHIFT ((K-1)-8)
-#else
-#define ADDSHIFT 0
-#define SUBSHIFT 0
-#endif
-
-
-static uint8_t Partab [] = 
-{ 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0};
-
-//
-//	One could create the table above, i.e. a 256 entry
-//	odd-parity lookup table by the following function
-//	It is now precomputed
-void	viterbi_768::partab_init (void){
-int16_t i,cnt,ti;
-
-	for (i = 0; i < 256; i++){
-	   cnt = 0;
-	   ti = i;
-	   while (ti != 0) {
-	      if (ti & 1) cnt++;
-	      ti >>= 1;
-	   }
-	   Partab [i] = cnt & 1;
-	}
-}
-
-int 	viterbi_768::parity (int x){
-	/* Fold down to one byte */
-	x ^= (x >> 16);
-	x ^= (x >> 8);
-	return Partab [x];
-//	return parityb(x);
-}
-
-static inline
-void	renormalize (COMPUTETYPE* X, COMPUTETYPE threshold){
-int32_t	i;
-
-	if (X [0] > threshold){
-	   COMPUTETYPE min = X [0];
-	   for (i = 0; i < NUMSTATES; i++)
-	      if (min > X[i])
-	         min = X[i];
-	   for (i = 0; i < NUMSTATES; i++)
-	      X[i] -= min;
-      }
-}
-//
-//
-//	The main use of the viterbi decoder is in handling the FIC blocks
-//	There are (in mode 1) 3 ofdm blocks, giving 4 FIC blocks
-//	There all have a predefined length. In that case we use the
-//	"fast" (i.e. spiral) code, otherwise we use the generic code
-	viterbi_768::viterbi_768 (int16_t wordlength, bool spiral) {
-int polys [RATE] = POLYS;
-int16_t	i, state;
-#ifdef	__MINGW32__
-uint32_t	size;
-#endif
-
-	frameBits		= wordlength;
-	this	-> spiral	= spiral;
-//	partab_init	();
-
-// B I G N O T E	The spiral code uses (wordLength + (K - 1) * sizeof ...
-// However, the application then crashes, so something is not OK
-// By doubling the size, the problem disappears. It is not solved though
-// and not further investigation.
-#ifdef __MINGW32__
-	size = 2 * ((wordlength + (K - 1)) / 8 + 1 + 16) & ~0xF;
-	data	= (uint8_t *)_aligned_malloc (size, 16);
-	size = 2 * (RATE * (wordlength + (K - 1)) * sizeof(COMPUTETYPE) + 16) & ~0xF;
-	symbols	= (COMPUTETYPE *)_aligned_malloc (size, 16);
-	size	= 2 * (wordlength + (K - 1)) * sizeof (decision_t);	
-	size	= (size + 16) & ~0xF;
-	vp. decisions = (decision_t  *)_aligned_malloc (size, 16);
-#else
-	if (posix_memalign ((void**)&data, 16,
-	                        (wordlength + (K - 1))/ 8 + 1)){
-	   printf("Allocation of data array failed\n");
-	}
-	if (posix_memalign ((void**)&symbols, 16,
-	                     RATE * (wordlength + (K - 1)) * sizeof(COMPUTETYPE))){
-	   printf("Allocation of symbols array failed\n");
-	}
-	if (posix_memalign ((void**)&(vp. decisions),
-	                    16,
-	                    2 * (wordlength + (K - 1)) * sizeof (decision_t))){
-	   printf ("Allocation of vp decisions failed\n");
-	}
-#endif
-
-	for (state = 0; state < NUMSTATES / 2; state++) {
-	   for (i = 0; i < RATE; i++)
-	      Branchtab [i * NUMSTATES / 2 + state] =
-	                     (polys[i] < 0) ^
-	                        parity((2 * state) & abs (polys[i])) ? 255 : 0;
-	}
-//
-	init_viterbi (&vp, 0);
-}
-
-
-	viterbi_768::~viterbi_768	(void) {
-#ifdef	__MINGW32__
-	_aligned_free (vp. decisions);
-	_aligned_free (data);
-	_aligned_free (symbols);
-#else
-	free (vp. decisions);
-	free (data);
-	free (symbols);
-#endif
-}
-
-static int maskTable [] = {128, 64, 32, 16, 8, 4, 2, 1};
-static  inline
-uint8_t getbit (uint8_t v, int32_t o) {
-        return  (v & maskTable [o]) ? 1 : 0;
-}
-
-//static
-//uint8_t getbit (uint8_t v, int32_t o) {
-//uint8_t	mask	= 1 << (7 - o);

_service:download_url:qt-dab-2.01.tar.gz/CMakeLists.txt -> _service:download_url:qt-dab-2.02.tar.gz/CMakeLists.txt Changed

@@ -167,7 +167,7 @@
 	           ./includes/backend/data/journaline
 	           ./includes/backend/data/mot
 	           ./includes/support
-	           ./includes/support/viterbi_768
+	           ./includes/support/viterbi-jan
 	           ./includes/output
 	           ./includes/scopes-qwt6
 	           ./devices
@@ -244,7 +244,7 @@
 	     ./includes/support/text-mapper.h
 	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
-	     ./includes/support/viterbi_768/viterbi-768.h
+	     ./includes/support/viterbi-jan/viterbi-handler.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./impulse-viewer/impulse-viewer.h 
@@ -314,8 +314,7 @@
 	     ./src/support/text-mapper.cpp
 	     ./src/support/dab_tables.cpp
 	     ./src/support/ensemble-printer.cpp
-	     ./src/support/viterbi_768/viterbi-768.cpp
-	     ./src/support/viterbi_768/spiral-no-sse.c
+	     ./src/support/viterbi-jan/viterbi-handler.cpp
 	     ./src/scopes-qwt6/iqdisplay.cpp 
 	     ./spectrum-viewer/spectrum-viewer.cpp 
 	     ./impulse-viewer/impulse-viewer.cpp

_service:download_url:qt-dab-2.01.tar.gz/CMakeLists.txt-qt4 -> _service:download_url:qt-dab-2.02.tar.gz/CMakeLists.txt-qt4 Changed

@@ -161,7 +161,7 @@
 	           ./includes/backend/data/mot
 	           ./includes/backend/data/journaline
 	           ./includes/support
-	           ./includes/support/viterbi_768
+	           ./includes/support/viterbi-jan
 	           ./includes/output
 	           ./includes/scopes-qwt6
 	           ./devices
@@ -240,7 +240,7 @@
 	     ./includes/support/text-mapper.h
 	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
-	     ./includes/backend/viterbi_768/viterbi-768.h
+	     ./includes/backend/viterbi-jan/viterbi-handler.h
 	     ./includes/scopes-qwt6/iqdisplay.h
              ./spectrum-viewer/spectrum-viewer.h
              ./impulse-viewer/impulse-viewer.h
@@ -312,8 +312,7 @@
 	     ./src/support/text-mapper.cpp
 	     ./src/support/dab_tables.cpp
              ./src/support/ensemble-printer.cpp
-	     ./src/support/viterbi_768/viterbi-768.cpp
-	     ./src/support/viterbi_768/spiral-no-sse.c
+	     ./src/support/viterbi-jan/viterbi-handler.cpp
 	     ./src/scopes-qwt6/iqdisplay.cpp
 	     ./spectrum-viewer/spectrum-viewer.cpp
 	     ./impulse-viewer/impulse-viewer.cpp

_service:download_url:qt-dab-2.01.tar.gz/CMakeLists.txt-qt5 -> _service:download_url:qt-dab-2.02.tar.gz/CMakeLists.txt-qt5 Changed

@@ -167,7 +167,7 @@
 	           ./includes/backend/data/journaline
 	           ./includes/backend/data/mot
 	           ./includes/support
-	           ./includes/support/viterbi_768
+	           ./includes/support/viterbi-jan
 	           ./includes/output
 	           ./includes/scopes-qwt6
 	           ./devices
@@ -244,7 +244,7 @@
 	     ./includes/support/text-mapper.h
 	     ./includes/support/dab_tables.h
 	     ./includes/support/ensemble-printer.h
-	     ./includes/support/viterbi_768/viterbi-768.h
+	     ./includes/support/viterbi-jan/viterbi-handler.h
 	     ./includes/scopes-qwt6/iqdisplay.h
 	     ./spectrum-viewer/spectrum-viewer.h 
 	     ./impulse-viewer/impulse-viewer.h 
@@ -314,8 +314,7 @@
 	     ./src/support/text-mapper.cpp
 	     ./src/support/dab_tables.cpp
 	     ./src/support/ensemble-printer.cpp
-	     ./src/support/viterbi_768/viterbi-768.cpp
-	     ./src/support/viterbi_768/spiral-no-sse.c
+	     ./src/support/viterbi-jan/viterbi-handler.cpp
 	     ./src/scopes-qwt6/iqdisplay.cpp 
 	     ./spectrum-viewer/spectrum-viewer.cpp 
 	     ./impulse-viewer/impulse-viewer.cpp

_service:download_url:qt-dab-2.02.tar.gz/README_VITERBI Added

@@ -0,0 +1,57 @@
+
+A Note on Viterbi Handling
+
+Deconvolution is one of the resource consuming operations in DAB decoding.
+Up until now, we used the deconvolution, using some variant of the
+do-called "spiral-code", heavily optimized code with different
+variants for use with and without SSE instructions etc etc.
+
+For the RPI there we also variants, using specialized NEON instructions.
+
+There are two reasons I was not happy with that solution,
+the first one - of course - being that I did not write it myself.
+The second, maybe even more important reason was that these spiral
+approached are higly optimized for fixed, known, length segments
+to be deconvolved, but not usable for use in an environment with
+differently sized segments.
+
+While for the FIC blocks the length is predefined, for the data blocks
+in the audio or data streams it is not. This lead to a construction
+where the full spiral could be used for deconvolving the data in the
+FIC blocks, while for the data in the MSC the more "generic" deconvolver
+was used.
+
+A further complication was that the mingw cross compilers for windows do not
+have support for SSE instructions, so there all data was handled by
+the "generic" deconvolver.
+
+Looking at the requirements for the deconvolution in the DAB decoder,
+I saw a number of potential optimizations (in this case reducing the amount of
+computations) that could be applied to my original
+straightforward implementation.
+
+To test the two versions, I created three versions, one with
+the locally manually optimized viterbi decoder, one with the
+spiral/generic  and on with only the generic deconvolver
+(all three versions with O3 as optimization, and - of course - profiling flags.
+Running the three versions on
+same channel and the same service with profiling versions
+gave the following results
+a. the locally optimized version takes  38.10 (deconvolve) + 0.62
+(computeCosts)app 38 % of the load, resulting in 38.7 %
+b. the no-sse version takes  22.5 (BFlY) + 9.87 (update_viterbi) + 6.36 (FULL_SPIRAL_no_sse) + 0.72 (deconvolve) resulting in app 39.5 % of the load.
+c. the sse_version takes 24.28 (BFlY) + 9.94 (update_viterbi) + 2.22 (FULL_SPIRAL_sse) + 0.72 (deconvolve) resulting in app 37 %.
+
+While there is no doubt that the "sse" version is fastest, I prefer to
+use the "locally optimized" version, and set the parameters accordingly.
+
+If you want to use the spiral version for the x64, then
+a. uncomment the "viterbi-handler" lines and comment the "viterbi-jan"
+lines out in the different sections in the ".pro" file
+b. uncomment the line "CONFIG += SSE" (and be sure to have commented out the other SSE related lines)
+
+If you want to use the "generic" version, then follow the steps above, however,
+be sure to have uncommented the line "CONFIG+=NO_SSE"
+
+
+

_service:download_url:qt-dab-2.01.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.cpp -> _service:download_url:qt-dab-2.02.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.cpp Changed

@@ -89,6 +89,7 @@
 int16_t	i;
 QString	temp;
 int	k;
+char	manufac [256], product [256], serial [256];
 
 	rtlsdrSettings		= s;
 	this	-> myFrame	= new QFrame (NULL);
@@ -100,7 +101,6 @@
 	_I_Buffer		= NULL;
 	workerHandle		= NULL;
 	lastFrequency		= KHz (22000);	// just a dummy
-	this	-> vfoOffset	= 0;
 	gains			= NULL;
 
 #ifdef	__MINGW32__
@@ -168,6 +168,8 @@
 	   throw (23);
 	}
 
+	deviceName      -> setText (rtlsdr_get_device_name (deviceIndex));
+
 	open			= true;
 	r			= this -> rtlsdr_set_sample_rate (device,
 	                                                          inputRate);
@@ -186,6 +188,7 @@
 	r			= this -> rtlsdr_get_sample_rate (device);
 	fprintf (stderr, "samplerate set to %d\n", r);
 
+	
 	gainsCount = rtlsdr_get_tuner_gains (device, NULL);
 	fprintf(stderr, "Supported gain values (%d): ", gainsCount);
 	gains		= new int [gainsCount];
@@ -197,6 +200,7 @@
 	fprintf(stderr, "\n");
 
 	rtlsdr_set_tuner_gain_mode (device, 1);
+	rtlsdr_set_agc_mode (device, 0);
 
 	_I_Buffer		= new RingBuffer<uint8_t>(8 * 1024 * 1024);
 
@@ -220,9 +224,10 @@
 	
 	
 	ppm_correction	-> setValue (rtlsdrSettings -> value ("ppm_correction", 0). toInt ());
-	KhzOffset	-> setValue (rtlsdrSettings -> value ("KhzOffset", 0). toInt ());
 	rtlsdrSettings	-> endGroup ();
-//
+
+	rtlsdr_get_usb_strings (device, manufac, product, serial);
+
 //	all sliders/values are set to previous values, now do the settings
 //	based on these slider values
 	rtlsdr_set_tuner_gain_mode (device,
@@ -233,8 +238,7 @@
 	   rtlsdr_set_agc_mode (device, 0);
 	rtlsdr_set_tuner_gain	(device, theGain);
 	set_ppmCorrection	(ppm_correction -> value ());
-	set_KhzOffset		(KhzOffset -> value ());
-//
+
 	dumping			= false;
 //	and attach the buttons/sliders to the actions
 	connect (combo_gain, SIGNAL (activated (const QString &)),
@@ -243,8 +247,6 @@
 	         this, SLOT (set_autogain (const QString &)));
 	connect (ppm_correction, SIGNAL (valueChanged (int)),
 	         this, SLOT (set_ppmCorrection  (int)));
-	connect (KhzOffset, SIGNAL (valueChanged (int)),
-	         this, SLOT (set_KhzOffset (int)));
 	connect (dumpButton, SIGNAL (clicked (void)),
 	         this, SLOT (dumpButton_pressed (void)));
 }
@@ -273,8 +275,6 @@
 	                                      combo_autogain -> currentText ());
 	rtlsdrSettings	-> setValue ("ppm_correction",
 	                                      ppm_correction -> value ());
-	rtlsdrSettings	-> setValue ("KhzOffset",
-	                                      KhzOffset	-> value ());
 	rtlsdrSettings	-> sync ();
 	rtlsdrSettings	-> endGroup ();
 	
@@ -293,11 +293,11 @@
 
 void	rtlsdrHandler::setVFOFrequency	(int32_t f) {
 	lastFrequency	= f;
-	(void)(this -> rtlsdr_set_center_freq (device, f + vfoOffset));
+	(void)(this -> rtlsdr_set_center_freq (device, f));
 }
 
 int32_t	rtlsdrHandler::getVFOFrequency	(void) {
-	return (int32_t)(this -> rtlsdr_get_center_freq (device)) - vfoOffset;
+	return (int32_t)(this -> rtlsdr_get_center_freq (device));
 }
 //
 //
@@ -312,7 +312,7 @@
 	if (r < 0)
 	   return false;
 
-	this -> rtlsdr_set_center_freq (device, lastFrequency + vfoOffset);
+	this -> rtlsdr_set_center_freq (device, lastFrequency);
 	workerHandle	= new dll_driver (this);
 	rtlsdr_set_agc_mode (device,
                 combo_autogain -> currentText () == "autogain_on" ? 1 : 0);
@@ -350,11 +350,6 @@
 	this -> rtlsdr_set_freq_correction (device, ppm);
 }
 
-void	rtlsdrHandler::set_KhzOffset	(int32_t o) {
-	vfoOffset	= Khz (o);
-	(void)(this -> rtlsdr_set_center_freq (device, lastFrequency + vfoOffset));
-}
-
 //
 //	The brave old getSamples. For the dab stick, we get
 //	size samples: still in I/Q pairs, but we have to convert the data from
@@ -388,6 +383,7 @@
 	   fprintf (stderr, "Could not find rtlsdr_open\n");
 	   return false;
 	}
+
 	rtlsdr_close	= (pfnrtlsdr_close)
 	                     GETPROCADDRESS (Handle, "rtlsdr_close");
 	if (rtlsdr_close == NULL) {
@@ -395,6 +391,14 @@
 	   return false;
 	}
 
+	rtlsdr_get_usb_strings =
+	    (pfnrtlsdr_get_usb_strings)
+	    GETPROCADDRESS (Handle, "rtlsdr_get_usb_strings");
+	if (rtlsdr_get_usb_strings == NULL) {
+	   fprintf (stderr, "Could not find rtlsdr_get_usb_strings\n");
+	   return false;
+	}
+
 	rtlsdr_set_sample_rate =
 	    (pfnrtlsdr_set_sample_rate)GETPROCADDRESS (Handle, "rtlsdr_set_sample_rate");
 	if (rtlsdr_set_sample_rate == NULL) {

_service:download_url:qt-dab-2.01.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.h -> _service:download_url:qt-dab-2.02.tar.gz/devices/rtlsdr-handler/rtlsdr-handler.h Changed

_service:download_url:qt-dab-2.01.tar.gz/devices/rtlsdr-handler/rtlsdr-widget.ui -> _service:download_url:qt-dab-2.02.tar.gz/devices/rtlsdr-handler/rtlsdr-widget.ui Changed

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>260</width>
+    <width>219</width>
     <height>258</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>221</width>
+     <width>201</width>
      <height>231</height>
     </rect>
    </property>
@@ -31,8 +31,8 @@
    <widget class="QLabel" name="label">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>150</y>
+      <x>20</x>
+      <y>140</y>
       <width>101</width>
       <height>21</height>
      </rect>
@@ -57,35 +57,6 @@
      <number>100</number>
     </property>
    </widget>
-   <widget class="QSpinBox" name="KhzOffset">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>40</y>
-      <width>91</width>
-      <height>21</height>
-     </rect>
-    </property>
-    <property name="minimum">
-     <number>-100</number>
-    </property>
-    <property name="maximum">
-     <number>100</number>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_3">
-    <property name="geometry">
-     <rect>
-      <x>110</x>
-      <y>40</y>
-      <width>41</width>
-      <height>21</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>KHz</string>
-    </property>
-   </widget>
    <widget class="QLabel" name="label_4">
     <property name="geometry">
      <rect>
@@ -103,7 +74,7 @@
     <property name="geometry">
      <rect>
       <x>110</x>
-      <y>70</y>
+      <y>30</y>
       <width>41</width>
       <height>21</height>
      </rect>
@@ -116,7 +87,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>70</y>
+      <y>30</y>
       <width>91</width>
       <height>21</height>
      </rect>
@@ -126,8 +97,8 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>120</y>
-      <width>141</width>
+      <y>60</y>
+      <width>131</width>
       <height>21</height>
      </rect>
     </property>
@@ -146,7 +117,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>170</y>
+      <y>100</y>
       <width>141</width>
       <height>36</height>
      </rect>
@@ -155,6 +126,32 @@
      <string>write raw bytes</string>
     </property>
    </widget>
+   <widget class="QLabel" name="product_display">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>170</y>
+      <width>161</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QLabel" name="deviceName">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>190</y>
+      <width>161</width>
+      <height>21</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
   </widget>
  </widget>
  <resources/>

_service:download_url:qt-dab-2.01.tar.gz/devices/sdrplay-handler/sdrplay-handler.cpp -> _service:download_url:qt-dab-2.02.tar.gz/devices/sdrplay-handler/sdrplay-handler.cpp Changed

@@ -76,34 +76,37 @@
 wchar_t APIkeyValue [256];
 ULONG APIkeyValue_length = 255;
 
-	if (RegOpenKey (HKEY_LOCAL_MACHINE,
-	                TEXT("Software\\MiricsSDR\\API"),
-	                &APIkey) != ERROR_SUCCESS) {
-          fprintf (stderr,
+
+	wchar_t *libname = (wchar_t *)L"mir_sdr_api.dll";
+	Handle	= LoadLibrary (libname);
+	if (Handle == NULL) {
+	   if (RegOpenKey (HKEY_LOCAL_MACHINE,
+	                   TEXT("Software\\MiricsSDR\\API"),
+	                   &APIkey) != ERROR_SUCCESS) {
+              fprintf (stderr,
 	           "failed to locate API registry entry, error = %d\n",
 	           (int)GetLastError());
-	   delete myFrame;
-	   throw (21);
-	}
-
-	RegQueryValueEx (APIkey,
-	                 (wchar_t *)L"Install_Dir",
-	                 NULL,
-	                 NULL,
-	                 (LPBYTE)&APIkeyValue,
-	                 (LPDWORD)&APIkeyValue_length);
+	      delete myFrame;
+	      throw (21);
+	   }
+
+	   RegQueryValueEx (APIkey,
+	                    (wchar_t *)L"Install_Dir",
+	                    NULL,
+	                    NULL,
+	                    (LPBYTE)&APIkeyValue,
+	                    (LPDWORD)&APIkeyValue_length);
 //	Ok, make explicit it is in the 32 bits section
-	wchar_t *x = wcscat (APIkeyValue, (wchar_t *)L"\\x86\\mir_sdr_api.dll");
-//	wchar_t *x = wcscat (APIkeyValue, (wchar_t *)L"\\x64\\mir_sdr_api.dll");
-//	fprintf (stderr, "Length of APIkeyValue = %d\n", APIkeyValue_length);
-//	wprintf (L"API registry entry: %s\n", APIkeyValue);
-	RegCloseKey(APIkey);
+	   wchar_t *x =
+	        wcscat (APIkeyValue, (wchar_t *)L"\\x86\\mir_sdr_api.dll");
+	   RegCloseKey(APIkey);
 
-	Handle	= LoadLibrary (x);
-	if (Handle == NULL) {
-	  fprintf (stderr, "Failed to open mir_sdr_api.dll\n");
-	  delete myFrame;
-	  throw (22);
+	   Handle	= LoadLibrary (x);
+	   if (Handle == NULL) {
+	      fprintf (stderr, "Failed to open mir_sdr_api.dll\n");
+	      delete myFrame;
+	      throw (22);
+	   }
 	}
 #else
 	Handle		= dlopen ("libusb-1.0.so", RTLD_NOW | RTLD_GLOBAL);
@@ -164,12 +167,10 @@
 	sdrplaySettings		-> beginGroup ("sdrplaySettings");
 	coarseOffset	=
 	            sdrplaySettings -> value ("sdrplayOffset", 0). toInt ();
-	ifgainSlider 		-> setValue (
+	GRdBSelector 		-> setValue (
 	            sdrplaySettings -> value ("sdrplay-ifgrdb", 20). toInt ());
 	lnaGainSetting		-> setValue (
 	            sdrplaySettings -> value ("sdrplay-lnastate", 0). toInt ());
-//	show the value
-	GRdBDisplay		-> display (ifgainSlider -> value ());
 
 	ppmControl		-> setValue (
 	            sdrplaySettings -> value ("sdrplay-ppm", 0). toInt ());
@@ -181,7 +182,7 @@
 	       sdrplaySettings -> value ("sdrplay-agcMode", 0). toInt () != 0;
 	if (agcMode) {
 	   agcControl -> setChecked (true);
-	   ifgainSlider         -> hide ();
+	   GRdBSelector         -> hide ();
 	   gainsliderLabel      -> hide ();
 	}
 	sdrplaySettings	-> endGroup ();
@@ -289,7 +290,7 @@
 	}
 
 //	and be prepared for future changes in the settings
-	connect (ifgainSlider, SIGNAL (valueChanged (int)),
+	connect (GRdBSelector, SIGNAL (valueChanged (int)),
 	         this, SLOT (set_ifgainReduction (int)));
 	connect (lnaGainSetting, SIGNAL (valueChanged (int)),
 	         this, SLOT (set_lnagainReduction (int)));
@@ -311,10 +312,9 @@
 	stopReader ();
 	sdrplaySettings	-> beginGroup ("sdrplaySettings");
 	sdrplaySettings	-> setValue ("sdrplayOffset", coarseOffset);
-	sdrplaySettings	-> setValue ("sdrplayGain", ifgainSlider -> value ());
 	sdrplaySettings -> setValue ("sdrplay-ppm", ppmControl -> value ());
 	sdrplaySettings -> setValue ("sdrplay-ifgrdb",
-	                                    ifgainSlider -> value ());
+	                                    GRdBSelector -> value ());
 	sdrplaySettings -> setValue ("sdrplay-lnastate",
 	                                    lnaGainSetting -> value ());
 	sdrplaySettings	-> setValue ("sdrplay-agcMode",
@@ -363,7 +363,7 @@
 int	gRdBSystem;
 int	samplesPerPacket;
 mir_sdr_ErrT	err;
-int	localGred	= ifgainSlider	-> value ();
+int	localGred	= GRdBSelector	-> value ();
 int	lnaState	= lnaGainSetting -> value ();
 
 	if (bankFor_sdr (newFrequency) == -1)
@@ -401,7 +401,7 @@
 
 void	sdrplayHandler::set_ifgainReduction	(int newGain) {
 mir_sdr_ErrT	err;
-int	GRdB		= ifgainSlider	-> value ();
+int	GRdB		= GRdBSelector	-> value ();
 int	lnaState	= lnaGainSetting -> value ();
 
 	(void)newGain;
@@ -411,7 +411,6 @@
 	   fprintf (stderr, "Error at set_ifgain %s\n",
 	                    errorCodes (err). toLatin1 (). data ());
 	else {
-	   GRdBDisplay		-> display (GRdB);
 	   lnaGRdBDisplay	-> display (get_lnaGRdB (hwVersion, lnaState));
 	}
 }
@@ -466,7 +465,6 @@
 	                      uint32_t	lnaGRdB,
 	                      void	*cbContext) {
 sdrplayHandler	*p	= static_cast<sdrplayHandler *> (cbContext);
-	p -> GRdBDisplay	-> display ((int)GRdB);
 	(void)lnaGRdB;
 //	p -> lnaGRdBDisplay	-> display ((int)lnaGRdB);
 }
@@ -475,7 +473,7 @@
 int	gRdBSystem;
 int	samplesPerPacket;
 mir_sdr_ErrT	err;
-int	GRdB		= ifgainSlider	-> value ();
+int	GRdB		= GRdBSelector	-> value ();
 int	lnaState	= lnaGainSetting -> value ();
 
 	if (running. load ())
@@ -507,8 +505,7 @@
 	   my_mir_sdr_AgcControl (mir_sdr_AGC_100HZ,
 	                          -30,
 	                          0, 0, 0, 0, lnaGainSetting -> value ());
-	   ifgainSlider		-> hide ();
-	   gainsliderLabel	-> hide ();
+	   GRdBSelector		-> hide ();
 	}
 
 	err		= my_mir_sdr_SetDcMode (4, 1);
@@ -745,12 +742,12 @@
 	                       -30,
 	                       0, 0, 0, 0, lnaGainSetting -> value ());
 	if (!agcMode) {
-	   ifgainSlider		-> show ();
-	   gainsliderLabel	-> show ();
+	   GRdBSelector		-> show ();
+	   gainsliderLabel	-> show ();	// old name actually
 	   set_ifgainReduction (0);
 	}
 	else {
-	   ifgainSlider		-> hide ();
+	   GRdBSelector		-> hide ();
 	   gainsliderLabel	-> hide ();
 	}
 }

_service:download_url:qt-dab-2.01.tar.gz/devices/sdrplay-handler/sdrplay-widget.ui -> _service:download_url:qt-dab-2.02.tar.gz/devices/sdrplay-handler/sdrplay-widget.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>280</width>
-    <height>301</height>
+    <width>350</width>
+    <height>270</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,10 +16,10 @@
   <widget class="QFrame" name="frame">
    <property name="geometry">
     <rect>
-     <x>0</x>
+     <x>10</x>
      <y>0</y>
-     <width>261</width>
-     <height>291</height>
+     <width>321</width>
+     <height>261</height>
     </rect>
    </property>
    <property name="frameShape">
@@ -31,9 +31,9 @@
    <widget class="QLabel" name="deviceLabel">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>80</y>
-      <width>81</width>
+      <x>20</x>
+      <y>20</y>
+      <width>121</width>
       <height>21</height>
      </rect>
     </property>
@@ -57,8 +57,8 @@
    <widget class="QLCDNumber" name="api_version">
     <property name="geometry">
      <rect>
-      <x>90</x>
-      <y>80</y>
+      <x>130</x>
+      <y>20</y>
       <width>81</width>
       <height>21</height>
      </rect>
@@ -73,52 +73,11 @@
      <enum>QLCDNumber::Flat</enum>
     </property>
    </widget>
-   <widget class="QSlider" name="ifgainSlider">
-    <property name="geometry">
-     <rect>
-      <x>220</x>
-      <y>50</y>
-      <width>20</width>
-      <height>121</height>
-     </rect>
-    </property>
-    <property name="toolTip">
-     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;gain slider, its value is used as measure for the gain reduction of the baseband signal. If the agc is selected, the slider is not effective and is not shown.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-    </property>
-    <property name="minimum">
-     <number>20</number>
-    </property>
-    <property name="maximum">
-     <number>59</number>
-    </property>
-    <property name="orientation">
-     <enum>Qt::Vertical</enum>
-    </property>
-   </widget>
-   <widget class="QLCDNumber" name="GRdBDisplay">
-    <property name="geometry">
-     <rect>
-      <x>190</x>
-      <y>180</y>
-      <width>61</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="toolTip">
-     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The display shows the gain reduction applied to the baseband signal in the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-    </property>
-    <property name="digitCount">
-     <number>2</number>
-    </property>
-    <property name="segmentStyle">
-     <enum>QLCDNumber::Flat</enum>
-    </property>
-   </widget>
    <widget class="QCheckBox" name="agcControl">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>140</y>
+      <x>200</x>
+      <y>150</y>
       <width>71</width>
       <height>21</height>
      </rect>
@@ -142,9 +101,9 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>15</y>
-      <width>81</width>
-      <height>21</height>
+      <y>80</y>
+      <width>91</width>
+      <height>31</height>
      </rect>
     </property>
     <property name="toolTip">
@@ -160,10 +119,10 @@
    <widget class="QLabel" name="serialNumber">
     <property name="geometry">
      <rect>
-      <x>10</x>
-      <y>110</y>
-      <width>151</width>
-      <height>20</height>
+      <x>20</x>
+      <y>50</y>
+      <width>171</width>
+      <height>21</height>
      </rect>
     </property>
     <property name="text">
@@ -173,9 +132,9 @@
    <widget class="QComboBox" name="antennaSelector">
     <property name="geometry">
      <rect>
-      <x>130</x>
-      <y>240</y>
-      <width>121</width>
+      <x>160</x>
+      <y>220</y>
+      <width>141</width>
       <height>31</height>
      </rect>
     </property>
@@ -205,8 +164,8 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>180</y>
-      <width>131</width>
+      <y>150</y>
+      <width>101</width>
       <height>31</height>
      </rect>
     </property>
@@ -217,8 +176,8 @@
    <widget class="QLCDNumber" name="lnaGRdBDisplay">
     <property name="geometry">
      <rect>
-      <x>140</x>
-      <y>180</y>
+      <x>110</x>
+      <y>150</y>
       <width>51</width>
       <height>31</height>
      </rect>
@@ -237,8 +196,8 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>240</y>
-      <width>121</width>
+      <y>220</y>
+      <width>141</width>
       <height>31</height>
      </rect>
     </property>
@@ -267,8 +226,8 @@
    <widget class="QCheckBox" name="debugControl">
     <property name="geometry">
      <rect>
-      <x>80</x>
-      <y>140</y>
+      <x>200</x>
+      <y>180</y>
       <width>88</width>
       <height>21</height>
      </rect>
@@ -281,7 +240,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>40</y>
+      <y>120</y>
       <width>101</width>
       <height>21</height>
      </rect>
@@ -301,8 +260,8 @@
    <widget class="QLabel" name="gainsliderLabel">

_service:download_url:qt-dab-2.01.tar.gz/includes/ofdm/fic-handler.h -> _service:download_url:qt-dab-2.02.tar.gz/includes/ofdm/fic-handler.h Changed

_service:download_url:qt-dab-2.01.tar.gz/includes/output/audiosink.h -> _service:download_url:qt-dab-2.02.tar.gz/includes/output/audiosink.h Changed

_service:download_url:qt-dab-2.01.tar.gz/includes/protection/protection.h -> _service:download_url:qt-dab-2.02.tar.gz/includes/protection/protection.h Changed

_service:download_url:qt-dab-2.02.tar.gz/includes/support/viterbi-handler Added

_service:download_url:qt-dab-2.02.tar.gz/includes/support/viterbi-handler/viterbi-handler.h Added

@@ -0,0 +1,73 @@
+#
+#ifndef	__VITERBI_HANDLER__
+#define	__VITERBI_HANDLER__
+/*
+ * 	Viterbi.h according to the SPIRAL project
+ */
+#include	"dab-constants.h"
+
+//	For our particular viterbi decoder, we have
+#define	RATE	4
+#define NUMSTATES 64
+#define DECISIONTYPE uint32_t
+//#define DECISIONTYPE uint8_t
+//#define DECISIONTYPE_BITSIZE 8
+#define DECISIONTYPE_BITSIZE 32
+#define COMPUTETYPE uint32_t
+
+//decision_t is a BIT vector
+typedef union {
+	DECISIONTYPE t[NUMSTATES/DECISIONTYPE_BITSIZE];
+	uint32_t w[NUMSTATES/32];
+	uint16_t s[NUMSTATES/16];
+	uint8_t c[NUMSTATES/8];
+} decision_t __attribute__ ((aligned (16)));
+
+typedef union {
+	COMPUTETYPE t[NUMSTATES];
+} metric_t __attribute__ ((aligned (16)));
+
+/* State info for instance of Viterbi decoder
+ */
+
+struct v {
+/* path metric buffer 1 */
+	__attribute__ ((aligned (16))) metric_t metrics1;
+/* path metric buffer 2 */
+	__attribute__ ((aligned (16))) metric_t metrics2;
+/* Pointers to path metrics, swapped on every bit */
+	metric_t *old_metrics,*new_metrics;
+	decision_t *decisions;   /* decisions */
+};
+
+class	viterbiHandler {
+public:
+		viterbiHandler	(int16_t, bool spiral = false);
+		~viterbiHandler	(void);
+	void	deconvolve	(int16_t *, uint8_t *);
+private:
+
+	bool		spiral;
+	struct v	vp;
+	COMPUTETYPE Branchtab	[NUMSTATES / 2 * RATE] __attribute__ ((aligned (16)));
+//	int	parityb		(uint8_t);
+	int	parity		(int);
+	void	partab_init	(void);
+//	uint8_t	Partab	[256];
+	void	init_viterbi	(struct v *, int16_t);
+	void	update_viterbi_blk_GENERIC	(struct v *, COMPUTETYPE *,
+	                                         int16_t);
+	void	update_viterbi_blk_SPIRAL	(struct v *, COMPUTETYPE *,
+	                                         int16_t);
+	void	chainback_viterbi (struct v *, uint8_t *, int16_t, uint16_t);
+	struct v *viterbi_alloc (int32_t);
+	void	BFLY		(int32_t, int, COMPUTETYPE *,
+	                         struct v *, decision_t *);
+//	uint8_t *bits;
+	uint8_t *data;
+	COMPUTETYPE *symbols;
+	int16_t	frameBits;
+};
+
+#endif
+

_service:download_url:qt-dab-2.02.tar.gz/includes/support/viterbi-jan Added

_service:download_url:qt-dab-2.02.tar.gz/includes/support/viterbi-jan/viterbi-handler.h Added

@@ -0,0 +1,47 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of qt-dab
+ *
+ *    qt-dab 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.
+ *
+ *    qt-dab 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 qt-dab; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef	__VITERBI_HANDLER__
+#define	__VITERBI_HANDLER__
+
+#include	<stdint.h>
+
+class	viterbiHandler {
+
+public:
+		viterbiHandler	(int, bool);
+		~viterbiHandler	(void);
+	void	deconvolve	(int16_t *, uint8_t *);
+private:
+	int     costTable [16];
+	void	computeCostTable (int16_t,  int16_t, int16_t, int16_t);
+	uint8_t	bitFor		(int, int, int);
+	int	blockLength;
+	int	*stateSequence;
+	int	**transCosts;
+	int	**history;
+};
+
+#endif
+
+

_service:download_url:qt-dab-2.01.tar.gz/main.cpp -> _service:download_url:qt-dab-2.02.tar.gz/main.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/qt-dab-1.png -> _service:download_url:qt-dab-2.02.tar.gz/qt-dab-1.png Changed

_service:download_url:qt-dab-2.02.tar.gz/qt-dab-installer.iss Added

@@ -0,0 +1,55 @@
+
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "qt-dab"
+#define MyAppVersion "2.0.1"
+#define MyAppPublisher "Lazy Chair Computing"
+#define MyAppURL "https://github.com/JvanKatwijk/qt-dab"
+#define MyAppExeName "qt-dab-2.0.exe";
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId= {{92064982-08C3-41AA-AECD-4F8265E3A73B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DisableProgramGroupPage=yes
+LicenseFile=E:\sdr-j-development\windows-qt-dab\COPYRIGHT.this_software
+InfoBeforeFile=E:\sdr-j-development\windows-qt-dab\preamble.txt
+OutputBaseFilename=setup-qt-dab
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "E:\sdr-j-development\windows-qt-dab\qt-dab-2.0.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "E:\sdr-j-development\windows-qt-dab\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "E:\sdr-j-development\SDRplay_RSP_API-Windows-2.13.1.exe"; DestDir: "{app}"; AfterInstall : install_sdrplayApi
+
+[Icons]
+Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[code]
+procedure install_sdrplayApi;
+var
+    resultCode : Integer;
+begin
+   Exec (ExpandConstant('{app}\SDRplay_RSP_API-Windows-2.13.1.exe'), '', '', SW_SHOWNORMAL,
+    ewWaitUntilTerminated, ResultCode)
+end;

_service:download_url:qt-dab-2.01.tar.gz/qt-dab.pro -> _service:download_url:qt-dab-2.02.tar.gz/qt-dab.pro Changed

@@ -7,11 +7,10 @@
 TEMPLATE	= app
 TARGET		= qt-dab-2.0
 QT		+= widgets 
-CONFIG		+= console
+CONFIG		-= console
 QMAKE_CXXFLAGS	+= -std=c++11
-QMAKE_CFLAGS	+=  -flto -ffast-math
-QMAKE_CXXFLAGS	+=  -flto -ffast-math
-QMAKE_LFLAGS	+=  -flto
+QMAKE_CFLAGS	+=  -O3 -ffast-math
+QMAKE_CXXFLAGS	+=  -O3 -ffast-math
 #QMAKE_CFLAGS	+=  -g
 #QMAKE_CXXFLAGS	+=  -g
 #QMAKE_LFLAGS	+=  -g
@@ -34,7 +33,8 @@
 	      ./src/backend/data/journaline \
 	      ./src/output \
 	      ./src/support \
-	      ./src/support/viterbi_768 \
+	      ./src/support/viterbi-jan \
+#	      ./src/support/viterbi-handler \
 	      ./devices \
 	      ./devices/rawfiles \
 	      ./devices/wavfiles \
@@ -69,7 +69,8 @@
 	      ./includes/backend/data/journaline \
 	      ./includes/output \
 	      ./includes/support \
-	      ./includes/support/viterbi_768 \
+	      ./includes/support/viterbi-jan \
+#	      ./includes/support/viterbi-handler \
 	      ./devices \
 	      ./devices/rawfiles \
 	      ./devices/wavfiles \
@@ -134,8 +135,8 @@
 	   ./includes/output/audio-base.h \
 	   ./includes/output/newconverter.h \
 	   ./includes/output/audiosink.h \
-#	   ./includes/support/viterbi.h \
-	   ./includes/support/viterbi_768/viterbi-768.h \
+	   ./includes/support/viterbi-jan/viterbi-handler.h \
+#	   ./includes/support/viterbi-handler/viterbi-handler.h \
            ./includes/support/fft-handler.h \
 	   ./includes/support/ringbuffer.h \
 	   ./includes/support/Xtan2.h \
@@ -212,12 +213,11 @@
 	   ./src/backend/data/journaline/dabdgdec_impl.c \
 	   ./src/backend/data/journaline/newsobject.cpp \
 	   ./src/backend/data/journaline/NML.cpp \
-#	   ./src/output/fir-filters.cpp \
 	   ./src/output/audio-base.cpp \
 	   ./src/output/newconverter.cpp \
 	   ./src/output/audiosink.cpp \
-#	   ./src/support/viterbi.cpp \
-	   ./src/support/viterbi_768/viterbi-768.cpp \
+	   ./src/support/viterbi-jan/viterbi-handler.cpp \
+#	   ./src/support/viterbi-handler/viterbi-handler.cpp \
            ./src/support/fft-handler.cpp \
 	   ./src/support/Xtan2.cpp \
 	   ./src/support/dab-params.cpp \
@@ -285,8 +285,8 @@
 CONFIG		+= try-epg		# do not use
 DEFINES		+= MSC_DATA__		# use at your own risk
 DEFINES		+= PRESET_NAME
-
 DEFINES		+= __THREADED_BACKEND
+DEFINES	+= SHOW_MISSING
 
 # you might select SSE if you are compiling on a x64 with SSE support
 # and you might select NEON if you are compiling for an arm (however
@@ -294,13 +294,13 @@
 #CONFIG	+= NEON_RPI2
 #CONFIG	+= NEON_RPI3
 #CONFIG	+= SSE
-CONFIG	+= NO_SSE
+#CONFIG	+= NO_SSE
 }
 #
 # an attempt to have it run under W32 through cross compilation
 win32 {
 #DESTDIR	= ../../../dab-win
-DESTDIR		= ../../windows-bin
+DESTDIR		= ../../windows-qt-dab
 # includes in mingw differ from the includes in fedora linux
 
 exists ("./.git") {
@@ -343,7 +343,7 @@
 CONFIG		+= sdrplay
 CONFIG		+= hackrf
 
-CONFIG		+= NO_SSE
+#CONFIG		+= NO_SSE
 
 #very experimental, simple server for connecting to a tdc handler
 #CONFIG		+= datastreamer
@@ -501,8 +501,8 @@
 	DEFINES		+= NEON_AVAILABLE
 	QMAKE_CFLAGS	+=  -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4  
 	QMAKE_CXXFLAGS	+=  -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4  
-	HEADERS		+= ./src/support/viterbi_768/spiral-neon.h
-	SOURCES		+= ./src/support/viterbi_768/spiral-neon.c
+	HEADERS		+= ./src/support/viterbi-handler/spiral-neon.h
+	SOURCES		+= ./src/support/viterbi-handler/spiral-neon.c
 }
 
 # for RPI3 use:
@@ -510,19 +510,19 @@
 	DEFINES		+= NEON_AVAILABLE
 #	QMAKE_CFLAGS	+=  -mcpu=cortex-a53 -mfloat-abi=hard -mfpu=neon-fp-armv8 -mneon-for-64bits
 #	QMAKE_CXXFLAGS	+=  -mcpu=cortex-a53 -mfloat-abi=hard -mfpu=neon-fp-armv8 -mneon-for-64bits
-	HEADERS		+= ./src/support/viterbi_768/spiral-neon.h
-	SOURCES		+= ./src/support/viterbi_768/spiral-neon.c
+	HEADERS		+= ./src/support/viterbi-handler/spiral-neon.h
+	SOURCES		+= ./src/support/viterbi-handler/spiral-neon.c
 }
 
 SSE	{
 	DEFINES		+= SSE_AVAILABLE
-	HEADERS		+= ./src/support/viterbi_768/spiral-sse.h
-	SOURCES		+= ./src/support/viterbi_768/spiral-sse.c
+	HEADERS		+= ./src/support/viterbi-handler/spiral-sse.h
+	SOURCES		+= ./src/support/viterbi-handler/spiral-sse.c
 }
 
 NO_SSE	{
-	HEADERS		+= ./src/support/viterbi_768/spiral-no-sse.h
-	SOURCES		+= ./src/support/viterbi_768/spiral-no-sse.c
+	HEADERS		+= ./src/support/viterbi-handler/spiral-no-sse.h
+	SOURCES		+= ./src/support/viterbi-handler/spiral-no-sse.c
 }

_service:download_url:qt-dab-2.01.tar.gz/radio.cpp -> _service:download_url:qt-dab-2.02.tar.gz/radio.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/src/protection/eep-protection.cpp -> _service:download_url:qt-dab-2.02.tar.gz/src/protection/eep-protection.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/src/protection/protection.cpp -> _service:download_url:qt-dab-2.02.tar.gz/src/protection/protection.cpp Changed

_service:download_url:qt-dab-2.01.tar.gz/src/protection/uep-protection.cpp -> _service:download_url:qt-dab-2.02.tar.gz/src/protection/uep-protection.cpp Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler Added

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/README Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/SSE2NEON.h Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/spiral-neon.c Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/spiral-neon.h Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/spiral-no-sse.c Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/spiral-no-sse.h Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/spiral-sse.c Changed

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/spiral-sse.h Added

@@ -0,0 +1,36 @@
+/***************************************************************
+This code was generated by Spiral 6.0 beta, www.spiral.net --
+Copyright (c) 2005-2008, Carnegie Mellon University.
+All rights reserved.
+The code is distributed under the GNU General Public License (GPL)
+(see http://www.gnu.org/copyleft/gpl.html)
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+******************************************************************/
+#include	<stdint.h>
+
+#define K 7
+#define RATE 4
+#define POLYS { 109, 79, 83, 109 }
+#define NUMSTATES 64
+#define FRAMEBITS 2048
+#define DECISIONTYPE unsigned int
+#define DECISIONTYPE_BITSIZE 32
+#define COMPUTETYPE uint32_t
+#define EBN0 3
+#define TRIALS 10000
+#define __int32 int
+#define FUNC FULL_SPIRAL
+#define METRICSHIFT 0
+#define PRECISIONSHIFT 0
+#define RENORMALIZE_THRESHOLD 2000000000

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-handler/viterbi-handler.cpp Added

@@ -0,0 +1,376 @@
+#
+/*
+ *    Copyright (C) 2013
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of the Qt-DAB
+ *    Qt-DAB 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.
+ *
+ *    Qt-DAB 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 Qt-DAB; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	"mm_malloc.h"
+#include	"viterbi-handler.h"
+#include	<cstring>
+#ifdef  __MINGW32__
+#include	<intrin.h>
+#include	<malloc.h>
+#include	<windows.h>
+#endif
+
+//
+//	It took a while to discover that the polynomes we used
+//	in our own "straightforward" implementation was bitreversed!!
+//	The official one is on top.
+#define K 7
+#define POLYS { 0155, 0117, 0123, 0155}
+//#define	POLYS	{109, 79, 83, 109}
+// In the reversed form the polys look:
+//#define POLYS { 0133, 0171, 0145, 0133 }
+//#define POLYS { 91, 121, 101, 91 }
+
+#define	METRICSHIFT	0
+#define	PRECISIONSHIFT	0
+#define	RENORMALIZE_THRESHOLD	137
+
+//
+/* ADDSHIFT and SUBSHIFT make sure that the thing returned is a byte. */
+#if (K-1<8)
+#define ADDSHIFT (8-(K-1))
+#define SUBSHIFT 0
+#elif (K-1>8)
+#define ADDSHIFT 0
+#define SUBSHIFT ((K-1)-8)
+#else
+#define ADDSHIFT 0
+#define SUBSHIFT 0
+#endif
+
+
+static uint8_t Partab [] = 
+{ 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0};
+
+//
+//	One could create the table above, i.e. a 256 entry
+//	odd-parity lookup table by the following function
+//	It is now precomputed
+void	viterbiHandler::partab_init (void){
+int16_t i,cnt,ti;
+
+	for (i = 0; i < 256; i++){
+	   cnt = 0;
+	   ti = i;
+	   while (ti != 0) {
+	      if (ti & 1) cnt++;
+	      ti >>= 1;
+	   }
+	   Partab [i] = cnt & 1;
+	}
+}
+
+int 	viterbiHandler::parity (int x){
+	/* Fold down to one byte */
+	x ^= (x >> 16);
+	x ^= (x >> 8);
+	return Partab [x];
+//	return parityb(x);
+}
+
+static inline
+void	renormalize (COMPUTETYPE* X, COMPUTETYPE threshold){
+int32_t	i;
+
+	if (X [0] > threshold){
+	   COMPUTETYPE min = X [0];
+	   for (i = 0; i < NUMSTATES; i++)
+	      if (min > X[i])
+	         min = X[i];
+	   for (i = 0; i < NUMSTATES; i++)
+	      X[i] -= min;
+      }
+}
+//
+//
+//	The main use of the viterbi decoder is in handling the FIC blocks
+//	There are (in mode 1) 3 ofdm blocks, giving 4 FIC blocks
+//	There all have a predefined length. In that case we use the
+//	"fast" (i.e. spiral) code, otherwise we use the generic code
+	viterbiHandler::viterbiHandler (int16_t wordlength, bool spiral) {
+int polys [RATE] = POLYS;
+int16_t	i, state;
+#ifdef	__MINGW32__
+uint32_t	size;
+#endif
+
+	frameBits		= wordlength;
+	this	-> spiral	= spiral;
+//	partab_init	();
+
+// B I G N O T E	The spiral code uses (wordLength + (K - 1) * sizeof ...
+// However, the application then crashes, so something is not OK
+// By doubling the size, the problem disappears. It is not solved though
+// and not further investigation.
+#ifdef __MINGW32__
+	size = 2 * ((wordlength + (K - 1)) / 8 + 1 + 16) & ~0xF;
+	data	= (uint8_t *)_aligned_malloc (size, 16);
+	size = 2 * (RATE * (wordlength + (K - 1)) * sizeof(COMPUTETYPE) + 16) & ~0xF;
+	symbols	= (COMPUTETYPE *)_aligned_malloc (size, 16);
+	size	= 2 * (wordlength + (K - 1)) * sizeof (decision_t);	
+	size	= (size + 16) & ~0xF;
+	vp. decisions = (decision_t  *)_aligned_malloc (size, 16);
+#else
+	if (posix_memalign ((void**)&data, 16,
+	                        (wordlength + (K - 1))/ 8 + 1)){
+	   printf("Allocation of data array failed\n");
+	}
+	if (posix_memalign ((void**)&symbols, 16,
+	                     RATE * (wordlength + (K - 1)) * sizeof(COMPUTETYPE))){
+	   printf("Allocation of symbols array failed\n");
+	}
+	if (posix_memalign ((void**)&(vp. decisions),
+	                    16,
+	                    2 * (wordlength + (K - 1)) * sizeof (decision_t))){
+	   printf ("Allocation of vp decisions failed\n");
+	}
+#endif
+
+	for (state = 0; state < NUMSTATES / 2; state++) {
+	   for (i = 0; i < RATE; i++)
+	      Branchtab [i * NUMSTATES / 2 + state] =
+	                     (polys[i] < 0) ^
+	                        parity((2 * state) & abs (polys[i])) ? 255 : 0;
+	}
+//
+	init_viterbi (&vp, 0);
+}
+
+
+	viterbiHandler::~viterbiHandler	(void) {
+#ifdef	__MINGW32__
+	_aligned_free (vp. decisions);
+	_aligned_free (data);
+	_aligned_free (symbols);
+#else
+	free (vp. decisions);
+	free (data);
+	free (symbols);
+#endif
+}
+
+static int maskTable [] = {128, 64, 32, 16, 8, 4, 2, 1};
+static  inline
+uint8_t getbit (uint8_t v, int32_t o) {
+        return  (v & maskTable [o]) ? 1 : 0;
+}
+
+//static
+//uint8_t getbit (uint8_t v, int32_t o) {
+//uint8_t	mask	= 1 << (7 - o);
+//	return  (v & mask) ? 1 : 0;
+//}
+	
+// depends: POLYS, RATE, COMPUTETYPE

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-jan Added

_service:download_url:qt-dab-2.02.tar.gz/src/support/viterbi-jan/viterbi-handler.cpp Added

@@ -0,0 +1,245 @@
+#
+/*
+ *    Copyright (C) 2014 .. 2017
+ *    Jan van Katwijk (J.vanKatwijk@gmail.com)
+ *    Lazy Chair Computing
+ *
+ *    This file is part of qt-dab
+ *
+ *    qt-dab 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.
+ *
+ *    qt-dab 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 qt-dab; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include	"viterbi-handler.h"
+#include	<stdio.h>
+
+#define	K	7
+#define	Poly1	0133
+#define	Poly2	0171
+#define	Poly3	0145
+#define	Poly4 	0133
+#define	numofStates	(1 << (K - 1))
+
+static	int	predecessor_for_0 [numofStates];
+static	int	predecessor_for_1 [numofStates];
+static	int16_t	indexTable [2 * numofStates];
+
+	viterbiHandler::viterbiHandler (int blockLength, bool flag) {
+int	i, j;
+	this	-> blockLength	= blockLength;
+	(void)flag;
+
+	transCosts	= new int *[blockLength + 6 + 1];
+	history		= new int *[blockLength + 6 + 1];
+	stateSequence	= new int [blockLength + 6 + 1];
+//
+	for (i = 0; i < blockLength + 6; i++) {
+	   transCosts [i]	= new int [numofStates];
+	   history    [i]	= new int [numofStates];
+	   stateSequence [i]	= 0;
+	   for (j = 0; j < numofStates; j ++) {
+	      transCosts [i][j] = 0;
+	      history    [i][j] = 0;
+	   }
+	}
+
+//  These tables give a mapping from (state * bit * Poly -> outputbit)
+	uint8_t poly1_table [2 * numofStates];
+	for (i = 0; i < 2; i ++)
+	   for (j = 0; j < numofStates; j ++)
+	      poly1_table [i * numofStates + j] = bitFor (j, Poly1, i);
+
+	int8_t poly2_table [2 * numofStates];
+	for (i = 0; i < 2; i ++)
+	   for (j = 0; j < numofStates; j ++)
+	      poly2_table [i * numofStates + j] = bitFor (j, Poly2, i);
+
+	uint8_t poly3_table [2 * numofStates];
+	for (i = 0; i < 2; i ++)
+	   for (j = 0; j < numofStates; j ++)
+	      poly3_table [i * numofStates + j] = bitFor (j, Poly3, i);
+
+	uint8_t poly4_table [2 * numofStates];
+	for (i = 0; i < 2; i ++)
+	   for (j = 0; j < numofStates; j ++)
+	      poly4_table [i * numofStates + j] = bitFor (j, Poly4, i);
+
+//      The indextable maps the four bits we get from the polynomes
+//      to an index, used in computing the costs
+	for (i = 0; i < 2 * numofStates; i ++)
+	   indexTable [i] = (int16_t) (
+                    ((poly1_table [i] != 0) ? 8 : 0) +
+                    ((poly2_table [i] != 0) ? 4 : 0) +
+                    ((poly3_table [i] != 0) ? 2 : 0) +
+                    ((poly4_table [i] != 0) ? 1 : 0));
+
+	for (i = 0; i < numofStates; i ++) {
+	   predecessor_for_0 [i] = ((i << 1) + 00) & (numofStates - 1);
+	   predecessor_for_1 [i] = ((i << 1) + 01) & (numofStates - 1);
+	}
+}
+
+	viterbiHandler::~viterbiHandler (void) {
+int	i;
+//
+	for (int i = 0; i < blockLength + 6; i++) {
+	   delete [] transCosts [i];
+	   delete [] history    [i];
+	}
+	delete [] transCosts;
+	delete [] history;
+	delete [] stateSequence;
+}
+
+//	Note that the soft bits are such that
+//	they are int16_t -255 -> (bit)1, +255 -> (bit)0
+void	viterbiHandler::computeCostTable (int16_t sym_0,
+                                          int16_t sym_1,
+	                                  int16_t sym_2, int16_t sym_3) {
+        costTable [0]  = - sym_0 - sym_1 - sym_2 - sym_3;
+        costTable [1]  = - sym_0 - sym_1 - sym_2 + sym_3;
+        costTable [2]  = - sym_0 - sym_1 + sym_2 - sym_3;
+        costTable [3]  = - sym_0 - sym_1 + sym_2 + sym_3;
+        costTable [4]  = - sym_0 + sym_1 - sym_2 - sym_3;
+        costTable [5]  = - sym_0 + sym_1 - sym_2 + sym_3;
+        costTable [6]  = - sym_0 + sym_1 + sym_2 - sym_3;
+        costTable [7]  = - sym_0 + sym_1 + sym_2 + sym_3;
+        costTable [8]  = + sym_0 - sym_1 - sym_2 - sym_3;
+        costTable [9]  = + sym_0 - sym_1 - sym_2 + sym_3;
+        costTable [10] = + sym_0 - sym_1 + sym_2 - sym_3;
+        costTable [11] = + sym_0 - sym_1 + sym_2 + sym_3;
+        costTable [12] = + sym_0 + sym_1 - sym_2 - sym_3;
+        costTable [13] = + sym_0 + sym_1 - sym_2 + sym_3;
+        costTable [14] = + sym_0 + sym_1 + sym_2 - sym_3;
+        costTable [15] = + sym_0 + sym_1 + sym_2 + sym_3;
+}
+
+//      block is the sequence of soft bits
+//      its length = 4 * blockLength + 4 * 6
+void	viterbiHandler::deconvolve	(int16_t *sym, uint8_t *bitBuffer) {
+int	prev_0, prev_1;
+int	costs_0, costs_1;
+int	i;
+
+//      first step is to "pump" the soft bits into the state machine
+//      and compute the cost matrix.
+//      we assume the overall costs for state 0 are zero
+//      and remain zero
+
+	for (i = 1; i < blockLength + 6; i ++) {
+           int16_t	sym_0 = (int16_t)(- sym [4 * (i - 1) + 0]);
+           int16_t	sym_1 = (int16_t)(- sym [4 * (i - 1) + 1]);
+           int16_t	sym_2 = (int16_t)(- sym [4 * (i - 1) + 2]);
+           int16_t	sym_3 = (int16_t)(- sym [4 * (i - 1) + 3]);
+	   int	*transCosts_i	= transCosts [i];
+	   int	*history_i	= history [i];
+
+	   computeCostTable (sym_0, sym_1, sym_2, sym_3);
+           for (int cState = 0; cState < numofStates / 2; cState ++) {
+              uint8_t entrybit =  0;
+              prev_0    = predecessor_for_0 [cState];
+              prev_1    = predecessor_for_1 [cState];
+//      we compute the minimal costs, based on the costs of the
+//      prev states, and the additional costs of arriving from
+//      the previous state to the current state with the symbol "sym"
+//
+//      entrybit = 0, so the index for the cost function is prev_xx
+	      costs_0 = transCosts [i - 1] [prev_0] +
+	                costTable [indexTable [prev_0]];
+	      costs_1 = transCosts [i - 1] [prev_1] +
+	                costTable [indexTable [prev_1]];
+	      if (costs_0 < costs_1) {
+	         transCosts_i  [cState] = costs_0;
+	         history_i     [cState] = prev_0;
+	      } else {
+	         transCosts_i  [cState] = costs_1;
+	         history_i     [cState] = prev_1;
+	      }
+	   }
+
+	   for (int cState = numofStates / 2;
+	                                cState < numofStates; cState ++) {
+              uint8_t entrybit = 1;
+	      prev_0    = predecessor_for_0 [cState];
+	      prev_1    = predecessor_for_1 [cState];
+
+//      we compute the minimal costs, based on the costs of the
+//      prev states, and the additional costs of arriving from
+//      the previous state to the current state with the symbol row "sym"
+//
+//      entrybit is here "1", so the index is id cost function
+//      is prev_xx + NumofStates
+	      costs_0 = transCosts [i - 1] [prev_0] +
+	                      costTable [indexTable [prev_0 + numofStates]];
+	      costs_1 = transCosts [i - 1] [prev_1] +
+                              costTable [indexTable [prev_1 + numofStates]];
+	      if (costs_0 < costs_1) {
+	         transCosts_i [cState] = costs_0;
+	         history_i    [cState] = prev_0;
+	      } else {
+	         transCosts_i [cState] = costs_1;
+	         history_i    [cState] = prev_1;
+              }
+           }
+	}
+
+//      Once all costs are computed, we can look for the minimal cost
+//      Our "end state" is somewhere in column blockLength + 6
+	int minimalCosts	= 1000000;

Changes of Revision 10