Changeset 1008

Timestamp:

01/01/09 22:18:05 (1 year ago)

Author:

gbooker

Message:

Added ability to force Perian's use with certain apps. This fixes iChat which seems to be incapable of conducting a complete codec search for some reason.
Added the ability to parse more of H.264's sps, in case it might be useful. Currently #ifed out as to not affect performance.

Files:

• trunk/CommonUtils.c (modified) (2 diffs)
• trunk/CommonUtils.h (modified) (1 diff)
• trunk/FFusionCodec.c (modified) (2 diffs)
• trunk/bitstream_info.c (modified) (4 diffs)
• trunk/bitstream_info.h (modified) (2 diffs)

trunk/CommonUtils.c

@@ -295 +295 @@
-};
-
+static const CFStringRef defaultForcedAppList[] = {
+        CFSTR("iChat"),
+};
+
-static int findNameInList(CFStringRef loadingApp, const CFStringRef *names, int count)
-{
@@ -308 +312 @@
-}
-
+static CFDictionaryRef getMyProcessInformation()
+{
+        ProcessSerialNumber myProcess;
+        GetCurrentProcess(&myProcess);
+        CFDictionaryRef processInformation;
+        
+        processInformation = ProcessInformationCopyDictionary(&myProcess, kProcessDictionaryIncludeAllInformationMask);
+        return processInformation;
+}
+
+static CFStringRef getProcessName(CFDictionaryRef processInformation)
+{
+        CFStringRef path = CFDictionaryGetValue(processInformation, kCFBundleExecutableKey);
+        CFRange entireRange = CFRangeMake(0, CFStringGetLength(path)), basename;
+        
+        CFStringFindWithOptions(path, CFSTR("/"), entireRange, kCFCompareBackwards, &basename);
+        
+        basename.location += 1; //advance past "/"
+        basename.length = entireRange.length - basename.location;
+        
+        CFStringRef myProcessName = CFStringCreateWithSubstring(NULL, path, basename);
+        return myProcessName;
+}
+
+static int isApplicationNameInList(CFStringRef prefOverride, const CFStringRef *defaultList, unsigned int defaultListCount)
+{
+        CFDictionaryRef processInformation = getMyProcessInformation();
+        
+        if (!processInformation)
+                return FALSE;
+        
+        CFArrayRef list = CFPreferencesCopyAppValue(prefOverride, CFSTR("org.perian.Perian"));
+        if(list && CFGetTypeID(list) != CFArrayGetTypeID())
+                list = NULL;
+        
+        CFStringRef myProcessName = getProcessName(processInformation);
+        int ret;
+        
+        if (list) {
+                int count = CFArrayGetCount(list);
+                CFStringRef names[count];
+                
+                CFArrayGetValues(list, CFRangeMake(0, count), (void *)names);
+                ret = findNameInList(myProcessName, names, count);
+                CFRelease(list);
+        } else {
+                ret = findNameInList(myProcessName, defaultList, defaultListCount);
+        }
+        CFRelease(myProcessName);
+        CFRelease(processInformation);
+        
+        return ret;
+}
+
-int IsFrameDroppingEnabled()
-{
-        static int enabled = -1;
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        return enabled;
-}
+
+int forcePerianToDecode()
+{
+        static int forced = -1;
+        
+        if(forced == -1)
+                forced = isApplicationNameInList(CFSTR("ForcePerianAppList"),
+                                                                                 defaultForcedAppList,
+                                                                                 sizeof(defaultForcedAppList)/sizeof(defaultForcedAppList[0]));
+        return forced;
+}

trunk/CommonUtils.h

@@ -40 +40 @@
-
-int IsFrameDroppingEnabled();
+int forcePerianToDecode();
-
-#ifdef __cplusplus

trunk/FFusionCodec.c

@@ -544 +544 @@
-}
-
+static inline int shouldDecode(FFusionGlobals glob, enum CodecID codecID)
+{
+        FFusionDecodeAbilities decode = FFUSION_PREFER_DECODE;
+        if (glob->componentType == 'avc1')
+                decode = ffusionIsParsedVideoDecodable(glob->begin.parser);
+        if(decode > FFUSION_CANNOT_DECODE && 
+           (codecID == CODEC_ID_H264 || codecID == CODEC_ID_MPEG4) && CFPreferencesGetAppBooleanValue(CFSTR("PreferAppleCodecs"), PERIAN_PREF_DOMAIN, NULL))
+                decode = FFUSION_PREFER_NOT_DECODE;
+        if(decode > FFUSION_CANNOT_DECODE)
+                if(forcePerianToDecode())
+                        decode = FFUSION_PREFER_DECODE;
+        return decode > FFUSION_PREFER_NOT_DECODE;
+}
+
-//-----------------------------------------------------------------
-// ImageCodecPreflight
@@ -813 +827 @@
-                        ffusionLogDebugInfo(glob->begin.parser, glob->fileLog);
-                
-
-
+
-                        err = featureUnsupported;
-                

trunk/bitstream_info.c

@@ -258 +258 @@
-        int log2_max_frame_num;
-        int frame_mbs_only_flag;
+        int num_reorder_frames;
-        int pic_order_present_flag;
-
@@ -337 +338 @@
-}
-
+static void skip_hrd_parameters(GetBitContext *gb)
+{
+        int cpb_cnt_minus1 = get_ue_golomb(gb);
+        get_bits(gb, 4);        //bit_rate_scale
+        get_bits(gb, 4);        //cpb_size_scale
+        int i;
+        for(i=0; i<=cpb_cnt_minus1; i++)
+        {
+                get_ue_golomb(gb);      //bit_rate_value_minus1[i]
+                get_ue_golomb(gb);      //cpb_size_value_minus1[i]
+                get_bits1(gb);          //cbr_flag[i]
+        }
+        get_bits(gb, 5);        //initial_cpb_removal_delay_length_minus1
+        get_bits(gb, 5);        //cpb_removal_delay_length_minus1
+        get_bits(gb, 5);        //dpb_output_delay_length_minus1
+        get_bits(gb, 5);        //time_offset_length
+}
+
-static void decode_sps(H264ParserContext *context, const uint8_t *buf, int buf_size)
-{
@@ -381 +400 @@
-        get_ue_golomb(gb);      //pic_width_in_mbs_minus1
-        get_ue_golomb(gb);      //pic_height_in_map_units_minus1
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -879 +969 @@
-}
-
-int
-
-1
+FFusionDecodeAbilities
+
+FFUSION_PREFER_DECODE
-        
-        if (parser->parserStructure == &ffusionH264Parser) {
-                H264ParserContext *h264parser = parser->internalContext;
-int no_decode = 0
+FFusionDecodeAbilities ret = FFUSION_PREFER_DECODE
-                
-                //QT is bad at high profile
-                //FIXME QT is also bad at B-pyramid (sps.vui.num_reorder_frames > 1)
-                //but to parse that we should just use ffh264 directly
-
+
+
-                
-                //PAFF/MBAFF
-                //ffmpeg is ok at this now but we can't test it (not enough AVCHD samples)
-                //and the quicktime api for it may or may not actually exist
-
+
+
-                
-                //4:2:2 chroma
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-#ifdef DEBUG_BUILD

trunk/bitstream_info.h

@@ -39 +39 @@
-} FFusionParser;
-
+typedef enum {
+        FFUSION_CANNOT_DECODE,
+        FFUSION_PREFER_NOT_DECODE,
+        FFUSION_PREFER_DECODE,
+} FFusionDecodeAbilities;
+
-void initFFusionParsers();
-FFusionParserContext *ffusionParserInit(int codec_id);
@@ -44 +50 @@
-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
+FFusionDecodeAbilities
-
-#ifdef __cplusplus