Changeset 960

Timestamp:

10/10/08 20:16:08 (1 month ago)

Author:

astrange

Message:

Change experimental QT flags and debug logging to be defaults options.
Improve logging, and make log files work in Deployment too.

Files:

• branches/perian-1.1/Codecprintf.c (modified) (3 diffs)
• branches/perian-1.1/Codecprintf.h (modified) (1 diff)
• branches/perian-1.1/CommonUtils.c (modified) (1 diff)
• branches/perian-1.1/FFusionCodec.c (modified) (12 diffs)
• branches/perian-1.1/bitstream_info.c (modified) (6 diffs)
• branches/perian-1.1/bitstream_info.h (modified) (1 diff)

branches/perian-1.1/Codecprintf.c

@@ -13 +13 @@
-#include "log.h"
-
-#ifdef DEBUG_BUILD
-#define CODEC_HEADER                    "Perian Codec: "
-#define FILELOG
-
-static int Codecvprintf(FILE *fileLog, const char *format, va_list va, int print_header)
-{
-
+ = 0
-        
-#ifdef FILELOG
-        if(fileLog)
-        {
@@ -31 +28 @@
-        else
-        {
-endif
+ifdef DEBUG_BUILD
-                if(print_header)
-                        printf(CODEC_HEADER);
-                
-                ret = vprintf(format, va);
-ifdef FILELOG
+endif
-        }
-#endif
-        
-        return ret;
@@ -68 +64 @@
-}
-
-#else
-#define Codecvprintf(file, fmt, va, print_header) /**/
-#endif
-
-void FFMpegCodecprintf(void* ptr, int level, const char* fmt, va_list vl)
-{

branches/perian-1.1/Codecprintf.h

@@ -12 +12 @@
-#endif
-
-#ifdef DEBUG_BUILD
-int Codecprintf(FILE *, const char *format, ...);
-void FourCCprintf(char *string, FourCharCode a);
-const char *FourCCString(FourCharCode c);
-#else
-#define Codecprintf(file, fmt, ...) /**/
-#define FourCCprintf(string,a) /**/
-#endif
-
-void FFMpegCodecprintf(void* ptr, int level, const char* fmt, va_list vl);

branches/perian-1.1/CommonUtils.c

@@ -341 +341 @@
-                enabled = findNameInList(myProcessName, defaultFrameDroppingWhiteList, count);
-            }
-            //Codecprintf(NULL, "Frame Dropping enabled is %d for %s\n", enabled, CFStringGetCStringPtr(myProcessName, kCFStringEncodingMacRoman));
-            CFRelease(myProcessName);
-            CFRelease(processInformation);

branches/perian-1.1/FFusionCodec.c

@@ -266 +266 @@
-        if (!glob->fileLog || glob->decode.lastFrame == 0) return;
-        
-Type\t| BeginBand\t| DecodeBand\t| DrawBand\t| dropped before decode\t| dropped before draw\n"
+%p frame drop stats\nType\t| BeginBand\t| DecodeBand\t| DrawBand\t| dropped before decode\t| dropped before draw\n", glob
-        
-        for (i = 0; i < 4; i++) {
@@ -319 +319 @@
-    else
-    {
+                CFStringRef pathToLogFile = CFPreferencesCopyAppValue(CFSTR("DebugLogFile"), CFSTR("org.perian.Perian"));
+                char path[PATH_MAX];
-        SetComponentInstanceStorage(self, (Handle)glob);
-
+
-        glob->self = self;
-        glob->target = self;
@@ -331 +333 @@
-                glob->data.frames = NULL;
-                glob->begin.parser = NULL;
-
-
+
+
+
+
+
-                glob->shouldUseReturnedFrame = 0;
-
+
-//        c = FindNextComponent(c, &cd);
-                
@@ -485 +490 @@
-pascal ComponentResult FFusionCodecInitialize(FFusionGlobals glob, ImageSubCodecDecompressCapabilities *cap)
-{
-getenv("PerianExperimentalQTFlags") != NULL
+CFPreferencesGetAppBooleanValue(CFSTR("ExperimentalQTFlags"), CFSTR("org.perian.Perian"), NULL)
-        
-    // Secifies the size of the ImageSubCodecDecompressRecord structure
@@ -537 +542 @@
-    
-        FFusionDebugPrint("%p Preflight called.\n", glob);
+        FFusionDebugPrint("%p Frame dropping is %senabled\n", glob, not(IsFrameDroppingEnabled()));
-        
-    if (!glob->avCodec)
@@ -775 +781 @@
-                if(glob->avContext->extradata_size != 0 && glob->begin.parser != NULL)
-                        ffusionParseExtraData(glob->begin.parser, glob->avContext->extradata, glob->avContext->extradata_size);
+                
+                if (glob->fileLog)
+                        ffusionLogDebugInfo(glob->begin.parser, glob->fileLog);
-                
-                // XXX: at the moment ffmpeg can't handle interlaced H.264 right
@@ -1175 +1184 @@
-                        /* 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);
-                }
@@ -1236 +1244 @@
-        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];
@@ -1243 +1251 @@
-                myDrp->buffer->returnedFrame = tempFrame;
-                myDrp->decoded = true;
+                glob->decode.lastFrame = myDrp->frameNumber;
-                return err;
-        }
@@ -1259 +1268 @@
-        FFusionDataMarkRead(&(glob->data), frameData);
-        
-        FFusionDebugPrint("%p DecodeBand decoded #%d.\n", glob, glob->decode.lastFrame);
-
-        return err;
-}
@@ -1304 +1311 @@
-        {
-                picture = myDrp->buffer->frame;
-                FFusionDebugPrint("%p DrawBand #%d. found %d\n", glob, myDrp->frameNumber, myDrp->buffer->frameNumber);
-        }
-        else
@@ -1738 +1744 @@
-    long availableData = dataProc ? codecMinimumDataSize : kInfiniteDataSize;
-        
-on frame #%d (%d bytes).\n", glob, glob->decode.lastFrame
+%d bytes.\n", glob
-    picture->data[0] = 0;
-        

branches/perian-1.1/bitstream_info.c

@@ -251 +251 @@
-        int prevPts;
-        
+        int profile_idc;
+        int level_idc;
+        
-        int poc_type;
-        int log2_max_frame_num;
@@ -266 +269 @@
-        
-        int chroma_format_idc;
+        
+        int gaps_in_frame_num_value_allowed_flag;
-}H264ParserContext;
-
@@ -334 +339 @@
-{
-        GetBitContext getbit, *gb = &getbit;
-        int profile_idc;
-        
-        init_get_bits(gb, buf, 8 * buf_size);
-
+context->
-    get_bits1(gb);              //constraint_set0_flag
-    get_bits1(gb);              //constraint_set1_flag
@@ -343 +347 @@
-    get_bits1(gb);              //constraint_set3_flag
-    get_bits(gb, 4);    //reserved
-
+context->level_idc = 
-        get_ue_golomb(gb);      //seq_parameter_set_id
-
+context->
-        {
-                context->chroma_format_idc = get_ue_golomb(gb);
@@ -373 +377 @@
-        }
-        get_ue_golomb(gb);      //num_ref_frames
-
+context->gaps_in_frame_num_value_allowed_flag = 
-        get_ue_golomb(gb);      //pic_width_in_mbs_minus1
-        get_ue_golomb(gb);      //pic_height_in_map_units_minus1
@@ -862 +866 @@
-}
-
+void ffusionLogDebugInfo(FFusionParserContext *parser, FILE *log)
+{
+        if (parser) {
+                if (parser->parserStructure == &ffusionH264Parser) {
+                        H264ParserContext *h264parser = parser->internalContext;
+                        
+                        Codecprintf(log, "H.264 format: profile %d level %d\n\tis_avc %d\n\tframe_mbs_only %d\n\tchroma_format_idc %d\n\tframe_num_gaps %d\n",
+                                                h264parser->profile_idc, h264parser->level_idc, h264parser->is_avc, h264parser->frame_mbs_only_flag, h264parser->chroma_format_idc, h264parser->gaps_in_frame_num_value_allowed_flag);
+                }
+        }
+}
+
-int ffusionIsParsedVideoDecodable(FFusionParserContext *parser)
-{

branches/perian-1.1/bitstream_info.h

@@ -43 +43 @@
-int ffusionParseExtraData(FFusionParserContext *parser, const uint8_t *buf, int buf_size);
-int ffusionParse(FFusionParserContext *parser, const uint8_t *buf, int buf_size, int *out_buf_size, int *type, int *skippable);
+void ffusionLogDebugInfo(FFusionParserContext *parser, FILE *log);
-int ffusionIsParsedVideoDecodable(FFusionParserContext *parser);
-