On the frame autobalance

Author: martinmarinov

JavaGUI/jni/TSDRLibraryNDK.c

@@ -119,7 +119,7 @@ void read_async(float *buf, int width, int height, void *ctx) {
 	for (i = 0; i < context->pixelsize; i++) {
 		int col = (inverted) ? (255 - (int) (*(buf++) * 255.0f)) : ((int) (*(buf++) * 255.0f));
 		if (col > 255) col = 255; else if (col < 0) col = 0;
-		*(data++) = col | (col << 8) | (col << 16) | (0xFF << 24);
+		*(data++) = col | (col << 8) | (col << 16);
 	}
 
 	// release elements

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

@@ -209,7 +209,7 @@ public interface FrameReadyCallback {
 	 */
 	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_ARGB);
+			bimage = new BufferedImage(x, y, BufferedImage.TYPE_INT_RGB);
 			pixels = ((DataBufferInt) bimage.getRaster().getDataBuffer()).getData();
 			width = x;
 			height = y;

JavaGUI/src/martin/tempest/gui/Main.java

@@ -494,7 +494,7 @@ private void setFrameRate(final double val) {
 	private void onKeyboardKeyPressed(final KeyEvent e) {
 		final int keycode = e.getKeyCode();
 
-		if (!e.isShiftDown()) {
+		if (e.isShiftDown()) {
 			switch (keycode) {
 			case KeyEvent.VK_LEFT:
 				btnLeft.doHold();
@@ -515,10 +515,10 @@ private void onKeyboardKeyPressed(final KeyEvent e) {
 			}
 		} else {
 			switch (keycode) {
-			case KeyEvent.VK_LEFT:
+			case KeyEvent.VK_RIGHT:
 				btnHigherFramerate.doHold();
 				break;
-			case KeyEvent.VK_RIGHT:
+			case KeyEvent.VK_LEFT:
 				btnLowerFramerate.doHold();
 				break;
 			case KeyEvent.VK_UP:
@@ -534,7 +534,7 @@ private void onKeyboardKeyPressed(final KeyEvent e) {
 	private void onKeyboardKeyReleased(final KeyEvent e) {
 		final int keycode = e.getKeyCode();
 
-		if (!e.isShiftDown()) {
+		if (e.isShiftDown()) {
 			switch (keycode) {
 			case KeyEvent.VK_LEFT:
 				btnLeft.doRelease();
@@ -553,11 +553,11 @@ private void onKeyboardKeyReleased(final KeyEvent e) {
 			}
 		} else {
 			switch (keycode) {
-			case KeyEvent.VK_LEFT:
+			case KeyEvent.VK_RIGHT:
 				btnLeft.doRelease();
 				btnHigherFramerate.doRelease();
 				break;
-			case KeyEvent.VK_RIGHT:
+			case KeyEvent.VK_LEFT:
 				btnRight.doRelease();
 				btnLowerFramerate.doRelease();
 				break;

TSDRPlugin_Mirics/src/TSDRPlugin_Mirics.c

@@ -79,6 +79,11 @@ int tsdrplugin_readasync(tsdrplugin_readasync_function cb, void *ctx) {
 			err = mir_sdr_ReadPacket(&xi[id*sps], &xq[id*sps], &fs, &grc, &rfc, &fsc);
 			if (fs > frame)
 				dropped += fs - frame;
+//			else if (fs < frame) {
+//				// wrapped around
+//				dropped += 2147483647 - frame;
+//				dropped += fs;
+//			}
 			frame = fs + sps;
 			if (err != 0) break;
 		}

TempestSDR/src/TSDRLibrary.c

@@ -121,15 +121,12 @@ void videodecodingthread(void * ctx) {
 	int sizetopoll = height * width;
 	float * buffer = (float *) malloc(sizeof(float) * bufsize);
 	float * screenbuffer = (float *) malloc(sizeof(float) * bufsize);
-
-	float pmax, pmin;
+	for (i = 0; i < bufsize; i++) screenbuffer[i] = 0.0f;
 
 	while (context->this->running) {
-		float max = -9999999999999;
-		float min = 9999999999999;
-		const float span = (pmax == pmin) ? (0) : (pmax - pmin);
-		const float lowpassvalue = context->this->motionblur;
-		const float antilowpassvalue = 1.0f - lowpassvalue;
+
+		const double lowpassvalue = context->this->motionblur;
+		const double antilowpassvalue = 1.0 - lowpassvalue;
 
 		if (context->this->height != height || context->this->width != width) {
 			height = context->this->height;
@@ -140,22 +137,27 @@ void videodecodingthread(void * ctx) {
 				bufsize = sizetopoll;
 				buffer = (float *) realloc(buffer, sizeof(float) * bufsize);
 				screenbuffer = (float *) realloc(screenbuffer, sizeof(float) * bufsize);
+				for (i = 0; i < bufsize; i++) screenbuffer[i] = 0.0f;
 			}
 		}
 
 		if (cb_rem_blocking(&context->circbuf, buffer, sizetopoll) == CB_OK) {
 
-			for (i = 0; i < sizetopoll; i++) {
-				float val = screenbuffer[i] * lowpassvalue + buffer[i] * antilowpassvalue;
-
+			float max = buffer[0];
+			float min = max;
+			for (i = 1; i < sizetopoll; i++) {
+				const float val = buffer[i];
 				if (val > max) max = val; else if (val < min) min = val;
-				screenbuffer[i] = (val - pmin) / span;
 			}
 
-			context->cb(screenbuffer, width, height, context->ctx);
+			const float span = max - min;
 
-			pmax = max;
-			pmin = min;
+			for (i = 0; i < sizetopoll; i++) {
+				const float val = (buffer[i] - min) / span;
+				screenbuffer[i] = screenbuffer[i] * lowpassvalue + val * antilowpassvalue;
+			}
+
+			context->cb(screenbuffer, width, height, context->ctx);
 		}
 	}
 
@@ -301,7 +303,7 @@ void process(float *buf, uint32_t len, void *ctx, int dropped) {
 
 
 	// section for manual syncing
-	const int syncoffset = context->this->syncoffset;
+	const int syncoffset = -context->this->syncoffset;
 	if (syncoffset > 0)
 		context->dropped += syncoffset;
 	else if (syncoffset < 0)