Changeset 923

Timestamp:

08/02/08 16:24:20 (4 months ago)

Author:

astrange

Message:

Merge trunk to the branch.
Disable ssse3 qpel stuff (https://roundup.mplayerhq.hu/roundup/ffmpeg/issue463)

Files:

• branches/perian-1.1 (modified) (1 prop)
• branches/perian-1.1/CPFPerianPrefPaneController.h (modified) (1 diff)
• branches/perian-1.1/CPFPerianPrefPaneController.m (modified) (7 diffs)
• branches/perian-1.1/CodecIDs.h (modified) (1 diff)
• branches/perian-1.1/FFissionCodec/FFissionCodec.r (modified) (1 diff)
• branches/perian-1.1/FFissionCodec/FFissionDecoder.cpp (modified) (1 diff)
• branches/perian-1.1/FFusionCodec.c (modified) (7 diffs)
• branches/perian-1.1/GBPerianPanePListGenerator.m (modified) (1 diff)
• branches/perian-1.1/Patches/ffmpeg-forceinline.diff (added)
• branches/perian-1.1/Patches/ffmpeg-h264dsp-crash.diff (moved) (moved from branches/perian-1.1/Patches/ffmpeg-h264dsp-chroma-mc4.diff) (5 diffs)
• branches/perian-1.1/Perian.xcodeproj/project.pbxproj (modified) (13 diffs)
• branches/perian-1.1/Release/Artwork/periandmgbg.png (modified) (previous)
• branches/perian-1.1/Release/Artwork/periandmgbg.psd (modified) (previous)
• branches/perian-1.1/Release/Artwork/periantranslations.rtf (modified) (2 diffs)
• branches/perian-1.1/Subtitles/SubATSUIRenderer.m (modified) (3 diffs)
• branches/perian-1.1/Subtitles/SubContext.h (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubContext.m (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubImport.mm (modified) (1 diff)
• branches/perian-1.1/Subtitles/SubUtilities.m (modified) (1 diff)
• branches/perian-1.1/Update Checker Sources/NSString+extras.m (modified) (1 diff)
• branches/perian-1.1/Update Checker Sources/UpdateCheckerAppDelegate.h (modified) (1 diff)
• branches/perian-1.1/Update Checker Sources/UpdateCheckerAppDelegate.m (modified) (4 diffs)
• branches/perian-1.1/Update Checker Sources/main.m (modified) (2 diffs)
• branches/perian-1.1/createStaticLibs.sh (modified) (4 diffs)
• branches/perian-1.1/ff_MovieImport.c (modified) (1 diff)
• branches/perian-1.1/ff_private.c (modified) (3 diffs)
• trunk/PerianPrefPane.nib/info.nib (modified) (1 diff)
• trunk/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)

branches/perian-1.1/CPFPerianPrefPaneController.h

@@ -56 +56 @@
-        IBOutlet NSButton                                       *button_install;
-        IBOutlet NSTextField                            *textField_installStatus;
-        IBOutlet NSProgressIndicator            *progress_install;
-        
-        IBOutlet NSTextField                            *textField_currentVersion;
+        IBOutlet NSTextField                            *textField_updateStatus;
-        IBOutlet NSButton                                       *button_updateCheck;
-        IBOutlet NSProgressIndicator            *progress_updateCheck;
-        IBOutlet NSButton                                       *button_autoUpdateCheck;
-        

branches/perian-1.1/CPFPerianPrefPaneController.m

@@ -403 +403 @@
-
-- (void) dealloc {
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
-        [perianForumURL release];
-        [perianDonateURL release];
@@ -657 +658 @@
-                auth = nil;
-        
-        int tag = 0;
-        componentPath = [[self quickTimeComponentDir:userInstalled] stringByAppendingPathComponent:@"Perian.component"];
-        if(auth != nil && !userInstalled)
@@ -688 +688 @@
-- (IBAction)installUninstall:(id)sender
-{
-        [progress_install startAnimation:sender];
-        if(installStatus == InstallStatusInstalled)
-                [NSThread detachNewThreadSelector:@selector(uninstall:) toTarget:self withObject:nil];
@@ -697 +696 @@
-- (void)installComplete:(id)sender
-{
-        [progress_install stopAnimation:sender];
-        [self checkForInstallation];
-}
@@ -779 +777 @@
-
-#pragma mark Check Updates
+- (void)updateCheckStatusChanged:(NSNotification*)notification
+{
+        NSString *status = [notification object];
+        
+        //FIXME localize these
+        if ([status isEqualToString:@"Starting"]) {
+                [textField_updateStatus setStringValue:@"Checking..."];
+        } else if ([status isEqualToString:@"Error"]) {
+                [textField_updateStatus setStringValue:@"Couldn't reach the update server."];
+        } else if ([status isEqualToString:@"NoUpdates"]) {
+                [textField_updateStatus setStringValue:@"There are no updates."];
+        } else if ([status isEqualToString:@"NoUpdates"]) {
+                [textField_updateStatus setStringValue:@"Updates found!"];
+        }
+}
+
-- (IBAction)updateCheck:(id)sender 
-{
-        FSRef updateCheckRef;
-        
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(updateCheckStatusChanged:) name:UPDATE_STATUS_NOTIFICATION object:nil];
-        CFPreferencesSetAppValue((CFStringRef)NEXT_RUN_KEY, NULL, perianAppID);
-        CFPreferencesSetAppValue((CFStringRef)MANUAL_RUN_KEY, [NSNumber numberWithBool:YES], perianAppID);
@@ -800 +816 @@
-        else
-                CFPreferencesSetAppValue(key, [NSDate distantFuture], perianAppID);
+    
+    CFPreferencesAppSynchronize(perianAppID);
-} 
-
@@ -901 +919 @@
-{       
-        [self setKey:ExternalSubtitlesKey forAppID:perianAppID fromBool:(BOOL)[sender state]];
+    CFPreferencesAppSynchronize(perianAppID);
-}
-

branches/perian-1.1/CodecIDs.h

@@ -93 +93 @@
-        kAudioFormatRealLossless                = 'RALF',
-        kAudioFormatRealAtrac3                  = 'ATRC',
+        kAudioFormatNellymoser                                  = 'NELL',
-        
-        kSubFormatUTF8                          = 'SRT ',

branches/perian-1.1/FFissionCodec/FFissionCodec.r

@@ -98 +98 @@
-#define kComponentInfo                                  "An AudioCodec that decodes DCA Audio into linear PCM"
-#include "XCAResources.r"
+
+#define kPrimaryResourceID                              146
+#define kComponentType                                  'adec'
+#define kComponentSubtype                               kAudioFormatNellymoser
+#define kComponentName                                  "Nellymoser ASAO"
+#define kComponentInfo                                  "An AudioCodec that decodes Nellymoser ASAO into linear PCM"
+#include "XCAResources.r"

branches/perian-1.1/FFissionCodec/FFissionDecoder.cpp

@@ -48 +48 @@
-        { kAudioFormatTTA, CODEC_ID_TTA },
-        { kAudioFormatDTS, CODEC_ID_DTS },
+        { kAudioFormatNellymoser, CODEC_ID_NELLYMOSER },
-        { 0, CODEC_ID_NONE }
-};

branches/perian-1.1/FFusionCodec.c

@@ -162 +162 @@
-
-extern void init_FFmpeg();
-Get
+Copy
-
-#define FFusionDebugPrint(x...) if (glob->fileLog) Codecprintf(glob->fileLog, x);
@@ -194 +194 @@
-}
-
+Boolean FFusionAlreadyRanUpdateCheck = 0;
+
-void FFusionRunUpdateCheck()
-{
+        if (FFusionAlreadyRanUpdateCheck) return;
+
-    CFDateRef lastRunDate = CFPreferencesCopyAppValue(CFSTR("NextRunDate"), CFSTR("org.perian.Perian"));
-    CFAbsoluteTime now = CFAbsoluteTimeGetCurrent();
-    
-
-
-
-
-
+
+
+
+
+
+
+
-    
-    //Two places to check, home dir and /
-    
-Get
+Copy
-    CFStringAppend(location, CFSTR("/Library/PreferencePanes/Perian.prefPane/Contents/Resources/PerianUpdateChecker.app"));
-    
@@ -522 +528 @@
-        Handle imgDescExt;
-        OSErr err = noErr;
+        enum PixelFormat pixelFormat = PIX_FMT_NONE;
-        
-    // We first open libavcodec library and the codec corresponding
@@ -771 +778 @@
-                        err = featureUnsupported;
-                
+                // this format doesn't have enough information in its headers
+                // we have to decode the first frame
+                if (glob->avContext->pix_fmt == PIX_FMT_NONE && p->bufferSize) {
+                        AVFrame temp;
+                        int got_picture;
+                        avcodec_open(glob->avContext, glob->avCodec);
+                        avcodec_decode_video(glob->avContext, &temp, 
+                                                                 &got_picture, (UInt8*)p->data, p->bufferSize);
+                        
+                        avcodec_close(glob->avContext);
+                        pixelFormat = glob->avContext->pix_fmt;
+                }
+                
-                // some hooks into ffmpeg's buffer allocation to get frames in 
-                // decode order without delay more easily
@@ -789 +809 @@
-        }
-                
+                if (pixelFormat == PIX_FMT_NONE)
+                        pixelFormat = glob->avContext->pix_fmt;
-    }
-    
@@ -827 +849 @@
-        
-        if (!err) {
-glob->avContext->pix_fm
+pixelForma
-        {
-                case PIX_FMT_BGR24:
@@ -1701 +1723 @@
-        {            
-            got_picture = 0;
-            len = 1;
-                        Codecprintf(glob->fileLog, "Error while decoding frame\n");
-            

branches/perian-1.1/GBPerianPanePListGenerator.m

@@ -53 +53 @@
-        [plist setObject:components forKey:ComponentInfoDictionaryKey];
-        [plist writeToFile:[NSString stringWithUTF8String:argv[3]] atomically:YES];
+    [plist release];
-        [pool release];
-        

branches/perian-1.1/Patches/ffmpeg-h264dsp-crash.diff

@@ -1 +1 @@
-Index: ffmpeg/libavcodec/i386/dsputil_h264_template_mmx.c
-===================================================================
-3183
+4508
-+++ ffmpeg/libavcodec/i386/dsputil_h264_template_mmx.c  (working copy)
-@@ -185,8 +185,12 @@
@@ -16 +16 @@
-         "pxor   %%mm7, %%mm7        \n\t"
-         "movd %5, %%mm2             \n\t"
+Index: ffmpeg/libavcodec/i386/dsputil_mmx.c
+===================================================================
+--- ffmpeg/libavcodec/i386/dsputil_mmx.c        (revision 14508)
++++ ffmpeg/libavcodec/i386/dsputil_mmx.c        (working copy)
+@@ -2626,6 +2626,8 @@
+             H264_QPEL_FUNCS(3, 2, sse2);
+             H264_QPEL_FUNCS(3, 3, sse2);
+         }
++#undef  H264_QPEL_FUNCS
++#define H264_QPEL_FUNCS(x, y, CPU) 
+ #ifdef HAVE_SSSE3
+         if(mm_flags & MM_SSSE3){
+             H264_QPEL_FUNCS(1, 0, ssse3);
-Index: ffmpeg/libavcodec/i386/h264dsp_mmx.c
-===================================================================
-3183
+4508
-+++ ffmpeg/libavcodec/i386/h264dsp_mmx.c        (working copy)
-12,6 +191
+22,6 +192
- #define H264_CHROMA_OP4(S,D,T)
- #define H264_CHROMA_MC8_TMPL put_h264_chroma_mc8_mmx
@@ -28 +41 @@
- #define H264_CHROMA_MC8_MV0 put_pixels8_mmx
- #include "dsputil_h264_template_mmx.c"
-29,6 +193
+39,6 +194
- #undef H264_CHROMA_OP4
- #undef H264_CHROMA_MC8_TMPL
@@ -36 +49 @@
- #undef H264_CHROMA_MC8_MV0
- 
-37,6 +193
+47,6 +194
-                                "pavgb " #T ", " #D " \n\t"
- #define H264_CHROMA_MC8_TMPL avg_h264_chroma_mc8_mmx2
@@ -46 +59 @@
-Index: ffmpeg/libavcodec/dsputil.c
-===================================================================
-3183
+4508
-+++ ffmpeg/libavcodec/dsputil.c (working copy)
-@@ -1592,7 +1592,7 @@

branches/perian-1.1/Perian.xcodeproj/project.pbxproj

@@ -48 +48 @@
-                        buildConfigurationList = F5CFD2EA0B5012E800616865 /* Build configuration list for PBXAggregateTarget "A52Codec" */;
-                        buildPhases = (
+                                3D79C0540DFBA1FF00EEFE22 /* ShellScript */,
-                                F5CFD2E00B5012BC00616865 /* CopyFiles */,
-                                F5CFD2E30B5012DB00616865 /* CopyFiles */,
@@ -111 +112 @@
-                3D41BEB40BCD3B510069E7C2 /* libuniversaldetector.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D41BE9A0BCD3B330069E7C2 /* libuniversaldetector.a */; };
-                3D4A7A990B5533BC004C5D6A /* ColorConversions.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D4A7A980B5533BC004C5D6A /* ColorConversions.c */; settings = {COMPILER_FLAGS = "-O3 -fweb -fno-reorder-blocks -fomit-frame-pointer"; }; };
-
+
+
-                3DB2BB290B6C92F000416863 /* SubATSUIRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB2BB280B6C92F000416863 /* SubATSUIRenderer.m */; };
-                6116E5510B43C27B0020F1CE /* ACBaseCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */; };
@@ -453 +455 @@
-                1162A0530B51ECE1006591C8 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
-                116C42520B5041BD00FB0738 /* PerianUpdateChecker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerianUpdateChecker.app; sourceTree = BUILT_PRODUCTS_DIR; };
-
+plist.
-                116C42650B50426700FB0738 /* UpdateCheckerAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateCheckerAppDelegate.h; sourceTree = "<group>"; };
-                116C42660B50426700FB0738 /* UpdateCheckerAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpdateCheckerAppDelegate.m; sourceTree = "<group>"; };
@@ -469 +471 @@
-                1184A38B0B505A9800C8452A /* SUStatusController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUStatusController.h; sourceTree = "<group>"; };
-                1184A38C0B505A9800C8452A /* SUStatusController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUStatusController.m; sourceTree = "<group>"; };
-
+plist.
-                11A70AC10A3D0105002058D4 /* Perian.component */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Perian.component; sourceTree = BUILT_PRODUCTS_DIR; };
-                11BEFB2C0C18E23E00BC9324 /* Read Me.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "Read Me.rtf"; path = "Release/Read Me.rtf"; sourceTree = "<group>"; };
@@ -496 +498 @@
-                3D4A7A970B5533BC004C5D6A /* ColorConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorConversions.h; sourceTree = "<group>"; };
-                3D4A7A980B5533BC004C5D6A /* ColorConversions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ColorConversions.c; sourceTree = "<group>"; };
+                3D95B9000E208965007C8F51 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = /usr/lib/libbz2.dylib; sourceTree = "<absolute>"; };
-                3DB2BB270B6C92F000416863 /* SubATSUIRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubATSUIRenderer.h; path = Subtitles/SubATSUIRenderer.h; sourceTree = "<group>"; };
-                3DB2BB280B6C92F000416863 /* SubATSUIRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SubATSUIRenderer.m; path = Subtitles/SubATSUIRenderer.m; sourceTree = "<group>"; };
@@ -655 +658 @@
-                61FD41320B4F6F0800BEEFEA /* MatroskaImportPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MatroskaImportPrivate.cpp; sourceTree = "<group>"; };
-                83D1D6C80B4C794700E09EC9 /* Perian.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Perian.prefPane; sourceTree = BUILT_PRODUCTS_DIR; };
-
+plist.
-                83D1D6CE0B4C7AC400E09EC9 /* PreferencePanes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PreferencePanes.framework; path = /System/Library/Frameworks/PreferencePanes.framework; sourceTree = "<absolute>"; };
-                83D1D6DD0B4C7F8300E09EC9 /* PerianPrefPane.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = PerianPrefPane.nib; sourceTree = "<group>"; };
@@ -710 +713 @@
-                                3D211A1D0B6B18880051299D /* Foundation.framework in Frameworks */,
-                                3D41BEB40BCD3B510069E7C2 /* libuniversaldetector.a in Frameworks */,
+                                3D95B9020E20896F007C8F51 /* libbz2.dylib in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -734 +738 @@
-                                F53E18E50B4F483C003A0471 /* Security.framework in Frameworks */,
-                                F57755F50B51EB1800C7D833 /* CoreFoundation.framework in Frameworks */,
+                                3D95B9010E208965007C8F51 /* libbz2.dylib in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -766 +771 @@
-                        isa = PBXGroup;
-                        children = (
+                                3D95B9000E208965007C8F51 /* libbz2.dylib */,
-                                F539CD110B62BC82005A72C9 /* Foundation.framework */,
-                                1162A0530B51ECE1006591C8 /* WebKit.framework */,
@@ -1539 +1545 @@
-                        shellScript = "# Xcode auto-versioning script for Subversion\n# by Axel Andersson, modified by Daniel Jalkut to add\n# \"--revision HEAD\" to the svn info line, which allows\n# the latest revision to always be used.\n\n# further modified by Augie Fackler to be gross and sh-based in places\n# so that you can have svn installed anywhere\nPATH=$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin\nffmpeg_rev=`cat \"$SYMROOT/Universal/buildid\"`\nREV=`svnversion -n ./`\necho $REV\n\necho | perl <<EOF\nuse strict;\ndie \"\\$0: Must be run from Xcode\" unless \\$ENV{\"BUILT_PRODUCTS_DIR\"};\n\nmy \\$INFO = \"\\$ENV{BUILT_PRODUCTS_DIR}/\\$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n\nmy \\$version = \"$REV\";\n\n# (Match the last group of digits and optional letter M/S):\n\n# ugly yet functional (barely) regex by Daniel Jalkut:\n#$version =~ s/([\\d]*:)(\\d+[M|S]*).*/$2/;\n\n# better yet still functional regex via Kevin \"Regex Nerd\" Ballard\n(\\$version =~ m/\\d+[MS]*\\$/) && (\\$version = \\$&);\n\nopen(FH, \"\\$INFO\") or die \"\\$0: \\$INFO: $!\";\nmy \\$info = join(\"\", <FH>);\nclose(FH);\n\n#\\$info =~ s/([\\t ]+<key>CFBundleVersion<\\/key>\\n[\\t ]+<string>).*?(<\\/string>)/\\$1\\$version\\$2/;\n\\$info =~ s/SVNREVISION/\\$version/;\n\\$info =~ s/FFMPEGREVISION/$ffmpeg_rev/;\n\nopen(FH, \">\\$INFO\") or die \"\\$0: \\$INFO: \\$!\";\nprint FH \\$info;\nclose(FH);\nEOF\n";
-                };
+                3D79C0540DFBA1FF00EEFE22 /* ShellScript */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                        );
+                        outputPaths = (
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /bin/sh;
+                        shellScript = "pushd a52codec/build\nln -s Deployment+Debug Development || true\nln -s Development Deployment || true\nln -s Deployment Deployment+Debug || true\npopd";
+                };
-                F535FCD50B4D605900F00D14 /* ShellScript */ = {
-                        isa = PBXShellScriptBuildPhase;
@@ -1629 +1648 @@
-                                3D211A230B6B1A660051299D /* SubUtilities.m in Sources */,
-                                3DB2BB290B6C92F000416863 /* SubATSUIRenderer.m in Sources */,
-                                3DAD32DA0B6DB26100DA0A72 /* StdIOCallback.cpp in Sources */,
-                                6156986F0BCDA87700E17ADE /* ringbuffer.cpp in Sources */,
-                                F57676060BE1A18300B2434B /* FrameBuffer.c in Sources */,
@@ -1867 +1885 @@
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-                                GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD;
-                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                                GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
@@ -1955 +1972 @@
-                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_MODEL_TUNING = G5;
+                                GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD;
-                                OTHER_LDFLAGS = (
-                                        "-read_only_relocs",

branches/perian-1.1/Release/Artwork/periantranslations.rtf

@@ -1 @@
-mac\ansicpg10000\cocoartf824\cocoasubrtf42
-77 LucidaGrande;\f1\fnil\fcharset102 STHeiti;\f2\fnil\fcharset7
+ansi\ansicpg1252\cocoartf949\cocoasubrtf33
+0 LucidaGrande;\f1\fnil\fcharset134 STHeiti;\f2\fnil\fcharset12
-}
-{\colortbl;\red255\green255\blue255;}
@@ -8 +8 @@
-\f0\fs26 \cf0 Double-click Perian.prefPane to begin\
-Dubbelklik op Perian.prefPane om te beginnen\
- sur le Perian.prefPane \'88
+z sur Perian.prefPane pour
-Doppelklick auf Perian.prefPane um zu beginnen\
-Doppio clica su Perian.prefPane per cominciare\
-Haga doble clic Perian.prefPane para empezar\
-90 um clique duplo Perian.prefpane come\'8d
+ea um clique duplo Perian.prefpane come\'e7
-
-
-
-
+\b
+\b0
+\b
-
-
+\b0
-
-\f2 \'8e\'6e\'82\'df\'82\'e9\'82\'c9\'82\'cd

branches/perian-1.1/Subtitles/SubATSUIRenderer.m

@@ -350 +350 @@
--(void*)completedStyleParsing:(SubStyle*)s
-{
-
-
-
-
+
+
+
+
+
+
-        ATSFontRef fontRef = font;
-        ATSStyleRenderingOptions opt = kATSStyleApplyAntiAliasing;
@@ -360 +362 @@
-        ATSUStyle style;
-                
-
+, &vertical
-        
-        if (!s->platformSizeScale) s->platformSizeScale = GetWinFontSizeScale(fontRef);
@@ -462 +464 @@
-                        sv();
-                        {
+                                ATSUVerticalCharacterType vertical = ParseFontVerticality(&sval) ? kATSUStronglyVertical : kATSUStronglyHorizontal;
-                                ATSUFontID font = GetFontIDForSSAName(sval);
-                                
-
+
+
+
+
-                        }
-                        break;

branches/perian-1.1/Subtitles/SubContext.h

@@ -55 +55 @@
-
-extern UInt8 SSA2ASSAlignment(UInt8 a);
-
+extern 
-extern SubRGBAColor ParseSSAColor(unsigned rgb);
+extern BOOL ParseFontVerticality(NSString **fontname);

branches/perian-1.1/Subtitles/SubContext.m

@@ -62 +62 @@
-                case 3: case 6: case 9: *alignH = kSubAlignmentRight; break;
-        }
+}
+
+BOOL ParseFontVerticality(NSString **fontname)
+{
+        if ([*fontname characterAtIndex:0] == '@') {
+                *fontname = [*fontname substringFromIndex:1];
+                return YES;
+        }
+        return NO;
-}
-

branches/perian-1.1/Subtitles/SubImport.mm

@@ -1046 +1046 @@
-{
-        priv = [[SubSerializer alloc] init];
+    CFRetain(priv);
-}
-
-CXXSubSerializer::~CXXSubSerializer()
-{
-
+CFRelease(priv); 
-}
-

branches/perian-1.1/Subtitles/SubUtilities.m

@@ -141 +141 @@
-}
-
-Get
+Copy
-{
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

branches/perian-1.1/Update Checker Sources/NSString+extras.m

@@ -81 +81 @@
-        
-        [componentsCopy removeObjectsInRange: NSMakeRange (ix, len - ix)];
+    [componentsCopy autorelease];
-
-        return [componentsCopy componentsJoinedByString: @" "];

branches/perian-1.1/Update Checker Sources/UpdateCheckerAppDelegate.h

@@ -18 +18 @@
-#define UPDATE_URL_KEY @"UpdateFeedURL"
-#define SKIPPED_VERSION_KEY @"SkippedVersion"
+#define UPDATE_STATUS_NOTIFICATION @"org.perian.UpdateCheckStatus"
-#define TIME_INTERVAL_TIL_NEXT_RUN 7*24*60*60
-

branches/perian-1.1/Update Checker Sources/UpdateCheckerAppDelegate.m

@@ -35 +35 @@
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        lastRunDate = [[defaults objectForKey:NEXT_RUN_KEY] retain];
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -56 +52 @@
-        updateUrlString = [[updateUrlString substringToIndex:[updateUrlString length]-4] stringByAppendingFormat:@"-%@.xml", betaAppcastUrl];
-#endif
+        if(manualRun)
+                [[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"Starting"];
-        
-        SUAppcast *appcast = [[SUAppcast alloc] init];
@@ -81 +79 @@
-    NSString *panePath = [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByDeletingLastPathComponent] stringByDeletingLastPathComponent];
-        updateAvailable = (updateAvailable && (SUStandardVersionComparison([latest fileVersion], [[NSBundle bundleWithPath:panePath] objectForInfoDictionaryKey:@"CFBundleVersion"]) == NSOrderedAscending));
+        
+        if (![panePath isEqualToString:@"Perian.prefPane"]) {
+                NSLog(@"The update checker needs to be run from inside the preference pane, quitting...");
+                updateAvailable = 0;
+        }
+        
-        NSString *skippedVersion = [[NSUserDefaults standardUserDefaults] objectForKey:SKIPPED_VERSION_KEY];
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        if (updateAvailable && (!skippedVersion || 
-                (skippedVersion && ![skippedVersion isEqualToString:[latest versionString]]))) {
+                if(manualRun)
+                        [[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"YesUpdates"];
-                [self showUpdatePanelForItem:latest];
-        } else {
-                if(manualRun)
-NSRunAlertPanel(SULocalizedString(@"No Update Found!", nil), SULocalizedString(@"Your copy of Perian is up to date", nil), nil, nil, nil)
+[[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"NoUpdates"]
-                [[NSApplication sharedApplication] terminate:self];
-        }
+    
+    [appcast release];
-}
-
@@ -97 +105 @@
-        [self updateFailed];
-        if(manualRun)
-
+
+
-        [[NSApplication sharedApplication] terminate:self];     
-}

branches/perian-1.1/Update Checker Sources/main.m

@@ -13 +13 @@
-#define lockPath "/tmp/PerianUpdateLock"
-
+static int fp = -1;
+
+static void deleteLock()
+{
+        close(fp);
+        unlink(lockPath);
+}
+
-int main(int argc, char *argv[])
-{
-int 
-
+
+=
-        {
-                struct stat lockfile;
@@ -31 +39 @@
-        if(fp == -1)
-                return 0;
+        
+        atexit(deleteLock);
-
-        int ret = NSApplicationMain(argc,  (const char **) argv);
-        
-        unlink(lockPath);
-        
-        return ret;
-}

branches/perian-1.1/createStaticLibs.sh

@@ -27 +27 @@
-    generalConfigureOptions="$generalConfigureOptions --disable-decoder=cavs --disable-decoder=vc1 --disable-decoder=wmv3 --disable-mmx --enable-shared"
-fi 
-
+
+
+
+
+
+
-export sdkflags
-
@@ -68 +73 @@
-fi
-
-
+
+
-touch ffmpeg/patched
-
@@ -106 +112 @@
-        if [ "$oldbuildid_ffmpeg" != "quick" ] ; then
-            if [ `arch` = ppc ] ; then
-
+cc=$CC --
-            else
-extra-cflags='$sdkflags $optCFlags'
+cc=$CC --extra-cflags="$sdkflags $optCFlags"
-            fi
-        
@@ -136 +142 @@
-        if [ "$oldbuildid_ffmpeg" != "quick" ] ; then
-            if [ `arch` = ppc ] ; then
-extra-cflags='-faltivec $sdkflags $optCFlags'
+cc=$CC --extra-cflags="-faltivec $sdkflags $optCFlags"
-            else
-
+cc=$CC --
-            fi
-        

branches/perian-1.1/ff_MovieImport.c

@@ -118 +118 @@
-                REGISTER_DECODER(tta);
-                REGISTER_DECODER(dca);
+                REGISTER_DECODER(nellymoser);
-                
-                REGISTER_DECODER(dvdsub);

branches/perian-1.1/ff_private.c

@@ -169 +169 @@
-        (*imgHdl)->idSize = sizeof(ImageDescription);
-        
-codec->codec_tag
+!((*imgHdl)->cType = map_video_codec_to_mov_tag(codec->codec_id))
-                (*imgHdl)->cType = BSWAP(codec->codec_tag);
-        else
-                // need to lookup the fourcc from the codec_id
-                (*imgHdl)->cType = map_video_codec_to_mov_tag(codec->codec_id);
-//      FourCCprintf("fourcc: ", (*imgHdl)->cType);
-        
@@ -389 +386 @@
-                case CODEC_ID_TTA:
-                        asbd->mFormatID = kAudioFormatTTA;
+                        break;
+                case CODEC_ID_NELLYMOSER:
+                        asbd->mFormatID = kAudioFormatNellymoser;
-                        break;
-                default:
@@ -1137 +1137 @@
-                
-                if(err == noErr)
-err = 
+
-                
-                err = QTDisposeAtomContainer(container);