Video starting to appear

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -160,14 +160,6 @@ JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setGain (JNIEnv * en
 	THROW(tsdr_setgain(&tsdr_instance, (float) gain));
 }
 
-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));
+JNIEXPORT void JNICALL Java_martin_tempest_core_TSDRLibrary_setResolution (JNIEnv * env, jobject obj, jint width, jint height, jfloat refreshrate) {
+	THROW(tsdr_setresolution(&tsdr_instance, (int) width, (int) height, (float) refreshrate));
 }

JavaGUI/jni/TSDRLibraryNDK.h

@@ -6,11 +6,13 @@
 	struct tsdr_lib {
 		void * plugin;
 		void * mutex_sync_unload;
+		void * mutex_video_stopped;
 		uint32_t samplerate;
 		int width;
 		int height;
-		float vf;
-		float hf;
+		float refreshrate;
+		float fh;
+		float fv;
 		volatile int running;
 	} typedef tsdr_lib_t;
 
@@ -22,8 +24,6 @@
 	int tsdr_setgain(tsdr_lib_t * tsdr, float gain);
 	int tsdr_readasync(tsdr_lib_t * tsdr, const char * pluginfilepath, tsdr_readasync_function cb, void *, const char * params);
 	int tsdr_unloadplugin(tsdr_lib_t * tsdr);
-	int tsdr_setresolution(tsdr_lib_t * tsdr, int width, int height);
-	int tsdr_setvfreq(tsdr_lib_t * tsdr, float freq);
-	int tsdr_sethfreq(tsdr_lib_t * tsdr, float freq);
+	int tsdr_setresolution(tsdr_lib_t * tsdr, int width, int height, float refreshrate);
 
 #endif

JavaGUI/jni/include/TSDRLibrary.h

@@ -11,8 +11,10 @@
 
 public class Main implements TSDRLibrary.FrameReadyCallback {
 
-	private static final int WIDTH = 800;
-	private static final int HEIGHT = 600;
+	private static final int WIDTH = 1056;
+	private static final int HEIGHT = 628;
+	private static final float REFRESHRATE = 50.11061e6f;
+	private static final String COMMAND = "D:\\Dokumenti\\Cambridge\\project\\mphilproj\\Toshiba-440CDX\\toshiba.iq";
 
 	private final ImageVisualizer viz = new ImageVisualizer();
 	private JFrame frame;
@@ -39,7 +41,7 @@ public void run() {
 				try {
 					TSDRLibrary sdrlib = new TSDRLibrary();
 					sdrlib.registerFrameReadyCallback(Main.this);
-					sdrlib.startAsync(TSDRSource.fromRawFile("D:\\Dokumenti\\Cambridge\\project\\mphilproj\\Toshiba-440CDX\\toshiba.iq"), WIDTH, HEIGHT);
+					sdrlib.startAsync(TSDRSource.fromRawFile(COMMAND), WIDTH, HEIGHT, REFRESHRATE);
 				} catch (Throwable e) {e.printStackTrace();};
 
 			};

JavaGUI/src/martin/tempest/Main.java

@@ -139,14 +139,12 @@ public TSDRLibrary() throws TSDRException {
 	public native void stop() throws TSDRException;
 	public native void setGain(float gain) 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 native void setResolution(int width, int height, float refreshrate) throws TSDRException;
 
-	public void startAsync(final TSDRSource plugin, int width, int height) throws TSDRException {
+	public void startAsync(final TSDRSource plugin, int width, int height, float refreshrate) throws TSDRException {
 		final String absolute_path = plugin.absolute ? plugin.libname : (extractLibrary(plugin.libname).getAbsolutePath());
 
-		setResolution(width, height);
+		setResolution(width, height, refreshrate);
 
 		Runtime.getRuntime().addShutdownHook(unloaderhook);
 

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

@@ -6,7 +6,8 @@
 	typedef void(*tsdrplugin_readasync_function)(float *buf, uint32_t len, void *ctx);
 
 	void tsdrplugin_getName(char *);
-	int tsdrplugin_setsamplerate(uint32_t rate);
+	uint32_t tsdrplugin_setsamplerate(uint32_t rate);
+	uint32_t tsdrplugin_getsamplerate();
 	int tsdrplugin_setbasefreq(uint32_t freq);
 	int tsdrplugin_stop(void);
 	int tsdrplugin_setgain(float gain);

TSDRPlugin_RawFile/src/TSDRPlugin.h

@@ -12,20 +12,26 @@
 #define TYPE_BYTE (1)
 #define TYPE_SHORT (2)
 
-#define SAMPLES_TO_READ_AT_ONCE (800*600)
+#define SAMPLES_TO_READ_AT_ONCE (2048)
 
 TickTockTimer_t timer;
 volatile int working = 0;
 
 int type = TYPE_FLOAT;
 int sizepersample = 4; // matlab single TODO! change via parameter
 
+uint32_t samplerate = 100e6 / 4; // TODO! real sample rate
+
 void tsdrplugin_getName(char * name) {
 	strcpy(name, "TSDR Raw File Source Plugin");
 }
 
-int tsdrplugin_setsamplerate(uint32_t rate) {
-	return TSDR_NOT_IMPLEMENTED;
+uint32_t tsdrplugin_setsamplerate(uint32_t rate) {
+	return samplerate;
+}
+
+uint32_t tsdrplugin_getsamplerate() {
+	return samplerate;
 }
 
 int tsdrplugin_setbasefreq(uint32_t freq) {
@@ -75,7 +81,7 @@ int tsdrplugin_readasync(tsdrplugin_readasync_function cb, void *ctx, const char
 		if (working) {
 
 			if (type == TYPE_FLOAT) {
-				memccpy(outbuf, buf, 0, bytestoread);
+				memcpy(outbuf, buf, bytestoread);
 			}
 
 			cb(outbuf, SAMPLES_TO_READ_AT_ONCE, ctx);

TSDRPlugin_RawFile/src/TSDRPlugin_RawFile.c

@@ -1,8 +1,8 @@
 # Define all of the C files here
-OBJS = TSDRLibrary.o TSDRPluginLoader.o threading.o
+OBJS = TSDRLibrary.o TSDRPluginLoader.o threading.o circbuff.o
 
 # Define all of the dependencies here
-DEPS = include/TSDRLibrary.h TSDRPluginLoader.h include/TSDRPlugin.h osdetect.h threading.h
+DEPS = include/TSDRLibrary.h TSDRPluginLoader.h include/TSDRPlugin.h osdetect.h threading.h circbuff.h
 
 # USER CONFIGURATION ENDS HERE
 

TempestSDR/makefile

@@ -13,15 +13,19 @@
 #include "TSDRPluginLoader.h"
 #include "osdetect.h"
 #include "threading.h"
+#include <math.h>
+#include "circbuff.h"
 
 #define MAX_ARR_SIZE (4000*4000)
+#define CIRC_BUFF_FRAME_COUNT (100)
 
 struct tsdr_context {
 		tsdr_readasync_function cb;
 		float * buffer;
 		tsdr_lib_t * this;
 		int bufsize;
 		void *ctx;
+		CircBuff_t circbuf;
 	} typedef tsdr_context_t;
 
 int tsdr_setsamplerate(tsdr_lib_t * tsdr, uint32_t rate) {
@@ -30,6 +34,12 @@ int tsdr_setsamplerate(tsdr_lib_t * tsdr, uint32_t rate) {
 	return TSDR_OK;
 }
 
+int tsdr_getsamplerate(tsdr_lib_t * tsdr) {
+	pluginsource_t * plugin = (pluginsource_t *)(tsdr->plugin);
+	tsdr->samplerate = plugin->tsdrplugin_getsamplerate();
+	return TSDR_OK;
+}
+
 int tsdr_setbasefreq(tsdr_lib_t * tsdr, uint32_t freq) {
 	pluginsource_t * plugin = (pluginsource_t *)(tsdr->plugin);
 	return plugin->tsdrplugin_setbasefreq(freq);
@@ -44,6 +54,7 @@ int tsdr_stop(tsdr_lib_t * tsdr) {
 
 	mutex_wait((mutex_t *) tsdr->mutex_sync_unload);
 
+	mutex_free((mutex_t *) tsdr->mutex_sync_unload);
 	free(tsdr->mutex_sync_unload);
 	return status;
 }
@@ -55,15 +66,38 @@ int tsdr_setgain(tsdr_lib_t * tsdr, float gain) {
 	return plugin->tsdrplugin_setgain(gain);
 }
 
+void videodecodingthread(void * ctx) {
+	tsdr_context_t * context = (tsdr_context_t *) ctx;
+
+	const uint32_t samplerate = context->this->samplerate;
+	const int height = context->this->height;
+	const int width = context->this->width;
+	const float fh = context->this->fh;
+	const float fv = context->this->fv;
+
+	while (context->this->running) {
+		if (cb_rem_blocking(&context->circbuf, context->buffer, context->bufsize) == CB_OK) {
+			context->cb(context->buffer, context->this->width, context->this->height, context->ctx);
+		}
+	}
+
+	mutex_signal((mutex_t *) context->this->mutex_video_stopped);
+}
+
 void process(float *buf, uint32_t len, void *ctx) {
 	tsdr_context_t * context = (tsdr_context_t *) ctx;
 
-	const int length = (len < context->bufsize) ? (len) : (context->bufsize);
+	int i = 0;
+	int id;
+	const int size = len/2;
+	for (id = 0; id < size; id++) {
+		const float I = buf[i++];
+		const float Q = buf[i++];
 
-	int i;
-	for (i = 0; i < length; i++) context->buffer[i] = buf[i];
+		buf[id] = sqrtf(I*I+Q*Q);
+	}
 
-	context->cb(context->buffer, context->this->width, context->this->height, context->ctx);
+	cb_add(&context->circbuf, buf, size);
 }
 
 int tsdr_readasync(tsdr_lib_t * tsdr, const char * pluginfilepath, tsdr_readasync_function cb, void *ctx, const char * params) {
@@ -82,6 +116,10 @@ int tsdr_readasync(tsdr_lib_t * tsdr, const char * pluginfilepath, tsdr_readasyn
 
 	tsdr->mutex_sync_unload = malloc(sizeof(mutex_t));
 	mutex_init((mutex_t *) tsdr->mutex_sync_unload);
+
+	tsdr->mutex_video_stopped = malloc(sizeof(mutex_t));
+	mutex_init((mutex_t *) tsdr->mutex_video_stopped);
+
 	pluginsource_t * plugin = (pluginsource_t *)(tsdr->plugin);
 
 	const int width = tsdr->width;
@@ -97,40 +135,43 @@ int tsdr_readasync(tsdr_lib_t * tsdr, const char * pluginfilepath, tsdr_readasyn
 	context->bufsize = width * height;
 	context->buffer = (float *) malloc(sizeof(float) * context->bufsize);
 	context->ctx = ctx;
+	cb_init(&context->circbuf, CIRC_BUFF_FRAME_COUNT*context->bufsize);
 
+	tsdr_getsamplerate(tsdr);
+
+	thread_start(videodecodingthread, (void *) context);
 	status = plugin->tsdrplugin_readasync(process, (void *) context, params);
+	tsdr->running = 0;
+
+	mutex_wait((mutex_t *) tsdr->mutex_video_stopped);
+
+	mutex_free((mutex_t *) tsdr->mutex_video_stopped);
+	free(tsdr->mutex_video_stopped);
 
 	if (status != TSDR_OK) return status;
 
 	free(context->buffer);
 	free(context);
 
+	cb_free(&context->circbuf);
 	tsdrplug_close((pluginsource_t *)(tsdr->plugin));
 	free(tsdr->plugin);
 
 	mutex_signal((mutex_t *) tsdr->mutex_sync_unload);
 
-	tsdr->running = 0;
 	return status;
 }
 
-int tsdr_setresolution(tsdr_lib_t * tsdr, int width, int height) {
+int tsdr_setresolution(tsdr_lib_t * tsdr, int width, int height, float refreshrate) {
+	if (width < 0 || height < 0 || width*height > MAX_ARR_SIZE || refreshrate <= 0)
+				return TSDR_WRONG_WIDTHHEIGHT;
+
 	tsdr->width = width;
 	tsdr->height = height;
-
-	if (width < 0 || height < 0 || width*height > MAX_ARR_SIZE)
-			return TSDR_WRONG_WIDTHHEIGHT;
+	tsdr->refreshrate = refreshrate;
+	tsdr->fh = refreshrate / (float) width;
+	tsdr->fv = refreshrate / (float) height;
 
 	return TSDR_OK;
 }
 
-int tsdr_setvfreq(tsdr_lib_t * tsdr, float freq) {
-	tsdr->vf = freq;
-	return TSDR_OK;
-}
-
-int tsdr_sethfreq(tsdr_lib_t * tsdr, float freq) {
-	tsdr->hf = freq;
-	return TSDR_OK;
-
-}

TempestSDR/src/TSDRLibrary.c

@@ -25,6 +25,7 @@ int tsdrplug_load(pluginsource_t * plugin, const char *dlname)
     if (plugin->fd == NULL)
     	return TSDR_ERR_PLUGIN;
 
+    if ((plugin->tsdrplugin_getsamplerate = tsdrplug_getfunction(plugin, "tsdrplugin_getsamplerate")) == 0) return TSDR_ERR_PLUGIN;
     if ((plugin->tsdrplugin_getName = tsdrplug_getfunction(plugin, "tsdrplugin_getName")) == 0) return TSDR_ERR_PLUGIN;
     if ((plugin->tsdrplugin_setsamplerate = tsdrplug_getfunction(plugin, "tsdrplugin_setsamplerate")) == 0) return TSDR_ERR_PLUGIN;
     if ((plugin->tsdrplugin_setbasefreq = tsdrplug_getfunction(plugin, "tsdrplugin_setbasefreq")) == 0) return TSDR_ERR_PLUGIN;