[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-video-cvs
Subject:    [Video-cvs] colconverter avyuv2yuv.c, 1.4, 1.5 env.c, 1.6,
From:       bobclark () helixcommunity ! org
Date:       2006-02-07 21:16:02
[Download RAW message or body]

Update of /cvsroot/video/colconverter
In directory cvs:/tmp/cvs-serv28239

Modified Files:
	avyuv2yuv.c env.c yuv2yuv.c 
Log Message:
Modified by: bobclark@real.com 
Date: 02-06-2006 
Project: OS X on Intel
Synopsis: Changes for OS X to build and run with the Intel-based Macs
Overview:
The changes below fix build busters when trying to build Helix for OS X to run \
natively on the new Intel-based Macintoshes. The code is typically changed to avoid \
assembly language, notably PowerPC assembly language; avoid altivec optimizations; \
general gcc 4 fixes; and avoiding deprecated APIs. Files Modified: 
  audio/fixptutil/pub/math64.h 
  client/common/container/plghand2.cpp 
  client/core/hxntsrc.cpp 
  common/include/atomicbase.h 
  common/util/pub/platform/mac/MoreFilesX.h 
  video/colconverter/avyuv2yuv.c 
  video/colconverter/env.c 
  video/colconverter/yuv2yuv.c 
  video/sitelib/platform/mac/fauxcodec.cpp

Image Size and Heap Use impact (Client -Only): 
Negligible size and heap use impact.

Platforms and Profiles Affected: 
Mac OS X

Platforms and Profiles Build Verified: 
Mac OS X; helix-client-all-defines

Platforms and Profiles Functionality verified: 
Mac OS X; helix-client-all-defines

Branch:
These diffs are on branch hxclient_1_2_2i_neptune, the branch designated for \
Intel-based Mac work.  Many of these changes will also be necessary on HEAD.

Copyright assignment: I am a RealNetworks employee or contractor


Index: yuv2yuv.c
===================================================================
RCS file: /cvsroot/video/colconverter/yuv2yuv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- yuv2yuv.c	29 Dec 2004 02:08:21 -0000	1.7
+++ yuv2yuv.c	7 Feb 2006 21:16:00 -0000	1.8
@@ -914,7 +914,7 @@
 
 #endif
 
-#if defined(_MACINTOSH) || defined(_MAC_UNIX)
+#if (defined(_MACINTOSH) || defined(_MAC_UNIX)) && !defined(__i386__)
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -1024,7 +1024,7 @@
 #endif                    
             } else
 #endif
-#if defined(_MACINTOSH) || defined(_MAC_UNIX)
+#if (defined(_MACINTOSH) || defined(_MAC_UNIX)) && !defined(__i386__)
             /* check if we can use MMX-optimized code here: */
             if (_AltiVec_Available)
             {

Index: env.c
===================================================================
RCS file: /cvsroot/video/colconverter/env.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- env.c	9 Jul 2004 18:36:28 -0000	1.6
+++ env.c	7 Feb 2006 21:16:00 -0000	1.7
@@ -70,7 +70,7 @@
 #if defined(_M_IX86)  && !defined(WINCE_EMULATOR)
    _x86_MMX_Available = (checkMmxAvailablity()&CPU_HAS_MMX)?1:0;
    return _x86_MMX_Available;
-#elif defined(_MACINTOSH) || defined(_MAC_UNIX)
+#elif (defined(_MACINTOSH) || defined(_MAC_UNIX)) && !defined(__i386__)
 	// Check for presence of AltiVec on Macintosh
 	OSErr	err;
 	long	processorAttributes;

Index: avyuv2yuv.c
===================================================================
RCS file: /cvsroot/video/colconverter/avyuv2yuv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- avyuv2yuv.c	9 Jul 2004 18:36:28 -0000	1.4
+++ avyuv2yuv.c	7 Feb 2006 21:16:00 -0000	1.5
@@ -47,7 +47,7 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#if defined(_MACINTOSH) || defined(_MAC_UNIX)
+#if (defined(_MACINTOSH) || defined(_MAC_UNIX)) && !defined(__i386__)
 
 #pragma altivec_model on
 


[prev in list] [next in list] [prev in thread] [next in thread]