--- xvid.c	2008/11/27 00:47:03	1.76
+++ xvid.c	2009/06/05 07:58:41	1.82
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid.c,v 1.76 2008/11/27 00:47:03 Isibaar Exp $
+ * $Id: xvid.c,v 1.82 2009/06/05 07:58:41 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -28,6 +28,26 @@
 #include <string.h>
 #include <time.h>
 
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(_SC_NPROCESSORS_CONF)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#ifdef MAX
+#undef MAX
+#endif
+#ifdef MIN
+#undef MIN
+#endif
+#endif
+
+#if defined(__amigaos4__)
+#include <exec/exec.h>
+#include <proto/exec.h>
+#endif
+
 #include "xvid.h"
 #include "decoder.h"
 #include "encoder.h"
@@ -54,7 +74,7 @@
 
 #if (defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)) && defined(_MSC_VER)
 #	include <windows.h>
-#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC)
+#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || (defined(ARCH_IS_PPC) && !defined(__amigaos4__))
 #	include <signal.h>
 #	include <setjmp.h>
 
@@ -67,7 +87,6 @@
 	}
 #endif
 
-
 /*
  * Calls the funcptr, and returns whether SIGILL (illegal instruction) was
  * signalled
@@ -90,7 +109,7 @@
 	}
 	return(0);
 }
-#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC)
+#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || (defined(ARCH_IS_PPC) && !defined(__amigaos4__))
 static int
 sigill_check(void (*func)())
 {
@@ -142,9 +161,19 @@
 #endif
 
 #if defined(ARCH_IS_PPC)
+#if defined(__amigaos4__)
+        {
+                uint32_t vector_unit = VECTORTYPE_NONE;
+                IExec->GetCPUInfoTags(GCIT_VectorUnit, &vector_unit, TAG_END);
+                if (vector_unit == VECTORTYPE_ALTIVEC) {
+                        cpu_flags |= XVID_CPU_ALTIVEC;
+                }
+        }
+#else
 	if (!sigill_check(altivec_trigger))
 		cpu_flags |= XVID_CPU_ALTIVEC;
 #endif
+#endif
 
 	return cpu_flags;
 }
@@ -661,26 +690,45 @@
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.2.0-dev";
+	info->build = "xvid-1.3.0-dev";
 	info->cpu_flags = detect_cpu_flags();
-  info->num_threads = 0;
+	info->num_threads = 0; /* single-thread */
 
 #if defined(_WIN32)
+
   {
-    DWORD dwProcessAffinityMask, dwSystemAffinityMask;
-    if (GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &dwProcessAffinityMask, (PDWORD_PTR) &dwSystemAffinityMask)) {
-      int i;      
-      for(i=0; i<32; i++) {
-        if ((dwProcessAffinityMask & (1<<i)))
-          info->num_threads++;
-      }
-    }
+	SYSTEM_INFO siSysInfo;
+	GetSystemInfo(&siSysInfo);
+	info->num_threads = siSysInfo.dwNumberOfProcessors; /* number of _logical_ cores */
   }
-#else
 
-  #include <unistd.h>
+#elif defined(_SC_NPROCESSORS_CONF) /* should be available on Apple too actually */
+
   info->num_threads = sysconf(_SC_NPROCESSORS_CONF);	
 
+#elif defined(__APPLE__) && defined(__MACH__)
+
+  {
+    size_t len;
+    int    mib[2], ncpu;
+
+    mib[0] = CTL_HW;
+    mib[1] = HW_NCPU;
+    len    = sizeof(ncpu);
+    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == 0)
+      info -> num_threads = ncpu;
+    else
+      info -> num_threads = 1;
+  }
+
+#elif defined(__amigaos4__)
+
+  {
+    uint32_t num_threads = 1;
+    IExec->GetCPUInfoTags(GCIT_NumberOfCPUs, &num_threads, TAG_END);
+    info->num_threads = num_threads;
+  }
+
 #endif
 
 	return 0;