Image generation working

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -3,6 +3,7 @@
 #include "TSDRLibraryNDK.h"
 #include "include\TSDRLibrary.h"
 #include "include\TSDRCodes.h"
+#include <stdint.h>
 #include <string.h>
 
 tsdr_lib_t tsdr;
@@ -56,33 +57,65 @@ JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeLoadPlugin (JN
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_pluginParams (JNIEnv * env, jobject obj, jstring params) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "pluginParams");
+	const char *nparams = (*env)->GetStringUTFChars(env, params, 0);
+	THROW(tsdr_pluginparams(&tsdr, nparams));
+	(*env)->ReleaseStringUTFChars(env, params, nparams);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setSampleRate (JNIEnv * env, jobject obj, jlong rate) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "setSampleRate");
+	THROW(tsdr_setsamplerate(&tsdr, (uint32_t) rate));
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setBaseFreq (JNIEnv * env, jobject obj, jlong freq) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "setBaseFreq");
+	THROW(tsdr_setbasefreq(&tsdr, (uint32_t) freq));
+}
+
+void read_async(float *buf, uint32_t len, void *ctx) {
+
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_start (JNIEnv * env, jobject obj) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "start");
+
+	const int width = 800;
+	const int height = 600;
+
+	jclass cls = (*env)->GetObjectClass(env, obj);
+
+	// fixSize(200, 200);
+	jmethodID fixSize = (*env)->GetMethodID(env, cls, "fixSize", "(II)V");
+	(*env)->CallVoidMethod(env, obj, fixSize, width, height);
+
+	printf("Get buf\n");
+	jintArray pixels_obj = (*env)->GetObjectField(env, obj, (*env)->GetFieldID(env, cls, "pixels", "[I"));
+	jint * pixels = (*env)->GetIntArrayElements(env,pixels_obj,0);
+
+	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 = (x > (width / 2)) ? (rat * 255.0f) : (255.0f - rat * 255.0f);
+		pixels[i] = col | (col << 8) | (col << 16);
+	}
+
+	// release elements
+	(*env)->ReleaseIntArrayElements(env,pixels_obj,pixels,NULL);
+
+	// notifyCallbacks();
+	jmethodID notifyCallbacks = (*env)->GetMethodID(env, cls, "notifyCallbacks", "()V");
+	(*env)->CallVoidMethod(env, obj, notifyCallbacks);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_stop (JNIEnv * env, jobject obj) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "stop");
+	THROW(tsdr_stop(&tsdr));
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setGain (JNIEnv * env, jobject obj, jfloat gain) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "setGain");
-}
-
-JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_readAsync (JNIEnv * env, jobject obj) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "readAsync");
+	THROW(tsdr_setgain(&tsdr, (float) gain));
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_unloadPlugin (JNIEnv * env, jobject obj) {
-	error(env, TSDR_NOT_IMPLEMENTED, "%s not implemented", "unloadPlugin");
+	THROW(tsdr_unloadplugin(&tsdr));
 }

JavaGUI/jni/TSDRLibraryNDK.h

@@ -87,6 +87,7 @@ plugins :
 
 # Clean the jni stuff
 cleanjni: cleanplugins
+	rm -rf *.log
 	@$(MAKE) -C jni/ clean
 
 # Clean the plugin libraries

JavaGUI/jni/include/TSDRCodes.h

@@ -1,18 +1,41 @@
 package martin.tempest;
 
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
 import martin.tempest.core.TSDRLibrary;
+import martin.tempest.core.exceptions.TSDRException;
 
-public class Main {
+public class Main implements TSDRLibrary.FrameReadyCallback {
 
 	public static void main(String[] args) {
 		try {
-			TSDRLibrary sdrlib = new TSDRLibrary();
-			sdrlib.loadSource(TSDRLibrary.getAllSources()[0]);
-			sdrlib.setBaseFreq(0);
+			new Main();
 		} catch(Exception e) {
 			System.err.println("Cannot load! Reason: "+e.getLocalizedMessage());
 			e.printStackTrace();
 		}
 	}
 
+	public Main() throws TSDRException {
+		TSDRLibrary sdrlib = new TSDRLibrary();
+		sdrlib.loadSource(TSDRLibrary.getAllSources()[0]);
+		sdrlib.registerFrameReadyCallback(this);
+		sdrlib.start();
+
+	}
+
+	@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();
+		}
+	}
+
 }

JavaGUI/jni/include/TSDRLibrary.h

@@ -1,11 +1,14 @@
 package martin.tempest.core;
 
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferInt;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.LinkedList;
 
 import martin.tempest.core.exceptions.TSDRException;
 import martin.tempest.core.exceptions.TSDRLibraryNotCompatible;
@@ -20,8 +23,13 @@ public class TSDRLibrary {
 
 	private static TSDRSource[] PLUGINS = new TSDRSource[] {new TSDRSource("TSDRPlugin_RawFile")};
 
+	// TODO! STATIC?!?!?!?!?!?!??!
+	private BufferedImage bimage;
+	private int[] pixels;
+	
 	// If the binaries weren't loaded, this will go off
 	private static TSDRLibraryNotCompatible m_e = null;
+	private final LinkedList<FrameReadyCallback> callbacks = new LinkedList<FrameReadyCallback>();
 
 	/**
 	 * Extracts a library to a temporary path and prays for the OS to delete it after the app closes.
@@ -128,7 +136,6 @@ public TSDRLibrary() throws TSDRLibraryNotCompatible {
 	public native void start() throws TSDRException;
 	public native void stop() throws TSDRException;
 	public native void setGain(float gain) throws TSDRException;
-	public native void readAsync() throws TSDRException;
 	public native void unloadPlugin() throws TSDRException;
 
 	public void loadSource(final TSDRSource plugin) throws TSDRException {
@@ -139,4 +146,43 @@ public static TSDRSource[] getAllSources() {
 		return PLUGINS;
 	}
 
+	public boolean registerFrameReadyCallback(final FrameReadyCallback callback) {
+		return callbacks.add(callback);
+	}
+	
+	public boolean unregisterFrameReadyCallback(final FrameReadyCallback callback) {
+		return callbacks.remove(callback);
+	}
+	
+	@Override
+	protected void finalize() throws Throwable {
+		unloadPlugin();
+	}
+	
+	public interface FrameReadyCallback {
+		void onFrameReady(final TSDRLibrary lib, final BufferedImage frame);
+	}
+	
+	/**
+	 * The native code should call this method to initialize or resize the buffer array before accessing it
+	 * @param x the width of the frame
+	 * @param y the height of the frame
+	 */
+	private void fixSize(final int x, final int y) {
+		if (bimage == null || bimage.getWidth() != x || bimage.getHeight() != y) {
+			bimage = new BufferedImage(x, y, BufferedImage.TYPE_INT_RGB);
+			pixels = ((DataBufferInt) bimage.getRaster().getDataBuffer()).getData();
+		}
+	}
+	
+	/**
+	 * The native code should invoke this method when it has written data to the buffer variable.
+	 * This method writes the result into the bitmap
+	 */
+	private void notifyCallbacks() {
+		assert(bimage != null && pixels != null);
+		
+		for (final FrameReadyCallback callback : callbacks) callback.onFrameReady(this, bimage);
+	}
+	
 }

JavaGUI/makefile

@@ -3,14 +3,14 @@
 
 	#include <stdint.h>
 
-	typedef void(*tsdrplugin_readasync_function)(unsigned char *buf, uint32_t len, void *ctx);
+	typedef void(*tsdrplugin_readasync_function)(float *buf, uint32_t len, void *ctx);
 
 	void tsdrplugin_getName(char *);
 	int tsdrplugin_init(char * params);
 	int tsdrplugin_setsamplerate(uint32_t rate);
 	int tsdrplugin_setbasefreq(uint32_t freq);
 	int tsdrplugin_stop(void);
 	int tsdrplugin_setgain(float gain);
-	int tsdrplugin_readasync(tsdrplugin_readasync_function cb, uint32_t buf_num, uint32_t buf_len);
+	int tsdrplugin_readasync(tsdrplugin_readasync_function cb, void *ctx, uint32_t buf_num, uint32_t buf_len);
 
 #endif

JavaGUI/src/martin/tempest/Main.java

@@ -28,6 +28,6 @@ int tsdrplugin_setgain(float gain) {
 	return TSDR_NOT_IMPLEMENTED;
 }
 
-int tsdrplugin_readasync(tsdrplugin_readasync_function cb, uint32_t buf_num, uint32_t buf_len) {
+int tsdrplugin_readasync(tsdrplugin_readasync_function cb, void *ctx, uint32_t buf_num, uint32_t buf_len) {
 	return TSDR_NOT_IMPLEMENTED;
 }