Changeset 887

Timestamp:

05/22/08 16:45:06 (6 months ago)

Author:

astrange

Message:

Merge trunk to 1.1 branch.

Files:

• branches/perian-1.1 (modified) (1 prop)
• branches/perian-1.1/CAPublicUtility/CAStreamBasicDescription.cpp (modified) (2 diffs)
• branches/perian-1.1/Codecprintf.c (modified) (3 diffs)
• branches/perian-1.1/Codecprintf.h (modified) (1 diff)
• branches/perian-1.1/ColorConversions.c (modified) (11 diffs)
• branches/perian-1.1/ColorConversions.h (modified) (1 diff)
• branches/perian-1.1/CommonUtils.c (modified) (1 diff)
• branches/perian-1.1/CommonUtils.h (modified) (1 diff)
• branches/perian-1.1/ECQTComponent.h (copied) (copied from trunk/ECQTComponent.h)
• branches/perian-1.1/ECQTComponent.m (copied) (copied from trunk/ECQTComponent.m)
• branches/perian-1.1/FFissionCodec/FFissionCodec.cpp (modified) (1 diff)
• branches/perian-1.1/FFusionCodec.c (modified) (42 diffs)
• branches/perian-1.1/FFusionCodec.h (modified) (2 diffs)
• branches/perian-1.1/FFusionCodec.r (modified) (9 diffs)
• branches/perian-1.1/MatroskaCodecIDs.cpp (modified) (12 diffs)
• branches/perian-1.1/MatroskaExportVersion.h (modified) (1 diff)
• branches/perian-1.1/MatroskaImport.h (modified) (1 diff)
• branches/perian-1.1/MatroskaImportPrivate.cpp (modified) (15 diffs)
• branches/perian-1.1/MatroskaImportVersion.h (modified) (1 diff)
• branches/perian-1.1/Patches (copied) (copied from trunk/Patches)
• branches/perian-1.1/Perian.xcodeproj/project.pbxproj (modified) (15 diffs)
• branches/perian-1.1/PerianPrefPane.nib/info.nib (modified) (1 diff)
• branches/perian-1.1/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)
• branches/perian-1.1/Plists/Perian-Info.plist (modified) (2 diffs)
• branches/perian-1.1/Plists/PerianPane-Info.plist (modified) (1 diff)
• branches/perian-1.1/Plists/PerianUpdateChecker-Info.plist (modified) (1 diff)
• branches/perian-1.1/Release/Changes.txt (modified) (1 diff)
• branches/perian-1.1/Release/Makefile (modified) (2 diffs)
• branches/perian-1.1/Release/Read Me.rtf (modified) (3 diffs)
• branches/perian-1.1/Subtitles/SubATSUIRenderer.h (modified) (2 diffs)
• branches/perian-1.1/Subtitles/SubATSUIRenderer.m (modified) (20 diffs)
• branches/perian-1.1/Subtitles/SubContext.h (modified) (2 diffs)
• branches/perian-1.1/Subtitles/SubContext.m (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubImport.h (modified) (2 diffs)
• branches/perian-1.1/Subtitles/SubImport.mm (modified) (9 diffs)
• branches/perian-1.1/Subtitles/SubParsing.h (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubParsing.m.rl (modified) (5 diffs)
• branches/perian-1.1/Subtitles/SubUtilities.m (modified) (1 diff)
• branches/perian-1.1/Subtitles/latin-detector.c (added)
• branches/perian-1.1/Subtitles/ssa2html.m (added)
• branches/perian-1.1/TextSubCodec.c (modified) (1 diff)
• branches/perian-1.1/TextSubCodec.h (modified) (1 diff)
• branches/perian-1.1/UniversalDetector/universalchardet/src/nsMBCSSM.cpp (modified) (4 diffs)
• branches/perian-1.1/Update Checker Sources/main.m (modified) (1 diff)
• branches/perian-1.1/VobSubCodec.c (modified) (1 diff)
• branches/perian-1.1/VobSubCodec.h (modified) (1 diff)
• branches/perian-1.1/bitstream_info.c (modified) (9 diffs)
• branches/perian-1.1/config.h (added)
• branches/perian-1.1/createStaticLibs.sh (modified) (6 diffs)
• branches/perian-1.1/ff_MovieImport.c (modified) (3 diffs)
• branches/perian-1.1/ff_MovieImportVersion.h (modified) (1 diff)
• branches/perian-1.1/ff_private.c (modified) (8 diffs)
• branches/perian-1.1/ff_private.h (modified) (1 diff)
• branches/perian-1.1/ffmpeg-patch (deleted)

branches/perian-1.1/CAPublicUtility/CAStreamBasicDescription.cpp

@@ -50 +50 @@
-        #include <Endian.h>
-#endif
-
-#import "CodecIDs.h"
-
-const AudioStreamBasicDescription       CAStreamBasicDescription::sEmpty = { 0.0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -274 +272 @@
-                
-                case kAudioFormatAC3:
-                case kAudioFormatAC3MS:
-                        strcpy(outName, "AC-3");
-                        break;

branches/perian-1.1/Codecprintf.c

@@ -15 +15 @@
-#ifdef DEBUG_BUILD
-#define CODEC_HEADER                    "Perian Codec: "
+#define FILELOG
-
-static int Codecvprintf(FILE *fileLog, const char *format, va_list va, int print_header)
@@ -24 +25 @@
-        {
-                if(print_header)
-glob->
+
-                ret = vfprintf(fileLog, format, va);
-glob->
+
-        }
-        else
@@ -47 +48 @@
-        va_list va;
-        va_start(va, format);
-1
+!fileLog
-        va_end(va);
-        return ret;
-}
-
-void FourCCprintf (char *string, unsigned long a
+const char *FourCCString(FourCharCode c
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
+
+void FourCCprintf (char *string, FourCharCode a)
+{
+    Codecprintf(NULL, "%s%s\n", string, FourCCString(a));
+}
+
-#else
-#define Codecvprintf(file, fmt, va, print_header) /**/

branches/perian-1.1/Codecprintf.h

@@ -14 +14 @@
-#ifdef DEBUG_BUILD
-int Codecprintf(FILE *, const char *format, ...);
-
+
+
-#else
-#define Codecprintf(file, fmt, ...) /**/

branches/perian-1.1/ColorConversions.c

@@ -24 +24 @@
-#include <sys/sysctl.h>
-
+#ifndef GOOD_COMPILER
+#define noinline __attribute__((noinline))
+#else
+#define noinline
+#endif
+
+#define unlikely(x) __builtin_expect(x, 0)
+
-//-----------------------------------------------------------------
-// FastY420
@@ -58 +66 @@
-// have a decent OS/QT version.
-//-----------------------------------------------------------------
+
+static void noinline Y420toY422_lastrow(UInt8 *o, const UInt8 *yc, const UInt8 *uc, const UInt8 *vc, unsigned halfWidth)
+{
+        unsigned x;
+        for(x=0; x < halfWidth; x++)
+        {
+                unsigned x4 = x*4, x2 = x*2;
+                o[x4] = uc[x];
+                o[x4+1] = yc[x2];
+                o[x4+2] = vc[x];
+                o[x4+3] = yc[x2+1];
+        }
+}
+
+#define HandleLastRow(o, yc, uc, vc, halfWidth, height) if (unlikely(height & 1)) Y420toY422_lastrow(o, yc, uc, vc, halfWidth)
-
-#ifdef __BIG_ENDIAN__
@@ -104 +127 @@
-                 baseAddr += outRB * 2;
-         }
+        
+        HandleLastRow(baseAddr, inY, inU, inV, halfWidth, height);
- }
-
@@ -154 +179 @@
-                vc += rV;
-        }
+        
+        HandleLastRow(o, yc, uc, vc, width / 2, height);
-}
-
@@ -186 +213 @@
-                __m128i * uv = (__m128i*)uc,* vv  = (__m128i*)vc;
-                
+#if 0
+                asm volatile(
+                        "\n0:                   \n\t"
+                        "movdqa         (%2),   %%xmm0  \n\t"
+                        "movdqa         16(%2), %%xmm2  \n\t"
+                        "movdqa         (%3),           %%xmm1  \n\t"
+                        "movdqa         16(%3), %%xmm3  \n\t"
+                        "movdqu         (%4),   %%xmm4  \n\t"
+                        "movdqu         (%5),   %%xmm5  \n\t"
+                        "addl           $32,    %2              \n\t"
+                        "addl           $32,    %3              \n\t"
+                        "addl           $16,    %4              \n\t"
+                        "addl           $16,    %5              \n\t"
+                        "movdqa         %%xmm4, %%xmm6  \n\t"
+                        "punpcklbw      %%xmm5, %%xmm4  \n\t" /*chroma_l*/
+                        "punpckhbw      %%xmm5, %%xmm6  \n\t" /*chroma_h*/
+                        "movdqa         %%xmm4, %%xmm5  \n\t"
+                        "punpcklbw      %%xmm0, %%xmm5  \n\t"
+                        "movntdq        %%xmm5, (%0)    \n\t" /*ov[x4]*/
+                        "movdqa         %%xmm4, %%xmm5  \n\t"
+                        "punpckhbw      %%xmm0, %%xmm5  \n\t"
+                        "movntdq        %%xmm5, 16(%0)  \n\t" /*ov[x4+1]*/
+                        "movdqa         %%xmm6, %%xmm5  \n\t"
+                        "punpcklbw      %%xmm2, %%xmm5  \n\t"
+                        "movntdq        %%xmm5, 32(%0)  \n\t" /*ov[x4+2]*/
+                        "movdqa         %%xmm6, %%xmm5  \n\t"
+                        "punpckhbw      %%xmm2, %%xmm5  \n\t"
+                        "movntdq        %%xmm5, 48(%0)  \n\t" /*ov[x4+3]*/
+                        "addl           $64,    %0              \n\t"
+                        "movdqa         %%xmm4, %%xmm5  \n\t"
+                        "punpcklbw      %%xmm1, %%xmm5  \n\t"
+                        "movntdq        %%xmm5, (%1)    \n\t" /*ov2[x4]*/
+                        "punpckhbw      %%xmm1, %%xmm4  \n\t"
+                        "movntdq        %%xmm4, 16(%1)  \n\t" /*ov2[x4+1]*/
+                        "movdqa         %%xmm6, %%xmm5  \n\t"
+                        "punpcklbw      %%xmm3, %%xmm5  \n\t"
+                        "movntdq        %%xmm5, 32(%1)  \n\t" /*ov2[x4+2]*/
+                        "punpckhbw      %%xmm3, %%xmm6  \n\t"
+                        "movntdq        %%xmm6, 48(%1)  \n\t" /*ov2[x4+3]*/
+                        "addl           $64,    %1              \n\t"
+                        "dec            %6                              \n\t"
+                        "jnz            0b                              \n\t"
+                        : "+r" (ov), "+r" (ov2),
+                        "+r" (yv), "+r" (yv2), "+r" (uv), "+r" (vv)
+                        : "r" (vWidth)
+                        );
+#else
-                for (x = 0; x < vWidth; x++) {
-                        unsigned x2 = x*2, x4 = x*4;
@@ -205 +279 @@
-                        _mm_stream_si128(&ov2[x4+3],_mm_unpackhi_epi8(chroma_h, tmp_y4));
-                }
-
-
+
+
+
-                        unsigned x4 = x*4, x2 = x*2;
-                        o2[x4] = o[x4] = uc[x];
@@ -221 +296 @@
-                vc += rV;
-        }
-
-
-
-
+
+
+
+
+
+
+
+
-{
-        UInt8           *yc = picture->data[0], *u = picture->data[1], *v = picture->data[2];
@@ -248 +327 @@
-                v += rV;
-        }
+
+        HandleLastRow(o, yc, u, v, halfwidth, height);
-}
-
@@ -255 +336 @@
-
-        //make sure the ffmpeg picture buffers are aligned enough, they're only guaranteed to be 8-byte for some reason...
-
-
-
-
+
+
-}
-#endif
+
+void YA420toV408(UInt8* o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture)
+{
+        UInt8          *yc = picture->data[0], *u = picture->data[1], *v = picture->data[2], *a = picture->data[3];
+        unsigned       rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], rA = picture->linesize[3], y, x;
+        
+        for (y = 0; y < height; y++) {
+                for (x = 0; x < width; x++) {
+                        o[x*4] = u[x/2];
+                        o[x*4+1] = yc[x];
+                        o[x*4+2] = v[x/2];
+                        o[x*4+3] = a[x];
+                }
+                
+                o += outRB;
+                yc += rY;
+                a += rA;
+                if (y & 1) {
+                        u += rU;
+                        v += rV;
+                }
+        }
+}
-
-void BGR24toRGB24(UInt8 *baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame *picture)
@@ -266 +368 @@
-        unsigned i, j;
-        UInt8 *srcPtr = picture->data[0];
-        unsigned width_third = width / 3;
-        
-        for (i = 0; i < height; ++i)
-        {
-_third
+
-                {
-                        unsigned j3 = j * 3;
@@ -301 +402 @@
-}
-
+void RGB24toRGB24(UInt8 *baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame *picture)
+{
+        unsigned y;
+        UInt8 *srcPtr = picture->data[0];
+        
+        for (y = 0; y < height; y++) {
+                memcpy(baseAddr, srcPtr, width * 3);
+                
+                baseAddr += rowBytes;
+                srcPtr += picture->linesize[0];
+        }
+}
+
-void Y422toY422(UInt8* o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture)
-{

branches/perian-1.1/ColorConversions.h

@@ -23 +23 @@
-extern void FastY420(UInt8 *baseAddr, AVFrame *picture);
-extern void Y420toY422(UInt8* baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame * picture);
+extern void YA420toV408(UInt8* o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture);
-extern void RGB32toRGB32(UInt8 *baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame *picture);
+extern void RGB24toRGB24(UInt8 *baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame *picture);
-extern void BGR24toRGB24(UInt8 *baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame *picture);
-extern void Y422toY422(UInt8* o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture);

branches/perian-1.1/CommonUtils.c

@@ -286 +286 @@
-        return 0;
-}
+
+int IsFrameDroppingEnabled()
+{
+        static int enabled = -1;
+        
+        if (enabled == -1) enabled = getenv("PerianNoFrameDropping") == NULL;
+        
+        return enabled;
+}

branches/perian-1.1/CommonUtils.h

@@ -39 +39 @@
-int isImageDescriptionExtensionPresent(ImageDescriptionHandle desc, long type);
-
+int IsFrameDroppingEnabled();
+
-#ifdef __cplusplus
-}

branches/perian-1.1/FFissionCodec/FFissionCodec.cpp

@@ -25 +25 @@
-#include "FFissionCodec.h"
-
-Lib
+_FFmpeg
-
-FFissionCodec::FFissionCodec(UInt32 inInputBufferByteSize) : ACSimpleCodec(inInputBufferByteSize)
-{
-Lib
+_FFmpeg
-        
-        avContext = avcodec_alloc_context();

branches/perian-1.1/FFusionCodec.c

@@ -62 +62 @@
-        bool            used;
-        long            frameNumber;
+        AVFrame         returnedFrame;
-} FFusionBuffer;
-
@@ -89 +90 @@
-        long                    lastFrame;
-        FFusionBuffer   *futureBuffer;
+};
+
+struct per_frame_decode_stats
+{
+        unsigned                begin_calls;
+        unsigned                decode_calls;
+        unsigned                draw_calls;
+        unsigned                end_calls;
+};
+
+struct decode_stats
+{
+        struct per_frame_decode_stats type[4];
+        int             max_frames_begun;
+        int             max_frames_decoded;
-};
-
@@ -108 +124 @@
-        int                             lastAllocatedBuffer;            // the index of the buffer which was last allocated 
-                                                                                                // by the codec (and is the latest in decode order)     
+        int                             shouldUseReturnedFrame;
-        struct begin_glob       begin;
-        FFusionData             data;
-        struct decode_glob      decode;
+        struct decode_stats stats;
-} FFusionGlobalsRecord, *FFusionGlobals;
-
@@ -132 +150 @@
-//---------------------------------------------------------------------------
-
-
+FFusionGlobals glob, 
-static int FFusionGetBuffer(AVCodecContext *s, AVFrame *pic);
-static void FFusionReleaseBuffer(AVCodecContext *s, AVFrame *pic);
@@ -143 +161 @@
-void ChangeHintText(int value, ControlRef staticTextField);
-
-Lib
+_FFmpeg
-extern CFMutableStringRef GetHomeDirectory();
+
+#define FFusionDebugPrint(x...) if (glob->fileLog) Codecprintf(glob->fileLog, x);
+#define not(x) ((x) ? "" : "not ")
-
-//---------------------------------------------------------------------------
@@ -165 +186 @@
-#include <QuickTime/ComponentDispatchHelper.c>
-
-
+static 
-{
-        FSRef *ref = (FSRef *)args;
@@ -209 +230 @@
-}
-
+static void RecomputeMaxCounts(FFusionGlobals glob)
+{
+        int i;
+        unsigned begun = 0, decoded = 0, ended = 0, drawn = 0;
+        
+        for (i = 0; i < 4; i++) {
+                struct per_frame_decode_stats *f = &glob->stats.type[i];
+                
+                begun += f->begin_calls;
+                decoded += f->decode_calls;
+                drawn += f->draw_calls;
+                ended += f->end_calls;
+        }
+        
+        signed begin_diff = begun - ended, decode_diff = decoded - drawn;
+        
+        if (abs(begin_diff) > glob->stats.max_frames_begun) glob->stats.max_frames_begun = begin_diff;
+        if (abs(decode_diff) > glob->stats.max_frames_decoded) glob->stats.max_frames_decoded = decode_diff;
+}
+
+static void DumpFrameDropStats(FFusionGlobals glob)
+{
+        static const char types[4] = {'?', 'I', 'P', 'B'};
+        int i;
+        
+        if (!glob->fileLog || glob->decode.lastFrame == 0) return;
+        
+        Codecprintf(glob->fileLog, "Type\t| BeginBand\t| DecodeBand\t| DrawBand\t| dropped before decode\t| dropped before draw\n");
+        
+        for (i = 0; i < 4; i++) {
+                struct per_frame_decode_stats *f = &glob->stats.type[i];
+                                
+                Codecprintf(glob->fileLog, "%c\t| %d\t\t| %d\t\t| %d\t\t| %d/%f%%\t\t| %d/%f%%\n", types[i], f->begin_calls, f->decode_calls, f->draw_calls,
+                                        f->begin_calls - f->decode_calls,(f->begin_calls > f->decode_calls) ? ((float)(f->begin_calls - f->decode_calls)/(float)f->begin_calls) * 100. : 0.,
+                                        f->decode_calls - f->draw_calls,(f->decode_calls > f->draw_calls) ? ((float)(f->decode_calls - f->draw_calls)/(float)f->decode_calls) * 100. : 0.);
+        }
+}
+
-//---------------------------------------------------------------------------
-// Component Routines
@@ -241 +300 @@
-        
-  //  FourCCprintf("Opening component for type ", descout.componentSubType);
-        
-    // Allocate memory for our globals, set them up and inform the component manager that we've done so
-        
@@ -264 +322 @@
-                glob->data.frames = NULL;
-                glob->begin.parser = NULL;
-
-
-
-
-
+
+
+
-                
-//        c = FindNextComponent(c, &cd);
@@ -306 +362 @@
-    }
-    
+    FFusionDebugPrint("%p opened for '%s'\n", glob, FourCCString(glob->componentType));
-    return err;
-}
@@ -315 +372 @@
-pascal ComponentResult FFusionCodecClose(FFusionGlobals glob, ComponentInstance self)
-{
+    FFusionDebugPrint("%p closed.\n", glob);
+        DumpFrameDropStats(glob);
+
-    // Make sure to close the base component and deallocate our storage
-    
-    if (glob) 
-    {
@@ -417 +476 @@
-pascal ComponentResult FFusionCodecInitialize(FFusionGlobals glob, ImageSubCodecDecompressCapabilities *cap)
-{
+        Boolean doExperimentalFlags = getenv("PerianExperimentalQTFlags") != NULL;
-        
-    // Secifies the size of the ImageSubCodecDecompressRecord structure
@@ -433 +493 @@
-                cap->subCodecSupportsOutOfOrderDisplayTimes = true;
-                cap->baseCodecShouldCallDecodeBandForAllFrames = true;
-
-
-
-
+
+
-                cap->subCodecSupportsDecodeSmoothing = true; 
-        }
@@ -468 +526 @@
-    // to the fourCC if it has not been done before
-    
+        FFusionDebugPrint("%p Preflight called.\n", glob);
+        
-    if (!glob->avCodec)
-    {
-                enum CodecID codecID = CODEC_ID_MPEG4;
-                
-Lib
+_FFmpeg
-                initFFusionParsers();
-                
@@ -577 +637 @@
-                        case 'VP30':
-                        case 'VP31':
+                                glob->shouldUseReturnedFrame = TRUE;
-                                codecID = CODEC_ID_VP3;
-                                break;
@@ -612 +673 @@
-                codecID = CODEC_ID_NUV;
-                break;
-
+
+
+
+
+
+
+
+
+
+
+
-                                
-            default:
@@ -622 +693 @@
-                        glob->begin.parser = ffusionParserInit(codecID);
-                
+                if ((codecID == CODEC_ID_MPEG4 || codecID == CODEC_ID_H264) && !glob->begin.parser)
+                        Codecprintf(glob->fileLog, "This is a parseable format, but we couldn't open a parser!\n");
+                
-        // we do the same for the AVCodecContext since all context values are
-        // correctly initialized when calling the alloc function
@@ -634 +708 @@
-        glob->avContext->width = (**p->imageDescription).width;
-        glob->avContext->height = (**p->imageDescription).height;
+                glob->avContext->bits_per_sample = (**p->imageDescription).depth;
-                
-        // We also pass the FourCC since it allows the H263 hybrid decoder
@@ -686 +761 @@
-                }
-                
+                FFusionDebugPrint("%p preflighted for %dx%d '%s'. (%d bytes of extradata)\n", glob, (**p->imageDescription).width, (**p->imageDescription).height, FourCCString(glob->componentType), glob->avContext->extradata_size);
+        
-                if(glob->avContext->extradata_size != 0 && glob->begin.parser != NULL)
-                        ffusionParseExtraData(glob->begin.parser, glob->avContext->extradata, glob->avContext->extradata_size);
@@ -757 +834 @@
-                case PIX_FMT_RGB32:
-                        pos[index++] = k32ARGBPixelFormat;
+                        break;
+                case PIX_FMT_RGB24:
+                        pos[index++] = k24RGBPixelFormat;
+                        break;
+                case PIX_FMT_YUVA420P:
+                        pos[index++] = k4444YpCbCrA8PixelFormat;
-                        break;
-                case PIX_FMT_YUV420P:
@@ -786 +869 @@
-        capabilities->flags |= codecCanAsync | codecCanAsyncWhen;
-        
+        FFusionDebugPrint("%p Preflight requesting colorspace '%s'. (error %d)\n", glob, FourCCString(pos[0]), err);
+        
-    return err;
-}
@@ -796 +881 @@
-                        return kCodecFrameTypeKey;
-        }
-
+ && IsFrameDroppingEnabled()
-                return kCodecFrameTypeDroppableDifference;
-        else if(fftype != 0)
@@ -822 +907 @@
-    FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
-        int redisplayFirstFrame = 0;
+        int type = 0;
+        int skippable = 0;
-        
-    //////
@@ -847 +934 @@
-        myDrp->frameData = NULL;
-        myDrp->buffer = NULL;
+        
+        FFusionDebugPrint("%p BeginBand #%d. (%sdecoded, packed %d)\n", glob, p->frameNumber, not(myDrp->decoded), glob->packedType);
-        
-        if (!glob->avContext) {
@@ -897 +986 @@
-        {
-                int parsedBufSize;
-                int type = 0;
-                int skippable = 0;
-                uint8_t *buffer = (uint8_t *)drp->codecData;
-                int bufferSize = p->bufferSize;
@@ -921 +1008 @@
-                        else
-                        {
-NULL
+glob->fileLog
-                                if(glob->data.unparsedFrames.dataSize != 0)
-NULL
+glob->fileLog
-                        }
-                }
@@ -1012 +1099 @@
-        myDrp->frameNumber = p->frameNumber;
-        myDrp->GOPStartFrameNumber = glob->begin.lastIFrame;
+        
+        glob->stats.type[drp->frameType].begin_calls++;
+        RecomputeMaxCounts(glob);
+        FFusionDebugPrint("%p BeginBand: frame #%d type %d. (%sskippable)\n", glob, myDrp->frameNumber, type, not(skippable));
+        
-    return noErr;
-}
-
-
-
+
+
+
+
-        FrameData *preprereq = FrameDataCheckPrereq(prereq);
-        if(preprereq)
-
+glob, 
-        
-        unsigned char *dataPtr = (unsigned char *)prereq->buffer;
-        int dataSize = prereq->dataSize;
-        
-
+glob, 
-        
-        return err;
@@ -1035 +1129 @@
-
-    FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
+        
+        glob->stats.type[drp->frameType].decode_calls++;
+        RecomputeMaxCounts(glob);
+        FFusionDebugPrint("%p DecodeBand #%d qtType %d. (packed %d)\n", glob, myDrp->frameNumber, drp->frameType, glob->packedType);
-
-        avcodec_get_frame_defaults(&tempFrame);
@@ -1043 +1141 @@
-        {
-                /* Skipped some frames in here */
+                FFusionDebugPrint("%p - frames skipped.\n", glob);
-                if(drp->frameType == kCodecFrameTypeKey || myDrp->GOPStartFrameNumber > glob->decode.lastFrame || myDrp->frameNumber < glob->decode.lastFrame)
-                {
-                        /* If this is a key frame or the P frame before us is after the last frame (skip ahead), or we are before the last decoded frame (skip back) *
-                         * then we are in a whole new GOP */
+                        FFusionDebugPrint("%p - in a new GOP.\n", glob);
-                        avcodec_flush_buffers(glob->avContext);
-                }
@@ -1059 +1159 @@
-                if(nextFrame != NULL)
-                {
-
+, glob
-                        if(tempFrame.data[0] != NULL)
-                        {
@@ -1085 +1185 @@
-                if(prereq)
-                {
-
+glob, 
-                        if(tempFrame.data[0] != NULL)
-                        {
@@ -1106 +1206 @@
-                
-        avcodec_get_frame_defaults(&tempFrame);
-
-
+, glob
+       
-        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;
@@ -1124 +1225 @@
-        glob->decode.lastFrame = myDrp->frameNumber;
-        myDrp->decoded = true;
+        if (myDrp->buffer) myDrp->buffer->returnedFrame = tempFrame;
-        
-        FFusionDataMarkRead(&(glob->data), frameData);
+        
+        FFusionDebugPrint("%p DecodeBand decoded #%d.\n", glob, glob->decode.lastFrame);
-
-        return err;
@@ -1158 +1262 @@
-        int i, j;
-        
+        glob->stats.type[drp->frameType].draw_calls++;
+        RecomputeMaxCounts(glob);
+        FFusionDebugPrint("%p DrawBand #%d. (%sdecoded)\n", glob, myDrp->frameNumber, not(myDrp->decoded));
+        
-        if(!myDrp->decoded)
-                err = FFusionCodecDecodeBand(glob, drp, 0);
@@ -1170 +1278 @@
-        if(!picture || picture->data[0] == 0)
-        {
-
+
+
+
+
-                        //Display last frame
-                        picture = &(glob->lastDisplayedFrame);
@@ -1212 +1323 @@
-                RGB32toRGB32((UInt8 *)drp->baseAddr, drp->rowBytes, myDrp->width, myDrp->height, picture);
-        }
+        else if (myDrp->pixelFormat == k24RGBPixelFormat && glob->avContext->pix_fmt == PIX_FMT_RGB24)
+        {
+                RGB24toRGB24((UInt8 *)drp->baseAddr, drp->rowBytes, myDrp->width, myDrp->height, picture);
+        }