Changeset 816

Timestamp:

02/27/08 20:47:34 (5 months ago)

Author:

astrange

Message:

Write a lot of debug tracing to /tmp/perian.log if PerianDebugLogging? is set in the environment.

Files:

• trunk/Codecprintf.c (modified) (3 diffs)
• trunk/Codecprintf.h (modified) (1 diff)
• trunk/FFusionCodec.c (modified) (26 diffs)
• trunk/MatroskaCodecIDs.cpp (modified) (3 diffs)

trunk/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) /**/

trunk/Codecprintf.h

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

trunk/FFusionCodec.c

@@ -132 +132 @@
-//---------------------------------------------------------------------------
-
-
+FFusionGlobals glob, 
-static int FFusionGetBuffer(AVCodecContext *s, AVFrame *pic);
-static void FFusionReleaseBuffer(AVCodecContext *s, AVFrame *pic);
@@ -145 +145 @@
-extern void initLib();
-extern CFMutableStringRef GetHomeDirectory();
+
+#define FFCodecprintf(x...) if (glob->fileLog) Codecprintf(glob->fileLog, x);
+#define not(x) ((x) ? "" : "not ")
-
-//---------------------------------------------------------------------------
@@ -241 +244 @@
-        
-  //  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 +266 @@
-                glob->data.frames = NULL;
-                glob->begin.parser = NULL;
-
-
-
-
-
+
+
-                
-//        c = FindNextComponent(c, &cd);
@@ -306 +305 @@
-    }
-    
+    FFCodecprintf("%p opened for '%s'\n", glob, FourCCString(glob->componentType));
-    return err;
-}
@@ -315 +315 @@
-pascal ComponentResult FFusionCodecClose(FFusionGlobals glob, ComponentInstance self)
-{
+    FFCodecprintf("%p closed.\n", glob);
+
-    // Make sure to close the base component and deallocate our storage
-    
-    if (glob) 
-    {
@@ -417 +418 @@
-pascal ComponentResult FFusionCodecInitialize(FFusionGlobals glob, ImageSubCodecDecompressCapabilities *cap)
-{
+        Boolean doExperimentalFlags = getenv("PerianExperimentalQTFlags") != NULL;
-        
-    // Secifies the size of the ImageSubCodecDecompressRecord structure
@@ -433 +435 @@
-                cap->subCodecSupportsOutOfOrderDisplayTimes = true;
-                cap->baseCodecShouldCallDecodeBandForAllFrames = true;
-true
+!doExperimentalFlags
-                
-        //  XXX enabling this seems to cause rare visible artifacts in h.264?
-//     cap->subCodecSupportsDrawInDecodeOrder = true
+       cap->subCodecSupportsDrawInDecodeOrder = doExperimentalFlags
-                cap->subCodecSupportsDecodeSmoothing = true; 
-        }
@@ -468 +470 @@
-    // to the fourCC if it has not been done before
-    
+        FFCodecprintf("%p Preflight called.\n", glob);
+        
-    if (!glob->avCodec)
-    {
@@ -686 +690 @@
-                }
-                
+                FFCodecprintf("%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);
@@ -786 +792 @@
-        capabilities->flags |= codecCanAsync | codecCanAsyncWhen;
-        
+        FFCodecprintf("%p Preflight requesting colorspace '%s'. (error %d)\n", glob, FourCCString(pos[0]), err);
+        
-    return err;
-}
@@ -822 +830 @@
-    FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
-        int redisplayFirstFrame = 0;
+        int type = 0;
+        int skippable = 0;
-        
-    //////
@@ -847 +857 @@
-        myDrp->frameData = NULL;
-        myDrp->buffer = NULL;
+        
+        FFCodecprintf("%p BeginBand #%d. (%sdecoded, packed %d)\n", glob, p->frameNumber, not(myDrp->decoded), glob->packedType);
-        
-        if (!glob->avContext) {
@@ -897 +909 @@
-        {
-                int parsedBufSize;
-                int type = 0;
-                int skippable = 0;
-                uint8_t *buffer = (uint8_t *)drp->codecData;
-                int bufferSize = p->bufferSize;
@@ -921 +931 @@
-                        else
-                        {
-NULL
+glob->fileLog
-                                if(glob->data.unparsedFrames.dataSize != 0)
-NULL
+glob->fileLog
-                        }
-                }
@@ -1012 +1022 @@
-        myDrp->frameNumber = p->frameNumber;
-        myDrp->GOPStartFrameNumber = glob->begin.lastIFrame;
+        
+        FFCodecprintf("%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 +1049 @@
-
-    FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
+        
+        FFCodecprintf("%p DecodeBand #%d qtType %d. (packed %d)\n", glob, myDrp->frameNumber, drp->frameType, glob->packedType);
-
-        avcodec_get_frame_defaults(&tempFrame);
@@ -1043 +1059 @@
-        {
-                /* Skipped some frames in here */
+                FFCodecprintf("%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 */
+                        FFCodecprintf("%p - in a new GOP.\n", glob);
-                        avcodec_flush_buffers(glob->avContext);
-                }
@@ -1059 +1077 @@
-                if(nextFrame != NULL)
-                {
-
+, glob
-                        if(tempFrame.data[0] != NULL)
-                        {
@@ -1085 +1103 @@
-                if(prereq)
-                {
-
+glob, 
-                        if(tempFrame.data[0] != NULL)
-                        {
@@ -1106 +1124 @@
-                
-        avcodec_get_frame_defaults(&tempFrame);
-
+, glob
-        
-        if (glob->packedType == PACKED_QUICKTIME_KNOWS_ORDER) {
@@ -1126 +1144 @@
-        
-        FFusionDataMarkRead(&(glob->data), frameData);
+        
+        FFCodecprintf("%p DecodeBand decoded #%d.\n", glob, glob->decode.lastFrame);
-
-        return err;
@@ -1157 +1177 @@
-    FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
-        int i, j;
+        
+        FFCodecprintf("%p DrawBand #%d. (%sdecoded)\n", glob, myDrp->frameNumber, not(myDrp->decoded));
-        
-        if(!myDrp->decoded)
@@ -1248 +1270 @@
-pascal ComponentResult FFusionCodecEndBand(FFusionGlobals glob, ImageSubCodecDecompressRecord *drp, OSErr result, long flags)
-{
+        FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
+        FFCodecprintf("%p EndBand #%d.\n", glob, myDrp->frameNumber);
-    return noErr;
-}
@@ -1537 +1561 @@
-//-----------------------------------------------------------------
-
-
+FFusionGlobals glob, 
-{
-    OSErr err = noErr;
@@ -1544 +1568 @@
-    long availableData = dataProc ? codecMinimumDataSize : kInfiniteDataSize;
-        
+        FFCodecprintf("%p Decompress on frame #%d (%d bytes).\n", glob, glob->decode.lastFrame, length);
-    picture->data[0] = 0;
-        

trunk/MatroskaCodecIDs.cpp

@@ -571 +571 @@
-}
-
-static void PrintCoreAudioError(const char *msg, OSStatus err)
-{
-        OSStatus swap_err = EndianU32_NtoB(err);
-        Codecprintf(NULL, "%s '%.4s'\n", msg, &swap_err);
-}
-
-ComponentResult ASBDExt_AAC(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd, AudioChannelLayout *acl)
-{
@@ -599 +593 @@
-                                                                         asbd);
-                if (err != noErr) 
-
-
+
-                
-                err = AudioFormatGetProperty(kAudioFormatProperty_ChannelLayoutFromESDS,
@@ -608 +601 @@
-                                                                         acl);
-                if (err != noErr) 
-PrintCoreAudioError
+FourCCprintf
-                
-                DisposeHandle(esdsExt);