Changeset 374

Timestamp:

03/21/07 20:43:14 (2 years ago)

Author:

astrange

Message:

Enable Codecprintf for Deployment+Debug, and remove most of its uses.

Files:

• trunk/FFusionCodec.c (modified) (3 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (5 diffs)
• trunk/SSADocument.m (modified) (3 diffs)
• trunk/SubImport.mm (modified) (3 diffs)
• trunk/ff_private.c (modified) (1 diff)

trunk/FFusionCodec.c

@@ -166 +166 @@
-    GetComponentInfo((Component)self, &descout, 0, 0, 0);
-        
-
+//
-        
-    // Allocate memory for our globals, set them up and inform the component manager that we've done so
@@ -204 +204 @@
-            if (bitfield >= 0x1010)
-            {
-
+//
-                glob->hasy420 = 1;
-            }
@@ -210 +210 @@
-        else
-        {
-
+//
-        }
-                

trunk/Perian.xcodeproj/project.pbxproj

@@ -365 +365 @@
-                        containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
-                        proxyType = 1;
- /* PerianUpdateChecker */
+
-                        remoteInfo = PerianUpdateChecker;
-                };
@@ -632 +632 @@
-                F560DF0203D622D001ABA332 /* FFusionCodec.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = FFusionCodec.r; sourceTree = "<group>"; };
-                F57755F40B51EB1800C7D833 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0
+includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"
-                F5CFD1BC0B5000CE00616865 /* GBPerianPanePListGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBPerianPanePListGenerator.h; sourceTree = "<group>"; };
-                F5CFD1BD0B5000CE00616865 /* GBPerianPanePListGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBPerianPanePListGenerator.m; sourceTree = "<group>"; };
@@ -1113 +1113 @@
-                                F5CFD2D60B5012A100616865 /* A52Codec.component */,
-                                F5CFD2D80B5012A100616865 /* AC3MovieImport.component */,
-A52
+
-                        );
-                        name = Products;
@@ -1355 +1355 @@
-                        sourceTree = BUILT_PRODUCTS_DIR;
-                };
-A52
+
-                        isa = PBXReferenceProxy;
-                        fileType = wrapper.application;
-A52
+
-                        remoteRef = F5CFD2D90B5012A100616865 /* PBXContainerItemProxy */;
-                        sourceTree = BUILT_PRODUCTS_DIR;
@@ -2268 +2268 @@
-                                DEBUG_INFORMATION_FORMAT = dwarf;
-                                GCC_MODEL_TUNING = G5;
+                                GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD;
-                                STRIP_INSTALLED_PRODUCT = NO;
-                        };

trunk/SSADocument.m

@@ -22 +22 @@
-#import "Categories.h"
-#include "SubImport.h"
+#include "Codecprintf.h"
-
-@implementation SSADocument
@@ -397 +398 @@
-        
-        if (![nextLine isEqualToString:@"[Script Info]"]) {
-NSLog(@"\"%@\" is not a valid SSA header?",nextLine
+Codecprintf(stderr,"The line \"%s\" isn't a valid SSA header\n",[nextLine UTF8String]
-                return;
-        }
@@ -548 +549 @@
-
-                err=AddMediaSample(theMedia,sampleHndl,0,sampleLen, p->end_time - p->begin_time,(SampleDescriptionHandle)textDesc, 1, 0, &sampleTime);
-NSLog(@"external SSA: error %d adding %d-%d line
+Codecprintf(stderr,"external SSA: error %d adding %d-%d line\n
-                
-                ConvertTimeScale(&movieStartTime, movieTimeScale);

trunk/SubImport.mm

@@ -317 +317 @@
-                                {
-                                err = LoadSubRipSubtitles(&parentDir, cfFoundFilename, theMovie, &firstSubTrack);
-                                if (err) NSLog(@"Perian: loading .srt, error %d",err);
-                                goto bail;
-                                }
@@ -326 +325 @@
-                        {
-                                err = LoadSubStationAlphaSubtitles(&parentDir, cfFoundFilename, theMovie, &firstSubTrack);
-                                if (err) NSLog(@"Perian: loading .ass, error %d",err);
-                                goto bail;
-                        }
@@ -334 +332 @@
-                        {
-                                err = LoadSubStationAlphaSubtitles(&parentDir, cfFoundFilename, theMovie, &firstSubTrack);
-                                if (err) NSLog(@"Perian: loading .ssa, error %d",err);
-                                goto bail;
-                        }                       

trunk/ff_private.c

@@ -156 +156 @@
-                // need to lookup the fourcc from the codec_id
-                (*imgHdl)->cType = map_video_codec_to_mov_tag(codec->codec_id);
-
+//
-        
-        (*imgHdl)->temporalQuality = codecMaxQuality;