Moved bWindowResizedFromServer in RemoteWebcamCli.txt

ENSTABretagneRobotics · Aug 6, 2015 · 76e36d1 · 76e36d1
1 parent d41d784
commit 76e36d1
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 29 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+14
+Minor modifications.
+Moved bWindowResizedFromServer in RemoteWebcamCli.txt.
+Harmonization of RemoteWebcamCli w.r.t. Video in UxVCtrl.
+
 13
 Added bForceSoftwareResize, hscale, vscale parameters in place of scale for the server.
 

diff --git a/RemoteWebcamCli/Globals.c b/RemoteWebcamCli/Globals.c
@@ -22,5 +22,5 @@ int videoimgwidth = 0;
 int videoimgheight = 0; 
 int captureperiod = 0;
 int timeout = 0;
-BOOL bUDP = FALSE;
 BOOL bWindowResizedFromServer = FALSE;
+BOOL bUDP = FALSE;
diff --git a/RemoteWebcamCli/Globals.h b/RemoteWebcamCli/Globals.h
@@ -27,7 +27,7 @@ EXTERN_C int videoimgwidth;
 EXTERN_C int videoimgheight; 
 EXTERN_C int captureperiod;
 EXTERN_C int timeout;
-EXTERN_C BOOL bUDP;
 EXTERN_C BOOL bWindowResizedFromServer;
+EXTERN_C BOOL bUDP;
 
 #endif // GLOBALS_H
diff --git a/RemoteWebcamCli/Main.c b/RemoteWebcamCli/Main.c
@@ -14,8 +14,8 @@ int LoadConfig()
 	videoimgheight = 480; 
 	captureperiod = 5;
 	timeout = 0;
-	bUDP = FALSE;
-	bWindowResizedFromServer = FALSE;
+	bWindowResizedFromServer = 0;
+	bUDP = 0;
 
 	file = fopen("RemoteWebcamCli.txt", "r");
 	if (file != NULL)
@@ -33,10 +33,9 @@ int LoadConfig()
 		if (fgets3(file, line, sizeof(line)) == NULL) printf("Invalid configuration file.\n");
 		if (sscanf(line, "%d", &timeout) != 1) printf("Invalid configuration file.\n");
 		if (fgets3(file, line, sizeof(line)) == NULL) printf("Invalid configuration file.\n");
-		if (sscanf(line, "%d", &bUDP) != 1) printf("Invalid configuration file.\n");
-		if (fgets3(file, line, sizeof(line)) == NULL) printf("Invalid configuration file.\n");
 		if (sscanf(line, "%d", &bWindowResizedFromServer) != 1) printf("Invalid configuration file.\n");
-
+		if (fgets3(file, line, sizeof(line)) == NULL) printf("Invalid configuration file.\n");
+		if (sscanf(line, "%d", &bUDP) != 1) printf("Invalid configuration file.\n");
 		if (fclose(file) != EXIT_SUCCESS) printf("fclose() failed.\n");
 	}
 	else
@@ -74,6 +73,7 @@ int recvdecode(void)
 	CvMat* mat = NULL;
 	IplImage* imagenew = image;
 	char* databufnew = databuf;
+	int curframewidth = image->width, curframeheight = image->height;
 
 	if (recvall(s1, (char*)header, 3*sizeof(unsigned int)) != EXIT_SUCCESS)
 	{
@@ -120,12 +120,12 @@ int recvdecode(void)
 		cvReleaseMat(&mat);
 
 		// Resolution changed by server.
-		if ((image->width != videoimgwidth)||(image->height != videoimgheight))
+		if ((image->width != curframewidth)||(image->height != curframeheight))
 		{
-			videoimgwidth = image->width;
-			videoimgheight = image->height;
+			curframewidth = image->width;
+			curframeheight = image->height;
 
-			if (bWindowResizedFromServer) cvResizeWindow("Client", videoimgwidth, videoimgheight);
+			if (bWindowResizedFromServer) cvResizeWindow("Client", curframewidth, curframeheight);
 
 			databufnew = (char*)calloc(image->imageSize+3*sizeof(unsigned int), sizeof(char));
 			if (!databufnew)	
@@ -202,12 +202,12 @@ int recvdecode(void)
 		cvReleaseMat(&mat);
 
 		// Resolution changed by server.
-		if ((image->width != videoimgwidth)||(image->height != videoimgheight))
+		if ((image->width != curframewidth)||(image->height != curframeheight))
 		{
-			videoimgwidth = image->width;
-			videoimgheight = image->height;
+			curframewidth = image->width;
+			curframeheight = image->height;
 
-			if (bWindowResizedFromServer) cvResizeWindow("Client", videoimgwidth, videoimgheight);
+			if (bWindowResizedFromServer) cvResizeWindow("Client", curframewidth, curframeheight);
 
 			databufnew = (char*)calloc(image->imageSize+3*sizeof(unsigned int), sizeof(char));
 			if (!databufnew)	
@@ -230,13 +230,13 @@ int recvdecode(void)
 			return EXIT_FAILURE;
 		}
 
-		videoimgwidth = header[1];
-		videoimgheight = header[2];
+		curframewidth = header[1];
+		curframeheight = header[2];
 
 		// Resolution changed by server.
-		if ((image->width != videoimgwidth)||(image->height != videoimgheight))
+		if ((image->width != curframewidth)||(image->height != curframeheight))
 		{
-			imagenew = cvCreateImage(cvSize(videoimgwidth, videoimgheight), IPL_DEPTH_8U, 3);
+			imagenew = cvCreateImage(cvSize(curframewidth, curframeheight), IPL_DEPTH_8U, 3);
 			if (imagenew == NULL)
 			{
 				printf("cvCreateImage() failed.\n");
@@ -245,7 +245,7 @@ int recvdecode(void)
 			cvReleaseImage(&image);
 			image = imagenew;
 
-			if (bWindowResizedFromServer) cvResizeWindow("Client", videoimgwidth, videoimgheight);
+			if (bWindowResizedFromServer) cvResizeWindow("Client", curframewidth, curframeheight);
 
 			databufnew = (char*)calloc(image->imageSize+3*sizeof(unsigned int), sizeof(char));
 			if (!databufnew)	

diff --git a/RemoteWebcamCli/RemoteWebcamCli.txt b/RemoteWebcamCli/RemoteWebcamCli.txt
@@ -15,7 +15,7 @@
 5
 % timeout (in ms)
 5
-% bUDP
-0
 % bWindowResizedFromServer
 0
+% bUDP
+0
diff --git a/RemoteWebcamMultiSrv/Main.c b/RemoteWebcamMultiSrv/Main.c
@@ -15,20 +15,20 @@ int LoadConfig()
 	videoimgheight = 480; 
 	captureperiod = 100;
 	timeout = 0;
-	bForceSoftwareResize = TRUE;
+	bForceSoftwareResize = 1;
 	hscale = 1;
 	vscale = 1;
 	angle = 0*M_PI/180.0;
 	bFlip = 0;
-	bUDP = FALSE;
+	bUDP = 0;
 	pixcolorchgthreshold = 3; 
 	timecompressiondividerthreshold = 4;
 	fullimgperiod = 1000; 
 	encodequality = 95;
 	memset(encodetype, 0, sizeof(encodetype));
 	sprintf(encodetype, ".JPEG");
 	method = 0;
-	bDisableVideoRecording = FALSE;
+	bDisableVideoRecording = 0;
 
 #ifdef __ANDROID__
 	file = fopen("/storage/sdcard0/download/RemoteWebcamMultiSrv.txt", "r");
@@ -76,7 +76,6 @@ int LoadConfig()
 		if (sscanf(line, "%d", &method) != 1) printf("Invalid configuration file.\n");
 		if (fgets3(file, line, sizeof(line)) == NULL) printf("Invalid configuration file.\n");
 		if (sscanf(line, "%d", &bDisableVideoRecording) != 1) printf("Invalid configuration file.\n");
-
 		if (fclose(file) != EXIT_SUCCESS) printf("fclose() failed.\n");
 	}
 	else

diff --git a/RemoteWebcamSrv/Main.c b/RemoteWebcamSrv/Main.c
@@ -15,12 +15,12 @@ int LoadConfig()
 	videoimgheight = 480; 
 	captureperiod = 100;
 	timeout = 0;
-	bForceSoftwareResize = TRUE;
+	bForceSoftwareResize = 1;
 	hscale = 1;
 	vscale = 1;
 	angle = 0*M_PI/180.0;
 	bFlip = 0;
-	bUDP = FALSE;
+	bUDP = 0;
 	pixcolorchgthreshold = 3; 
 	timecompressiondividerthreshold = 4;
 	fullimgperiod = 1000; 
@@ -73,7 +73,6 @@ int LoadConfig()
 		if (sscanf(line, "%31s", encodetype) != 1) printf("Invalid configuration file.\n");
 		if (fgets3(file, line, sizeof(line)) == NULL) printf("Invalid configuration file.\n");
 		if (sscanf(line, "%d", &method) != 1) printf("Invalid configuration file.\n");
-
 		if (fclose(file) != EXIT_SUCCESS) printf("fclose() failed.\n");
 	}
 	else