Fixup a/v/batt syncing

Author: aramg

src/av.c

@@ -12,6 +12,8 @@
 #include "decoder.h"
 #include <stdint.h>
 
+extern int a_active;
+extern int v_active;
 extern int a_running;
 extern int v_running;
 extern int thread_cmd;
@@ -36,15 +38,18 @@ SOCKET GetConnection(void) {
 // Battry Check thread
 void *BatteryThreadProc(__attribute__((__unused__)) void *args) {
     SOCKET socket = INVALID_SOCKET;
-    char buf[128];
-    char battery_value[32];
+    char buf[128] = {0};
+    char battery_value[32] = {0};
     int i, j;
 
-    memset(battery_value, 0, sizeof(battery_value));
     dbgprint("Battery Thread Start\n");
 
-    usleep(500000);
     while (v_running || a_running) {
+	if (v_active == 0 && a_active == 0) {
+            usleep(50000);
+            continue;
+        }
+
         socket = GetConnection();
         if (socket == INVALID_SOCKET) {
             goto LOOP;
@@ -126,6 +131,7 @@ void *VideoThreadProc(void *args) {
 
     memset(buf, 0, sizeof(buf));
     if (RecvAll(buf, 9, videoSocket) <= 0) {
+        errprint("recv error (%d) '%s'\n", errno, strerror(errno));
         MSG_ERROR("Connection reset!\nIs the app running?");
         goto early_out;
     }
@@ -134,6 +140,7 @@ void *VideoThreadProc(void *args) {
         goto early_out;
     }
 
+    v_active = 1;
     while (v_running != 0){
         if (thread_cmd != 0) {
             len = 0;
@@ -161,6 +168,7 @@ void *VideoThreadProc(void *args) {
     }
 
 early_out:
+    v_active = 0;
     dbgprint("disconnect\n");
     disconnect(videoSocket);
     decoder_cleanup();
@@ -195,6 +203,13 @@ void *AudioThreadProc(void *arg) {
         return 0;
     }
 
+    // wait for video
+    while (v_running) {
+        usleep(200000);
+        if (v_active) break;
+        if (!a_running) return 0;
+    }
+
     if (g_settings.connection == CB_RADIO_IOS)
         goto TCP_ONLY;
     if (strncmp(g_settings.ip, ADB_LOCALHOST_IP, CSTR_LEN(ADB_LOCALHOST_IP)) == 0)
@@ -257,6 +272,7 @@ void *AudioThreadProc(void *arg) {
     bytes_per_packet = CHUNKS_PER_PACKET * DROIDCAM_SPX_CHUNK_BYTES_2;
 
 STREAM:
+    a_active = 1;
     while (a_running) {
         int len = (mode == UDP_STREAM)
             ? RecvNonBlockUDP(stream_buf, STREAM_BUF_SIZE, socket)
@@ -316,6 +332,7 @@ void *AudioThreadProc(void *arg) {
     }
 
 early_out:
+    a_active = 0;
     if (mode == UDP_STREAM)
         SendUDPMessage(socket, STOP_REQ, CSTR_LEN(STOP_REQ), g_settings.ip, g_settings.port + 1);
 

src/connection.c

@@ -30,14 +30,15 @@ char* DROIDCAM_CONNECT_ERROR = \
 SOCKET Connect(const char* ip, int port, char **errormsg) {
     int flags;
     struct sockaddr_in sin;
-    SOCKET sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+    SOCKET sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
-    printf("connecting to %s:%d\n", ip, port);
+    dbgprint("connect to %s:%d\n", ip, port);
     if(sock == INVALID_SOCKET) {
         errprint("socket() error %d '%s'\n", errno, strerror(errno));
         *errormsg = strerror(errno);
         goto _error_out;
     }
+
     sin.sin_family = AF_INET;
     sin.sin_addr.s_addr = inet_addr(ip);
     sin.sin_port = htons(port);

src/droidcam-cli.c

@@ -23,9 +23,11 @@ Thread athread = {0, -1}, vthread = {0, -1}, dthread = {0, -1};
 
 char *v4l2_dev = 0;
 unsigned v4l2_width = 0, v4l2_height = 0;
-int v_running = 0;
-int a_running = 0;
-int thread_cmd = 0;
+volatile int a_active = 0;
+volatile int v_active = 0;
+volatile int v_running = 0;
+volatile int a_running = 0;
+volatile int thread_cmd = 0;
 int no_controls = 0;
 struct settings g_settings = {0};
 

src/droidcam.c

@@ -40,9 +40,11 @@ GThread* hDecodeThread;
 GThread* hBatteryThread;
 
 char *v4l2_dev = 0;
-int a_running = 0;
-int v_running = 0;
-int thread_cmd = 0;
+volatile int a_active = 0;
+volatile int v_active = 0;
+volatile int a_running = 0;
+volatile int v_running = 0;
+volatile int thread_cmd = 0;
 struct settings g_settings = {0};
 
 extern const char *thread_cmd_val_str;
@@ -124,6 +126,8 @@ static void Stop(void) {
 		hBatteryThread = NULL;
 	}
 
+	a_active = 0;
+	v_active = 0;
 	gtk_widget_set_sensitive(GTK_WIDGET(elButton), FALSE);
 	gtk_widget_set_sensitive(GTK_WIDGET(wbButton), FALSE);
 	gtk_widget_set_sensitive(GTK_WIDGET(menuButton), FALSE);
@@ -194,6 +198,7 @@ static void Start(void) {
 	}
 
 	if (g_settings.video) {
+		v_active = 0;
 		v_running = 1;
 		hVideoThread = g_thread_new(NULL, VideoThreadProc, (void*) (SOCKET_PTR) s);
 		hDecodeThread = g_thread_new(NULL, DecodeThreadProc, NULL);
@@ -202,6 +207,7 @@ static void Start(void) {
 	}
 
 	if (g_settings.audio) {
+                a_active = 0;
 		a_running = 1;
 		hAudioThread = g_thread_new(NULL, AudioThreadProc, NULL);
 	}