80 fps max refresh rate

Author: martinmarinov

JavaGUI/hs_err_pid2052.log

@@ -13,6 +13,12 @@ tsdr_lib_t tsdr_instance;
 
 struct java_context {
 		jobject obj;
+		jclass cls;
+		jfieldID fid_pixels;
+		jfieldID fid_width;
+		jfieldID fid_height;
+		jmethodID fixSize;
+		jmethodID notifyCallbacks;
 	} typedef java_context_t;
 
 static JavaVM *jvm;
@@ -95,13 +101,15 @@ void read_async(float *buf, int width, int height, void *ctx) {
 	if ((*jvm)->GetEnv(jvm, (void **)&env, javaversion) == JNI_EDETACHED)
 		(*jvm)->AttachCurrentThread(jvm, (void **) &env, 0);
 
-	jclass cls = (*env)->GetObjectClass(env, context->obj);
+	jint i_width = (*env)->GetIntField(env, context->obj, context->fid_width);
+	jint i_height = (*env)->GetIntField(env, context->obj, context->fid_height);
 
-	// fixSize(200, 200);
-	jmethodID fixSize = (*env)->GetMethodID(env, cls, "fixSize", "(II)V");
-	(*env)->CallVoidMethod(env, context->obj, fixSize, width, height);
+	if (i_width != width || i_height != height) {
+		// fixSize(200, 200);
+		(*env)->CallVoidMethod(env, context->obj, context->fixSize, width, height);
+	}
 
-	jintArray pixels_obj = (*env)->GetObjectField(env, context->obj, (*env)->GetFieldID(env, cls, "pixels", "[I"));
+	jintArray pixels_obj = (*env)->GetObjectField(env, context->obj, context->fid_pixels);
 	jint * pixels = (*env)->GetIntArrayElements(env,pixels_obj,0);
 	jint * data = pixels;
 
@@ -116,19 +124,26 @@ void read_async(float *buf, int width, int height, void *ctx) {
 	(*env)->ReleaseIntArrayElements(env,pixels_obj,pixels,0);
 
 	// notifyCallbacks();
-	jmethodID notifyCallbacks = (*env)->GetMethodID(env, cls, "notifyCallbacks", "()V");
-	(*env)->CallVoidMethod(env, context->obj, notifyCallbacks);
+	(*env)->CallVoidMethod(env, context->obj, context->notifyCallbacks);
 }
 
 JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_nativeStart (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);
+	context->cls = (jclass) (*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, context->obj));
+	context->fid_pixels = (*env)->GetFieldID(env, context->cls, "pixels", "[I");
+	context->fid_width = (*env)->GetFieldID(env, context->cls, "width", "I");
+	context->fid_height = (*env)->GetFieldID(env, context->cls, "height", "I");
+	context->fixSize = (*env)->GetMethodID(env, context->cls, "fixSize", "(II)V");
+	context->notifyCallbacks = (*env)->GetMethodID(env, context->cls, "notifyCallbacks", "()V");
 
 	THROW(tsdr_readasync(&tsdr_instance, read_async, (void *) context));
 
 	(*env)->DeleteGlobalRef(env, context->obj);
+	(*env)->DeleteGlobalRef(env, context->cls);
 	free(context);
 }
 

JavaGUI/hs_err_pid3056.log

@@ -3,6 +3,9 @@ ifndef JAVA_HOME
 $(warning JAVA_HOME should be set so it points to your jdk installation dir)
 endif
 
+# Flags
+CPPFLAGS=-O3
+
 # Headers
 INC = "$(JAVA_HOME)/include" "$(JAVA_HOME)/include/win32"
 
@@ -60,7 +63,7 @@ rebuildtempestsdr : $(OUTPUTFOLDER)
 
 # Compile the sources to obj files
 TSDRLibraryNDK.o : TSDRLibraryNDK.c TSDRLibraryNDK.h include/TSDRLibrary.h include/TSDRCodes.h
-	gcc $(foreach d, $(INC), -I$d) -c $< -o $@
+	gcc $(foreach d, $(INC), -I$d) $(CFLAGS) -c $< -o $@
 
 # Copy over a fresh set of library headers
 include/%.h : ../../TempestSDR/src/include/%.h

JavaGUI/jni/TSDRLibraryNDK.c

@@ -13,7 +13,7 @@
 public class ImageVisualizer extends JPanel {
 
 	private static final long serialVersionUID = -6754436015453195809L;
-	private static final int COUNT_TO_AVG = 5;
+	private static final int COUNT_TO_AVG = 50;
 
 	private BufferedImage todraw = null;
 

JavaGUI/jni/makefile

@@ -8,7 +8,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.List;
 
 import martin.tempest.core.exceptions.TSDRException;
 import martin.tempest.core.exceptions.TSDRLibraryNotCompatible;
@@ -23,13 +24,15 @@ public class TSDRLibrary {
 
 	private static TSDRSource[] PLUGINS = new TSDRSource[] {new TSDRSource("TSDRPlugin_RawFile")};
 
-	// TODO! STATIC?!?!?!?!?!?!??!
 	private BufferedImage bimage;
 	private int[] pixels;
 
+	private int width;
+	private int height;
+	
 	// If the binaries weren't loaded, this will go off
 	private static TSDRLibraryNotCompatible m_e = null;
-	private final LinkedList<FrameReadyCallback> callbacks = new LinkedList<FrameReadyCallback>();
+	private final List<FrameReadyCallback> callbacks = new ArrayList<FrameReadyCallback>();
 
 	/**
 	 * Extracts a library to a temporary path and prays for the OS to delete it after the app closes.
@@ -193,6 +196,8 @@ 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();
+			width = x;
+			height = y;
 		}
 	}
 

JavaGUI/src/martin/tempest/ImageVisualizer.java

@@ -48,6 +48,9 @@ SOURCEFOLDER=src
 OUTPUTFOLDER=bin/$(OSNAME)/$(ARCHNAME)
 OBJFOLDER=obj
 
+# Flags
+CPPFLAGS=-O3
+
 # Calculate the path to dependencies
 _OBJS = $(patsubst %,$(OBJFOLDER)/%,$(OBJS))
 _DEPS = $(patsubst %,$(SOURCEFOLDER)/%,$(DEPS))
@@ -68,7 +71,7 @@ $(OUTPUTFOLDER)/$(PLUGNAME)$(EXT): copyoverheaderfile $(_OBJS)
 $(OBJFOLDER)/%.o : $(SOURCEFOLDER)/%.c $(_DEPS)
 	mkdir -p $(OUTPUTFOLDER)
 	mkdir -p $(OBJFOLDER)
-	gcc $(foreach d, $(INC), -I$d) -c $< -o $@
+	gcc $(foreach d, $(INC), -I$d) $(CFLAGS) -c $< -o $@
 
 .PHONY: clean
 

JavaGUI/src/martin/tempest/core/TSDRLibrary.java

@@ -43,6 +43,9 @@ SOURCEFOLDER=src
 OUTPUTFOLDER=bin/$(OSNAME)/$(ARCHNAME)
 OBJFOLDER=obj
 
+# Flags
+CPPFLAGS=-O3
+
 # The obj files reside in the bin/obj directory
 _OBJS = $(patsubst %,$(OBJFOLDER)/%,$(OBJS))
 
@@ -60,7 +63,7 @@ $(OUTPUTFOLDER)/TSDRLibrary$(EXT) : $(_OBJS)
 $(OBJFOLDER)/%.o : src/%.c $(_DEPS)
 	mkdir -p $(OUTPUTFOLDER)
 	mkdir -p $(OBJFOLDER)
-	gcc $(foreach d, $(INC), -I$d) -c $< -o $@
+	gcc $(foreach d, $(INC), -I$d) $(CFLAGS) -c $< -o $@
 
 .PHONY: clean