Changeset 878

Timestamp:

05/17/08 22:39:36 (6 months ago)

Author:

astrange

Message:

Hack to fix VP3. Closes #324

Files:

• trunk/FFusionCodec.c (modified) (5 diffs)

trunk/FFusionCodec.c

@@ -62 +62 @@
-        bool            used;
-        long            frameNumber;
+        AVFrame         returnedFrame;
-} FFusionBuffer;
-
@@ -1203 +1204 @@
-        avcodec_get_frame_defaults(&tempFrame);
-        err = FFusionDecompress(glob, glob->avContext, dataPtr, dataProc, myDrp->width, myDrp->height, &tempFrame, dataSize);
-
+       
-        if (glob->packedType == PACKED_QUICKTIME_KNOWS_ORDER) {
-                myDrp->buffer = &glob->buffers[glob->lastAllocatedBuffer];
-                myDrp->buffer->frameNumber = myDrp->frameNumber;
+                myDrp->buffer->returnedFrame = tempFrame;
-                myDrp->decoded = true;
-                return err;
@@ -1220 +1222 @@
-        glob->decode.lastFrame = myDrp->frameNumber;
-        myDrp->decoded = true;
+        if (myDrp->buffer) myDrp->buffer->returnedFrame = tempFrame;
-        
-        FFusionDataMarkRead(&(glob->data), frameData);
@@ -1272 +1275 @@
-        if(!picture || picture->data[0] == 0)
-        {
-
+
+
+
+
-                        //Display last frame
-                        picture = &(glob->lastDisplayedFrame);
@@ -1652 +1658 @@
-        
-        buf->used = false;
+        buf->returnedFrame.data[0] = NULL;
-        
-        avcodec_default_release_buffer(s, pic);