Changeset fd4d779342a16f50de84c3747aaede85d3953f77

Timestamp:

03/01/10 21:43:01 (2 years ago)

Author:

Robin Gareus <rgareus@…>

Parents:

53f2ac9a8feb65055412c1c457fbbedaf8d4b201

Children:

ce71472e000c3a08cbc59ec63629eb4669e16f71

git-committer:

Robin Gareus <rgareus@priroda.local> / 2010-03-01T22:43:01Z+0100

Message:

fixed PPC color

Location:

oggzcap/src

Files:

• MyController.mm (modified) (1 diff)
• videoout/FrameReader.m (modified) (1 diff)
• videoout/encoder_example.c (modified) (3 diffs)

oggzcap/src/MyController.mm

@@ -87 +87 @@
 
         CGDirectDisplayID displayID = CGMainDisplayID();
-        NSAssert( displayID != nil, @"CGMainDisplayID failure");
+        //NSAssert( displayID != nil, @"CGMainDisplayID failure");
         if (displayID)
         {

oggzcap/src/videoout/FrameReader.m

@@ -176 +176 @@
                 #endif
 #else
-        //      [attributes setObject:[NSNumber numberWithUnsignedInt:k32ARGBPixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
-                [attributes setObject:[NSNumber numberWithUnsignedInt:k32BGRAPixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
+                #if __BIG_ENDIAN__
+                        [attributes setObject:[NSNumber numberWithUnsignedInt:k32ARGBPixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
+                #else
+                        [attributes setObject:[NSNumber numberWithUnsignedInt:k32BGRAPixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
+                #endif
 #endif
                 

oggzcap/src/videoout/encoder_example.c

@@ -53 +53 @@
 int keyframe_frequency=1;
 
-int yuv_copy__bgra_to_420(void *b_2vuy, SInt32 b_2vuy_stride, size_t width, size_t height, size_t offset_x, size_t offset_y, yuv_buffer *dst);
-//// InOut conversion (from theoraEncoder (xiph))
 int yuv_copy__bgra_to_420(void *b_2vuy, SInt32 b_2vuy_stride, size_t width, size_t height, size_t offset_x, size_t offset_y, yuv_buffer *dst)
 {
@@ -88 +86 @@
 #else // RGBA -> 420 
         // TODO: offset ! & strides
-        
+
+#ifdef __BIG_ENDIAN__   
+
+#define _CR ((bptr[(4*i)+1])&0xff)
+#define _CG ((bptr[(4*i)+2])&0xff)
+#define _CB ((bptr[(4*i)+3])&0xff)
+        
+#define _CRX ( ( ((bptr[(4*i)+1])&0xff) + ((bptr[(4*(i+1))+1])&0xff) + ((bptr[(4*(i+1+width))+1])&0xff) + ((bptr[(4*(i+1+width))+1])&0xff) )>>2)
+#define _CGX ( ( ((bptr[(4*i)+2])&0xff) + ((bptr[(4*(i+1))+2])&0xff) + ((bptr[(4*(i+1+width))+2])&0xff) + ((bptr[(4*(i+1+width))+2])&0xff) )>>2)
+#define _CBX ( ( ((bptr[(4*i)+3])&0xff) + ((bptr[(4*(i+1))+3])&0xff) + ((bptr[(4*(i+1+width))+3])&0xff) + ((bptr[(4*(i+1+width))+3])&0xff) )>>2)
+
+#else 
 #define _CR ((bptr[(4*i)+2])&0xff)
 #define _CG ((bptr[(4*i)+1])&0xff)
@@ -96 +105 @@
 #define _CGX ( ( ((bptr[(4*i)+1])&0xff) + ((bptr[(4*(i+1))+1])&0xff) + ((bptr[(4*(i+1+width))+1])&0xff) + ((bptr[(4*(i+1+width))+1])&0xff) )>>2)
 #define _CBX ( ( ((bptr[(4*i)+0])&0xff) + ((bptr[(4*(i+1))+0])&0xff) + ((bptr[(4*(i+1+width))+0])&0xff) + ((bptr[(4*(i+1+width))+0])&0xff) )>>2)
-        
-        uint8_t *bptr = (uint8_t*) b_2vuy;
-        int i; int c=0;
-        for (i=0;i<width*height;i++) {
-                double Y  = (0.299 * _CR) + (0.587 * _CG) + (0.114 * _CB);
-                if (Y<0) dst->y[i]=0;
-                else if (Y>255) dst->y[i]=255;
-                else dst->y[i]=(uint8_t) floor(Y+.5);
-#if 1
-                if (i%2==0 && ((i/width)%2)==0) { 
-            double V =  (0.500 * _CRX) - (0.419 * _CGX) - (0.081 * _CBX) + 128;
-            double U = -(0.169 * _CRX) - (0.331 * _CGX) + (0.500 * _CBX) + 128;
-                        
-            if (U<0) dst->u[c]=0;
-            else if (U>255) dst->u[c]=255;
-            else dst->u[c]=(uint8_t) floor(U+.5);
-                        
-            if (V<0) dst->v[c]=0;
-            else if (V>255) dst->v[c]=255;
-            else dst->v[c]=(uint8_t) floor(V+.5);
-            c++;
-                }
+
 #endif
-                
-                
+
+    uint8_t *bptr = (uint8_t*) b_2vuy;
+    int i; int c=0;
+    for (i=0;i<width*height;i++) {
+            double Y  = (0.299 * _CR) + (0.587 * _CG) + (0.114 * _CB);
+            if (Y<0) dst->y[i]=0;
+            else if (Y>255) dst->y[i]=255;
+            else dst->y[i]=(uint8_t) floor(Y+.5);
+
+            if (i%2==0 && ((i/width)%2)==0) { 
+                double V =  (0.500 * _CRX) - (0.419 * _CGX) - (0.081 * _CBX) + 128;
+                double U = -(0.169 * _CRX) - (0.331 * _CGX) + (0.500 * _CBX) + 128;
+                            
+                if (U<1) dst->u[c]=(uint8_t) 0;
+                else if (U>254) dst->u[c]=(uint8_t) 255;
+                else dst->u[c]=(uint8_t) floor(U+.5);
+                            
+                if (V<1) dst->v[c]=(uint8_t) 0;
+                else if (V>254) dst->v[c]=(uint8_t) 255;
+                else dst->v[c]=(uint8_t) floor(V+.5);
+                c++;
+            }
     }
 #endif