Packman Build Service PMBS

qt-drmplus.changes Changed

qt-drmplus.spec Changed

qt-drmplus-1.0.1.20180105.tar.gz/src/drmplus.c -> qt-drmplus-1.0.1.20181207.tar.gz/src/drmplus.c Changed

@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
+#include <assert.h>
 
 #include "drmplus_internal.h"
 
@@ -543,7 +544,7 @@
 	if(p->siginfo.spectrum_inverted > 0 && p->cfg.ifoEstimationType == IFO_EST_4SYMBOLS) {
 		fftw_complex tmp;
 		for (i=0;i<106;i++) {
-			tmp[0] = p->symbol[p->siginfo.dc_freq_coarse + 110+i][0];
+            tmp[0] = p->symbol[p->siginfo.dc_freq_coarse + 110+i][0];
 			tmp[1] = p->symbol[p->siginfo.dc_freq_coarse + 110+i][1];
 			p->symbol[p->siginfo.dc_freq_coarse + 110+i][1] = p->symbol[p->siginfo.dc_freq_coarse + 322-i][0];
 			p->symbol[p->siginfo.dc_freq_coarse + 110+i][0] = p->symbol[p->siginfo.dc_freq_coarse + 322-i][1];
@@ -696,6 +697,7 @@
 							fprintf(stderr, "Trying spectrum inversion...\n");
 							p->siginfo.spectrum_inverted = !p->siginfo.spectrum_inverted;
 							p->siginfo.fac_errors=0;
+                            drmplusResetSync(p, 0);
 						}
 
 						goto away_10;
@@ -707,6 +709,7 @@
 							p->siginfo.sync_state=SYNC_STATE_NULL; // FIXME: too hard reset?
 							p->frame_num = -1;
 							p->siginfo.fac_errors=0;
+                            drmplusResetSync(p, 0);
 							goto away_10;
 						}
 #else

qt-drmplus-1.0.1.20180105.tar.gz/src/drmplus_internal.h -> qt-drmplus-1.0.1.20181207.tar.gz/src/drmplus_internal.h Changed

qt-drmplus-1.0.1.20180105.tar.gz/src/sig_proc.c -> qt-drmplus-1.0.1.20181207.tar.gz/src/sig_proc.c Changed

@@ -45,7 +45,7 @@
 			double error = val1 - val2;
 			/* this is due phase error can be larger than 2*PI from first to last carrier
 			 * TODO: Maybe it's not needed in real life */
-			while (abs(error - prev_value) > M_PI) {
+			while (fabs(error - prev_value) > M_PI) {
 				if(error < prev_value) error+=2*M_PI;
 				else error-=2*M_PI;
 			}
@@ -209,16 +209,33 @@
 
 				int j;
 				for(j=0;j<cmp_num;j++) {
-					H_pilots[i-j][0] = (H_pilots[i-j][0] + H_pilots[i][0] - j*pil_diff[0])/2;
-					H_pilots[i-j][1] = (H_pilots[i-j][1] + H_pilots[i][1] - j*pil_diff[1])/2;
+					if(!use_mem) {
+						H_pilots[i-j][0] = (q31_t)H_pilots[i][0] - j*pil_diff[0];
+						H_pilots[i-j][1] = (q31_t)H_pilots[i][1] - j*pil_diff[1];
+					} else {
+						H_pilots[i-j][0] = ((q31_t)H_pilots[i-j][0] + H_pilots[i][0] - j*pil_diff[0])/2;
+						H_pilots[i-j][1] = ((q31_t)H_pilots[i-j][1] + H_pilots[i][1] - j*pil_diff[1])/2;
+					}
+				}
+
+				if(pil_id==13 || (pil_id==12 && phases[symbol_id][pil_id+1] == 32767)) {
+					//enchance tail...
+					cmp_num = Ncarr - i;
+					int j;
+					for(j=0;j<cmp_num;j++) {
+						if(!use_mem) {
+							H_pilots[i+j][0] = (q31_t)H_pilots[i][0] + j*pil_diff[0];
+							H_pilots[i+j][1] = (q31_t)H_pilots[i][1] + j*pil_diff[1];
+						} else {
+							H_pilots[i+j][0] = ((q31_t)H_pilots[i+j][0] + H_pilots[i][0] + j*pil_diff[0])/2;
+						H_pilots[i+j][1] = ((q31_t)H_pilots[i+j][1] + H_pilots[i][1] + j*pil_diff[1])/2;
+						}
+					}
 				}
-			}
 
-			if(pil_id==13 || (pil_id==12 && phases[symbol_id][pil_id+1] == 32767)) {
-				//TODO: enchance tail...
 			}
-		}
 
+		}
 		pil_id++;
 	}
 }
@@ -385,7 +402,7 @@
 	q_dev=abs(fmod(abs(z[1])-a,a))*127;
 
 	*r0 = z[0] < 0 ? 127-i_dev : -127+i_dev;
-	*r1 = z[1] < 0 ? 127-i_dev : -127+q_dev;
+	*r1 = z[1] < 0 ? 127-q_dev : -127+q_dev;
 }

qt-drmplus-1.0.1.20180105.tar.gz/src/sig_sync.c -> qt-drmplus-1.0.1.20181207.tar.gz/src/sig_sync.c Changed

Changes of Revision 3