[artoolkit-commits] artoolkit/lib/SRC/VideoMacOSX video.c, 1.19, 1.20

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29626

Modified Files:
	video.c 
Log Message:
Fix VRML lib inclusion, and detect emulated PPC on Intel.

Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** video.c	18 Jun 2006 22:52:27 -0000	1.19
--- video.c	23 Jun 2006 06:42:39 -0000	1.20
***************
*** 81,87 ****
--- 81,90 ----
  #include <Carbon/Carbon.h>
  #include <QuickTime/QuickTime.h>
+ #include <CoreServices/CoreServices.h>			// Gestalt()
  #include <pthread.h>
  #include <sys/time.h>
  #include <unistd.h>		// usleep()
+ #include <sys/types.h>	// sysctlbyname()
+ #include <sys/sysctl.h>	// sysctlbyname()
  #include <AR/config.h>
  #include <AR/ar.h>
***************
*** 93,99 ****
  // ============================================================================
  
- #ifndef __i386__								// Hack: don't do buffercopy on Intel Macs.
- #  define AR_VIDEO_DEBUG_BUFFERCOPY				// Uncomment to have ar2VideoGetImage() return a copy of video pixel data.
- #endif
  //#define AR_VIDEO_SUPPORT_OLD_QUICKTIME		// Uncomment to allow use of non-thread safe QuickTime (pre-6.4).
  #define AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE
--- 96,99 ----
***************
*** 1158,1161 ****
--- 1158,1209 ----
  }
  
+ static int sysctlbyname_with_pid (const char *name, pid_t pid,
+ 								  void *oldp, size_t *oldlenp,
+ 								  void *newp, size_t newlen)
+ {
+     if (pid == 0) {
+         if (sysctlbyname(name, oldp, oldlenp, newp, newlen) == -1)  {
+             fprintf(stderr, "sysctlbyname_with_pid(0): sysctlbyname  failed:"
+ 					"%s\n", strerror(errno));
+             return -1;
+         }
+     } else {
+         int mib[CTL_MAXNAME];
+         size_t len = CTL_MAXNAME;
+         if (sysctlnametomib(name, mib, &len) == -1) {
+             fprintf(stderr, "sysctlbyname_with_pid: sysctlnametomib  failed:"
+ 					"%s\n", strerror(errno));
+             return -1;
+         }
+         mib[len] = pid;
+         len++;
+         if (sysctl(mib, len, oldp, oldlenp, newp, newlen) == -1)  {
+             fprintf(stderr, "sysctlbyname_with_pid: sysctl  failed:"
+                     "%s\n", strerror(errno));
+             return -1;
+         }
+     }
+     return 0;
+ }
+ 
+ // Pass 0 to use current PID.
+ int is_pid_native (pid_t pid)
+ {
+     int ret = 0;
+     size_t sz = sizeof(ret);
+ 	if (sysctlbyname_with_pid("sysctl.proc_native", pid,
+ 							  &ret, &sz, NULL, 0) == -1) {
+ 		if (errno == ENOENT) {
+             // sysctl doesn't exist, which means that this version of Mac OS
+             // pre-dates Rosetta, so the application must be native.
+             return 1;
+         }
+         fprintf(stderr, "is_pid_native: sysctlbyname_with_pid  failed:"
+                 "%s\n", strerror(errno));
+         return -1;
+     }
+     return ret;
+ }
+ 
  #pragma mark -
  
***************
*** 1215,1218 ****
--- 1263,1267 ----
  	GDHandle			theSavedDevice;
  	Rect				sourceRect = {0, 0};
+ 	long				cpuType;
  	
  	// Process configuration options.
***************
*** 1367,1376 ****
  	//vid->timeScale	= 0;
  	vid->grabber		= grabber;
- #ifdef AR_VIDEO_DEBUG_BUFFERCOPY
- 	vid->bufCopyFlag	= 1;
- #else
- 	vid->bufCopyFlag	= 0;
- #endif // AR_VIDEO_DEBUG_BUFFERCOPY
  	
  
  	if(!(vid->pVdg = vdgAllocAndInit(grabber))) {
--- 1416,1441 ----
  	//vid->timeScale	= 0;
  	vid->grabber		= grabber;
  	
+ 	// Find out if we are running on an Intel Mac.
+ 	if ((err_s = Gestalt(gestaltNativeCPUtype, &cpuType) != noErr)) {
+ 		fprintf(stderr, "ar2VideoOpen(): Error getting native CPU type.\n");
+ 		goto out1;
+ 	}
+ 	if (cpuType == gestaltCPUPentium) {
+ 		// We are running on an Intel-based Mac.
+ 		vid->bufCopyFlag	= 0; //Hack: don't do buffercopy on Intel Macs.
+ 		printf("Detected Intel CPU.\n");
+ 	} else {
+ 		int native = is_pid_native(0);
+ 		// We are not. But are we running under Rosetta?
+ 		if (native == 0) {
+ 			// We're running under Rosetta.
+ 			vid->bufCopyFlag	= 0;
+ 			printf("Detected Intel CPU, but running PowerPC code under Rosetta.\n");
+ 		} else {
+ 			// Error if < 0, or native if 1.
+ 			vid->bufCopyFlag	= 1;
+ 		}
+ 	}
  
  	if(!(vid->pVdg = vdgAllocAndInit(grabber))) {