Changeset 9fd29776ea63427fec80b3e34e0e52abfa924b53 for oggzcap/src/videoout/FrameReader.m

Timestamp:

02/21/10 22:44:27 (2 years ago)

Author:

Robin Gareus <rgareus@…>

Parents:

41dcfc0d39c224f0f2aef6cb2c5fc6541643e4b4

Children:

9759199714df0cd85f695766c4c5c5d712570365

git-committer:

Robin Gareus <rgareus@priroda.local> / 2010-02-21T23:44:27Z+0100

Message:

capture working again

Files:

• oggzcap/src/videoout/FrameReader.m (modified) (10 diffs)

oggzcap/src/videoout/FrameReader.m

@@ -19 +19 @@
 
 @implementation FrameReader (PrivateReaderMethods)
+
+// http://developer.apple.com/mac/library/samplecode/QuartzComposer_WWDC_QCTV/listing12.html
 
 // Initiate an asynchronous screen read operation.
@@ -69 +71 @@
         unsigned char*          src;
         unsigned char*          dst;
+#if 0
         unsigned char           temp[(mWidth * 2 + 63) & ~63];
 
@@ -79 +82 @@
                 bcopy(temp, src, mWidth * 2);
         }
+        
+#else   
+        unsigned char           temp[(mWidth * 4 + 63) & ~63];
+        for(i = 0; i < mHeight/2; ++i) {
+                src = mBaseAddress + mBufferRowBytes * i;
+                dst = mBaseAddress + mBufferRowBytes * (mHeight - 1 - i);
+                bcopy(dst, temp, mWidth * 4);
+                bcopy(src, dst, mWidth * 4);
+                bcopy(temp, src, mWidth * 4);
+        }
+#endif
+        
 }
 
@@ -154 +169 @@
                 
                 attributes = [NSMutableDictionary dictionary];
+#if 0           
                 #if __BIG_ENDIAN__
                         [attributes setObject:[NSNumber numberWithUnsignedInt:k422YpCbCr8PixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
@@ -159 +175 @@
                         [attributes setObject:[NSNumber numberWithUnsignedInt:k422YpCbCr8PixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
                 #endif
+#else
+        //      [attributes setObject:[NSNumber numberWithUnsignedInt:k32ARGBPixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
+                [attributes setObject:[NSNumber numberWithUnsignedInt:k32BGRAPixelFormat] forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey];
+#endif
+                
                 [attributes setObject:[NSNumber numberWithUnsignedInt:width] forKey:(NSString*)kCVPixelBufferWidthKey];
                 [attributes setObject:[NSNumber numberWithUnsignedInt:height] forKey:(NSString*)kCVPixelBufferHeightKey];
@@ -184 +205 @@
                 mBaseAddress = (unsigned char*)CVPixelBufferGetBaseAddress(mPixelBuffer);
                 mBufferRowBytes = CVPixelBufferGetBytesPerRow(mPixelBuffer);
+                
                 
                 // Do setup for asynchronous texture reading
@@ -209 +231 @@
                 
                 glGetIntegerv(GL_UNPACK_ALIGNMENT, &save2);
-                glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+                glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
                 glGetIntegerv(GL_UNPACK_ROW_LENGTH, &save3);
-                glPixelStorei(GL_UNPACK_ROW_LENGTH, mBufferRowBytes / 2);
+                glPixelStorei(GL_UNPACK_ROW_LENGTH, mBufferRowBytes / 4);
         
                 // specify that our application retains storage for textures:
@@ -218 +240 @@
         
                 // define our texture
-                glTexImage2D(GL_TEXTURE_RECTANGLE_ARB,0,GL_RGBA, mWidth,mHeight,0,GL_YCBCR_422_APPLE, 
-                                        inoutTexEndianFormat,
+                glTexImage2D(GL_TEXTURE_RECTANGLE_ARB,0,GL_RGBA, mWidth,mHeight,0,
+                                         GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+//                                       GL_YCBCR_422_APPLE, inoutTexEndianFormat,
                                         mBaseAddress);
                                         
@@ -362 +385 @@
         glGetIntegerv(GL_PACK_ROW_LENGTH, &save3);
 
-        glPixelStorei(GL_PACK_ROW_LENGTH, mBufferRowBytes / 2);
+        glPixelStorei(GL_PACK_ROW_LENGTH, mBufferRowBytes / 4);
 
         // You should have previously called glCopyTexSubImage2D/glFlush to initiate
@@ -369 +392 @@
         // glGetTexImage actually copies the texture from AGP memory to system memory.
         // This is the synchronization point; it waits until the transfer is finished.
-        glGetTexImage(GL_TEXTURE_RECTANGLE_ARB, 0, GL_YCBCR_422_APPLE, 
-                                        inoutTexEndianFormat,
+        glGetTexImage(GL_TEXTURE_RECTANGLE_ARB, 0,
+                                  GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+        //                        GL_YCBCR_422_APPLE, inoutTexEndianFormat,
                                         mBaseAddress);