Changeset 231

Timestamp:

01/04/07 14:32:11 (2 years ago)

Author:

dconrad

Message:

Fix HuffYUV decoder for RGB. Still needs YUV copying. Refs #68.

Files:

• trunk/FFusionCodec.c (modified) (3 diffs)
• trunk/FFusionCodec.r (modified) (1 diff)

trunk/FFusionCodec.c

@@ -573 +573 @@
-                                DisposeHandle(imgDescExt);
-                        }
+                } else {
+                        CountImageDescriptionExtensionType(p->imageDescription, 'strf', &count);
+                        
+                        if (count >= 1) {
+                                imgDescExt = NewHandle(0);
+                                GetImageDescriptionExtension(p->imageDescription, &imgDescExt, 'strf', 1);
+                                
+                                if (GetHandleSize(imgDescExt) - 40 > 0) {
+                                        glob->avContext->extradata = calloc(1, GetHandleSize(imgDescExt) - 40 + FF_INPUT_BUFFER_PADDING_SIZE);
+                                        memcpy(glob->avContext->extradata, *imgDescExt + 40, GetHandleSize(imgDescExt) - 40);
+                                        glob->avContext->extradata_size = GetHandleSize(imgDescExt) - 40;
+                                }
+                                DisposeHandle(imgDescExt);
+                        }
-                }
-                
@@ -635 +649 @@
-                case PIX_FMT_BGR24:
-                        pos[index++] = k24RGBPixelFormat;
+                        break;
+                case PIX_FMT_RGB32:
+                        pos[index++] = k32ARGBPixelFormat;
-                        break;
-                case PIX_FMT_YUV420P:
@@ -900 +917 @@
-        {
-                BGR24toRGB24((UInt8 *)drp->baseAddr, drp->rowBytes, myDrp->width, myDrp->height, picture);
+        }
+        else if (myDrp->pixelFormat == k32ARGBPixelFormat && glob->avContext->pix_fmt == PIX_FMT_RGB32)
+        {
+                Ptr dest = drp->baseAddr;
+                Ptr src = (Ptr) picture->data[0];
+                for (i = 0; i < myDrp->height; i++) {
+                        memcpy(dest, src, FFMIN(drp->rowBytes, picture->linesize[0]));
+                        dest += drp->rowBytes;
+                        src += picture->linesize[0];
+                }
-        }
-        else

trunk/FFusionCodec.r

@@ -458 +458 @@
-
-//---------------------------------------------------------------------------
+// Huffyuv Description Resources
+//---------------------------------------------------------------------------
+
+resource 'cdci' (kHuffYUVCodecInfoResID) {
+        kHuffYUVName,                           // Type
+        1,                                      // Version
+        1,                                      // Revision level
+        kFFusionCodecManufacturer,                      // Manufacturer
+        kFFusionDecompressionFlags,             // Decompression Flags
+        0,                                      // Compression Flags
+        kFFusionFormatFlags,                    // Format Flags
+        128,                                    // Compression Accuracy
+        128,                                    // Decomression Accuracy
+        200,                                    // Compression Speed
+        200,                                    // Decompression Speed
+        128,                                    // Compression Level
+        0,                                      // Reserved
+        1,                                      // Minimum Height
+        1,                                      // Minimum Width
+        0,                                      // Decompression Pipeline Latency
+        0,                                      // Compression Pipeline Latency
+        0                                       // Private Data
+};
+
+//---------------------------------------------------------------------------
-// MS-MPEG4 v1 Component
-//---------------------------------------------------------------------------