somethings fishy

Author: martinmarinov

JavaGUI/src/martin/tempest/ImageVisualizer.java

@@ -21,19 +21,21 @@ public class ImageVisualizer extends JPanel {
 	private int count = 0;
 	private int fps;
 
-	private int color = 255;
-	
 	public void drawImage(final BufferedImage image) {
-		if (image != null) color = 0;
-		if (todraw == null) todraw = image;
 
-		if (todraw != null && image != null) {
+		if (todraw != null) {
 			synchronized (todraw) {
 				todraw = image;
 			}
-			
-		}
+		} else
+			todraw = image;
 
+		repaint();
+	}
+	
+	@Override
+	public void paint(Graphics g) {
+
 		count++;
 		if (count > COUNT_TO_AVG) {
 			final long now = System.currentTimeMillis();
@@ -42,21 +44,13 @@ public void drawImage(final BufferedImage image) {
 			prev = now;
 		}
 
-		repaint();
-	}
-	
-	@Override
-	public void paint(Graphics g) {
-
-		
 		if (todraw != null) {
 			synchronized (todraw) {
 				g.drawImage(todraw, 0, 0, getWidth(), getHeight(), null);
 			}
 		}
 
-		g.setColor(new Color(color, 255, color));
-		color += 80; if (color > 255) color = 255;
+		g.setColor(Color.white);
 		g.fillRect(0, 0, 40, 20);
 		g.setColor(Color.black);
 		g.drawString(fps+" fps", 10, 15);

JavaGUI/src/martin/tempest/Main.java

@@ -2,7 +2,9 @@
 
 import java.awt.BorderLayout;
 import java.awt.image.BufferedImage;
+import java.io.IOException;
 
+import javax.imageio.ImageIO;
 import javax.swing.JFrame;
 
 import martin.tempest.core.TSDRLibrary;
@@ -49,10 +51,13 @@ public void run() {
 
 	}
 
+	int fid = 0;
 	@Override
 	public void onFrameReady(TSDRLibrary lib, BufferedImage frame) {
-		viz.drawImage(frame);
-		try { lib.setSampleRate(0); } catch (Exception e) {};
+		//viz.drawImage(frame);
+		try {
+			ImageIO.write(frame, "bmp", new java.io.File("D:\\temp\\"+(fid++)+".bmp"));
+		} catch (IOException e) {}
 	}
 
 	@Override

TSDRPlugin_RawFile/src/TSDRPlugin_RawFile.c

@@ -16,7 +16,7 @@
 #define TYPE_SHORT (2)
 
 #define PERFORMANCE_BENCHMARK (0)
-#define ENABLE_LOOP (1)
+#define ENABLE_LOOP (0)
 
 #define SAMPLES_TO_READ_AT_ONCE (512*1024)
 

TempestSDR/src/TSDRLibrary.c

@@ -26,9 +26,9 @@ struct tsdr_context {
 		void *ctx;
 		CircBuff_t circbuf;
 		double offset;
-		double contributionfromlast;
-		double max;
-		double min;
+		float contributionfromlast;
+		float max;
+		float min;
 	} typedef tsdr_context_t;
 
 int tsdr_setsamplerate(tsdr_lib_t * tsdr, uint32_t rate) {
@@ -122,6 +122,7 @@ void process(float *buf, uint32_t len, void *ctx) {
 	int outbufsize = context->bufsize;
 
 	const double post = context->this->pixeltimeoversampletime;
+	const double post1 = 1.0 / post;
 	const int pids = (int) ((size - context->offset) / post);
 
 	// resize buffer so it fits
@@ -131,45 +132,47 @@ void process(float *buf, uint32_t len, void *ctx) {
 	}
 
 	const double offset = context->offset;
-	double t = context->offset;
-	double contrib = context->contributionfromlast;
-	const double prev_max = context->max;
-	const double prev_min = context->min;
-	const double prev_span = (prev_min == prev_max) ? (1) : (1.0f / (prev_max - prev_min));
-	double max = -1, min = 1;
+	double t = context->offset + post;
+	float contrib = context->contributionfromlast;
+	const float prev_max = context->max;
+	const float prev_min = context->min;
+	const float prev_span = (prev_min == prev_max) ? (1) : (1.0f / (prev_max - prev_min));
+	float max = -1, min = 1;
 
 	int pid = 0;
 	int i = 0;
 	int id;
 	int j;
-	for (id = 0; id < size; id++) {
-		const double I = buf[i++];
-		const double Q = buf[i++];
 
-		const double val = sqrt(I*I+Q*Q);
+	for (id = 1; id < size; id++) {
+		const float I = buf[i++];
+		const float Q = buf[i++];
+
+		const float val = sqrtf(I*I+Q*Q);
 
 		const int id1 = id+1;
 
-		while (t <= id1-post) {
-			const double pix = (t >= id) ? (val) : ((contrib + val*(t+post-id))*post);
+		while (t <= id1) {
+			const float pix = (t >= id) ? (val) : ((contrib + val*(t-id))*post1);
 			if (pix > max) max = pix; else if (pix < min) min = pix;
 			outbuf[pid++] = (pix - prev_min) * prev_span;
-			t=offset+pid*post;
+			t+=post;
 			contrib = 0;
 		}
 
-		const double contrfract = id1-t;
-		contrib += (contrfract >= 1) ? (val) : (contrfract * val);
+		const float contrfract = id1-t+post;
+		contrib += (contrfract < 0) ? (val) : (contrfract * val);
 	}
 
-	if (pid != pids) printf("Pid %d is not pids %d", pid, pids);
-
 	context->bufsize = outbufsize;
 	context->buffer = outbuf;
-	context->offset = t-size;
+	context->offset = offset+pid*post-size;
 	context->contributionfromlast = contrib;
-	context->max = (context->max+max)/2.0f;
-	context->min = (context->min+min)/2.0f;
+	context->max = max;
+	context->min = min;
+
+//	if (pid != pids)
+//		printf("Pid %d; pids %d; t %.4f, size %d, offset %.4f\n", pid, pids, t, size, context->offset);
 
 	cb_add(&context->circbuf, outbuf, pid);
 }