Working GUI and pump of images

martinmarinov · martinmarinov · commit 654e233181fd · 2013-12-07T19:30:19.000Z
diff --git a/JavaGUI/jni/TSDRLibraryNDK.c b/JavaGUI/jni/TSDRLibraryNDK.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-tsdr_lib_t tsdr;
+tsdr_lib_t tsdr_instance;
 
 #define THROW(x) error(env, x, "")
 
@@ -28,6 +28,9 @@ void error_translate (int exception_code, char * exceptionclass) {
 		case TSDR_NOT_IMPLEMENTED:
 			strcpy(exceptionclass, "martin/tempest/core/exceptions/TSDRFunctionNotImplemented");
 			return;
+		case TSDR_WRONG_WIDTHHEIGHT:
+			strcpy(exceptionclass, "martin/tempest/core/exceptions/TSDRWrongWidthHeightException");
+			return;
 		default:
 			strcpy(exceptionclass, "java/lang/Exception");
 			return;
@@ -64,34 +67,31 @@ JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_init (JNIEnv * env,
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeLoadPlugin (JNIEnv * env, jobject obj, jstring  path) {
 	const char *npath = (*env)->GetStringUTFChars(env, path, 0);
-	THROW(tsdr_loadplugin(&tsdr, npath));
+	THROW(tsdr_loadplugin(&tsdr_instance, npath));
 	(*env)->ReleaseStringUTFChars(env, path, npath);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_pluginParams (JNIEnv * env, jobject obj, jstring params) {
 	const char *nparams = (*env)->GetStringUTFChars(env, params, 0);
-	THROW(tsdr_pluginparams(&tsdr, nparams));
+	THROW(tsdr_pluginparams(&tsdr_instance, nparams));
 	(*env)->ReleaseStringUTFChars(env, params, nparams);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setSampleRate (JNIEnv * env, jobject obj, jlong rate) {
-	THROW(tsdr_setsamplerate(&tsdr, (uint32_t) rate));
+	THROW(tsdr_setsamplerate(&tsdr_instance, (uint32_t) rate));
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setBaseFreq (JNIEnv * env, jobject obj, jlong freq) {
-	THROW(tsdr_setbasefreq(&tsdr, (uint32_t) freq));
+	THROW(tsdr_setbasefreq(&tsdr_instance, (uint32_t) freq));
 }
 
-void read_async(float *buf, uint32_t len, void *ctx) {
+void read_async(float *buf, int width, int height, void *ctx) {
 	java_context_t * context = (java_context_t *) ctx;
 	JNIEnv *env;
 
 	if ((*jvm)->GetEnv(jvm, (void **)&env, javaversion) == JNI_EDETACHED)
 		(*jvm)->AttachCurrentThread(jvm, (void **) &env, 0);
 
-	const int width = 800;
-	const int height = 600;
-
 	jclass cls = (*env)->GetObjectClass(env, context->obj);
 
 	// fixSize(200, 200);
@@ -100,16 +100,13 @@ void read_async(float *buf, uint32_t len, void *ctx) {
 
 	jintArray pixels_obj = (*env)->GetObjectField(env, context->obj, (*env)->GetFieldID(env, cls, "pixels", "[I"));
 	jint * pixels = (*env)->GetIntArrayElements(env,pixels_obj,0);
+	jint * data = pixels;
 
 	int i;
 	const int size = width * height;
 	for (i = 0; i < size; i++) {
-		const int x = i % width;
-		const int y = i / width;
-
-		const float rat = y / (float) height;
-		const int col = (int) (buf[i] * 255.0f);
-		pixels[i] = col | (col << 8) | (col << 16);
+		const int col = (int) (*(buf++) * 255.0f);
+		*(data++) = col | (col << 8) | (col << 16);
 	}
 
 	// release elements
@@ -121,24 +118,37 @@ void read_async(float *buf, uint32_t len, void *ctx) {
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_start (JNIEnv * env, jobject obj) {
+
 	java_context_t * context = (java_context_t *) malloc(sizeof(java_context_t));
 	context->obj = (*env)->NewGlobalRef(env, obj);
 	(*env)->DeleteLocalRef(env, obj);
 
-	tsdr_readasync(&tsdr, read_async, (void *) context, 800, 600);
+	THROW(tsdr_readasync(&tsdr_instance, read_async, (void *) context));
 
 	(*env)->DeleteGlobalRef(env, context->obj);
 	free(context);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_stop (JNIEnv * env, jobject obj) {
-	THROW(tsdr_stop(&tsdr));
+	THROW(tsdr_stop(&tsdr_instance));
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setGain (JNIEnv * env, jobject obj, jfloat gain) {
-	THROW(tsdr_setgain(&tsdr, (float) gain));
+	THROW(tsdr_setgain(&tsdr_instance, (float) gain));
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_unloadPlugin (JNIEnv * env, jobject obj) {
-	THROW(tsdr_unloadplugin(&tsdr));
+	THROW(tsdr_unloadplugin(&tsdr_instance));
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setResolution (JNIEnv * env, jobject obj, jint width, jint height) {
+	THROW(tsdr_setresolution(&tsdr_instance, (int) width, (int) height));
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setVfreq (JNIEnv * env, jobject obj, jfloat freq) {
+	THROW(tsdr_setvfreq(&tsdr_instance, (float) freq));
+}
+
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setHfreq (JNIEnv * env, jobject obj, jfloat freq) {
+	THROW(tsdr_sethfreq(&tsdr_instance, (float) freq));
 }
diff --git a/JavaGUI/src/martin/tempest/ImageVisualizer.java b/JavaGUI/src/martin/tempest/ImageVisualizer.java
@@ -0,0 +1,81 @@
+package martin.tempest;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.sql.Timestamp;
+
+import javax.imageio.ImageIO;
+import javax.swing.JPanel;
+
+
+public class ImageVisualizer extends JPanel {
+
+	private static final long serialVersionUID = -6754436015453195809L;
+	private static final int COUNT_TO_AVG = 5;
+	
+	private BufferedImage todraw = null;
+
+	private long prev = System.currentTimeMillis();
+	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) {
+			synchronized (todraw) {
+				todraw = image;
+			}
+			
+		}
+		
+		count++;
+		if (count > COUNT_TO_AVG) {
+			final long now = System.currentTimeMillis();
+			fps = (int) Math.round((1000.0 * COUNT_TO_AVG) / (double) (now - prev));
+			count = 0;
+			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.fillRect(0, 0, 40, 20);
+		g.setColor(Color.black);
+		g.drawString(fps+" fps", 10, 15);
+		
+	}
+	
+	public void saveImageToPNGFile(final File dir) {
+		final File file = new File(dir, new Timestamp((new java.util.Date()).getTime()).toString().replace(" ", "").replace(":", "")+".png");
+		if (todraw != null) {
+			synchronized (todraw) {
+				try {
+					ImageIO.write(todraw, "png", file);
+					System.out.println("File "+file+" saved!");
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		} else
+			System.err.println("No file on screen to write!");
+		
+	}
+}
diff --git a/JavaGUI/src/martin/tempest/Main.java b/JavaGUI/src/martin/tempest/Main.java
@@ -1,15 +1,20 @@
 package martin.tempest;
 
+import java.awt.BorderLayout;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
 
-import javax.imageio.ImageIO;
+import javax.swing.JFrame;
 
 import martin.tempest.core.TSDRLibrary;
 import martin.tempest.core.exceptions.TSDRException;
 
 public class Main implements TSDRLibrary.FrameReadyCallback {
+	
+	private static final int WIDTH = 800;
+	private static final int HEIGHT = 600;
+	
+	private final ImageVisualizer viz = new ImageVisualizer();
+	private JFrame frame;
 
 	public static void main(String[] args) {
 		try {
@@ -21,7 +26,14 @@ public static void main(String[] args) {
 	}
 
 	public Main() throws TSDRException {
-		TSDRLibrary sdrlib = new TSDRLibrary();
+		frame = new JFrame();
+		frame.setLayout(new BorderLayout());
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		frame.getContentPane().add(viz, BorderLayout.CENTER);
+		frame.setSize(WIDTH,HEIGHT);
+		frame.setVisible(true);
+		
+		TSDRLibrary sdrlib = new TSDRLibrary(WIDTH, HEIGHT);
 		sdrlib.loadSource(TSDRLibrary.getAllSources()[0]);
 		sdrlib.registerFrameReadyCallback(this);
 		sdrlib.start();
@@ -30,12 +42,7 @@ public Main() throws TSDRException {
 
 	@Override
 	public void onFrameReady(TSDRLibrary lib, BufferedImage frame) {
-		System.out.println("Ouch :) "+frame.getWidth()+" x "+frame.getHeight());
-		try {
-			ImageIO.write(frame, "png", new File("D:\\marto.png"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		viz.drawImage(frame);
 	}
 
 }
diff --git a/JavaGUI/src/martin/tempest/core/TSDRLibrary.java b/JavaGUI/src/martin/tempest/core/TSDRLibrary.java
@@ -125,9 +125,10 @@ static final void loadLibrary(final String name) throws TSDRLibraryNotCompatible
 		} 
 	}
 	
-	public TSDRLibrary() throws TSDRLibraryNotCompatible {
+	public TSDRLibrary(int width, int height) throws TSDRException {
 		if (m_e != null) throw m_e;
 		init();
+		setResolution(width, height);
 	}
 
 	private native void init();
@@ -139,6 +140,9 @@ public TSDRLibrary() throws TSDRLibraryNotCompatible {
 	public native void stop() throws TSDRException;
 	public native void setGain(float gain) throws TSDRException;
 	public native void unloadPlugin() throws TSDRException;
+	public native void setResolution(int width, int height) throws TSDRException;
+	public native void setVfreq(float freq) throws TSDRException;
+	public native void setHfreq(float freq) throws TSDRException;
 	
 	public void loadSource(final TSDRSource plugin) throws TSDRException {
 		nativeLoadPlugin(extractLibrary(plugin.libname).getAbsolutePath());
diff --git a/JavaGUI/src/martin/tempest/core/exceptions/TSDRWrongWidthHeightException.java b/JavaGUI/src/martin/tempest/core/exceptions/TSDRWrongWidthHeightException.java
@@ -0,0 +1,14 @@
+package martin.tempest.core.exceptions;
+
+public class TSDRWrongWidthHeightException extends TSDRException {
+	
+	private static final long serialVersionUID = -7807615914689137600L;
+
+	public TSDRWrongWidthHeightException(final Exception e) {
+		super(e);
+	}
+	
+	public TSDRWrongWidthHeightException(final String msg) {
+		super(msg);
+	}
+}
diff --git a/TSDRPlugin_RawFile/src/TSDRCodes.h b/TSDRPlugin_RawFile/src/TSDRCodes.h
@@ -3,6 +3,7 @@
 
 	#define TSDR_OK (0)
 	#define TSDR_ERR_PLUGIN (1)
+	#define TSDR_WRONG_WIDTHHEIGHT (2)
 	#define TSDR_NOT_IMPLEMENTED (404)
 
 #endif
diff --git a/TempestSDR/src/TSDRLibrary.c b/TempestSDR/src/TSDRLibrary.c
diff --git a/TempestSDR/src/include/TSDRCodes.h b/TempestSDR/src/include/TSDRCodes.h
diff --git a/TempestSDR/src/include/TSDRLibrary.h b/TempestSDR/src/include/TSDRLibrary.h

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,10 @@ static final void loadLibrary(final String name) throws TSDRLibraryNotCompatible`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- public TSDRLibrary() throws TSDRLibraryNotCompatible {`
	`128`	`+ public TSDRLibrary(int width, int height) throws TSDRException {`
`129`	`129`	`if (m_e != null) throw m_e;`
`130`	`130`	`init();`
	`131`	`+ setResolution(width, height);`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`private native void init();`
`@@ -139,6 +140,9 @@ public TSDRLibrary() throws TSDRLibraryNotCompatible {`
`139`	`140`	`public native void stop() throws TSDRException;`
`140`	`141`	`public native void setGain(float gain) throws TSDRException;`
`141`	`142`	`public native void unloadPlugin() throws TSDRException;`
	`143`	`+ public native void setResolution(int width, int height) throws TSDRException;`
	`144`	`+ public native void setVfreq(float freq) throws TSDRException;`
	`145`	`+ public native void setHfreq(float freq) throws TSDRException;`
`142`	`146`
`143`	`147`	`public void loadSource(final TSDRSource plugin) throws TSDRException {`
`144`	`148`	`nativeLoadPlugin(extractLibrary(plugin.libname).getAbsolutePath());`