Changeset 806

Timestamp:

02/09/08 13:55:44 (6 months ago)

Author:

astrange

Message:

Merge 1.1 to trunk. If you're switching, delete ffmpeg/ first!
I haven't merged the nib changes, so the component manager is missing again.

Files:

• branches/perian-1.1/PerianPrefPane.nib/info.nib (modified) (1 diff)
• branches/perian-1.1/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)
• trunk/CAPublicUtility/CAStreamBasicDescription.cpp (modified) (2 diffs)
• trunk/CommonUtils.c (modified) (1 diff)
• trunk/FFusionCodec.c (modified) (15 diffs)
• trunk/FFusionCodec.h (modified) (1 diff)
• trunk/FrameBuffer.c (modified) (1 diff)
• trunk/MatroskaCodecIDs.cpp (modified) (5 diffs)
• trunk/MatroskaImport.cpp (modified) (3 diffs)
• trunk/MatroskaImportPrivate.cpp (modified) (2 diffs)
• trunk/MatroskaImportVersion.h (modified) (1 diff)
• trunk/Patches (added)
• trunk/Patches/ffmpeg.diff (added)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (17 diffs)
• trunk/PerianAviImporter.r (modified) (1 diff)
• trunk/Perian_icon.icns (modified) (previous)
• trunk/Plists/Perian-Info.plist (modified) (2 diffs)
• trunk/Plists/PerianPane-Info.plist (modified) (1 diff)
• trunk/Plists/PerianUpdateChecker-Info.plist (modified) (1 diff)
• trunk/Release/Artwork/periandmgbg.png (modified) (previous)
• trunk/Release/Artwork/periandmgbg.psd (modified) (previous)
• trunk/Release/Changes.txt (modified) (1 diff)
• trunk/Release/Makefile (modified) (1 diff)
• trunk/Release/Read Me.rtf (modified) (4 diffs)
• trunk/Release/dmg_perian.scpt (modified) (previous)
• trunk/Subtitles/SubATSUIRenderer.m (modified) (13 diffs)
• trunk/Subtitles/SubContext.h (modified) (1 diff)
• trunk/Subtitles/SubContext.m (modified) (6 diffs)
• trunk/Subtitles/SubImport.h (modified) (4 diffs)
• trunk/Subtitles/SubImport.mm (modified) (2 diffs)
• trunk/Subtitles/SubParsing.h (modified) (1 diff)
• trunk/Subtitles/SubParsing.m.rl (modified) (1 diff)
• trunk/Subtitles/SubRenderer.h (modified) (1 diff)
• trunk/TextSubCodec.c (modified) (3 diffs)
• trunk/TextSubCodec.r (modified) (1 diff)
• trunk/UniversalDetector/UniversalDetector.xcodeproj/project.pbxproj (modified) (1 diff)
• trunk/VobSubCodec.r (modified) (1 diff)
• trunk/bitstream_info.c (modified) (9 diffs)
• trunk/bitstream_info.h (modified) (1 diff)
• trunk/createStaticLibs.sh (modified) (1 diff)
• trunk/ff_MovieImport.c (modified) (9 diffs)
• trunk/ff_MovieImportVersion.h (modified) (1 diff)
• trunk/ff_dataref.c (modified) (2 diffs)
• trunk/ff_private.c (modified) (2 diffs)
• trunk/ff_private.h (modified) (1 diff)
• trunk/ffmpeg-patch (modified) (21 diffs)

branches/perian-1.1/PerianPrefPane.nib/info.nib

@@ -9 +9 @@
-        <key>IBOpenObjects</key>
-        <array>
-32
+5
-        </array>
-        <key>IBSystem Version</key>

trunk/CAPublicUtility/CAStreamBasicDescription.cpp

@@ -50 +50 @@
-        #include <Endian.h>
-#endif
+
+#import "CodecIDs.h"
-
-const AudioStreamBasicDescription       CAStreamBasicDescription::sEmpty = { 0.0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -272 +274 @@
-                
-                case kAudioFormatAC3:
+                case kAudioFormatAC3MS:
-                        strcpy(outName, "AC-3");
-                        break;

trunk/CommonUtils.c

@@ -70 +70 @@
-        { "he", "heb", langHebrew },
-        { "hi", "hin", langHindi },
-",   "hm
+hu", "hu
-        { "is", "ice", langIcelandic },
-        { "is", "isl", langIcelandic },

trunk/FFusionCodec.c

@@ -41 +41 @@
-#include "FrameBuffer.h"
-#include "CommonUtils.h"
+#include "pthread.h"
-
-void inline swapFrame(AVFrame * *a, AVFrame * *b)
@@ -164 +165 @@
-#include <QuickTime/ComponentDispatchHelper.c>
-
+void *launchUpdateChecker(void *args)
+{
+        FSRef *ref = (FSRef *)args;
+    LSOpenFSRef(ref, NULL);
+        free(ref);
+        return NULL;
+}
+
-void FFusionRunUpdateCheck()
-{
@@ -181 +190 @@
-    
-    char fileRep[1024];
-updateCheckRef
+*updateCheckRef = malloc(sizeof(FSRef))
-    Boolean doCheck = FALSE;
-    
-    if(CFStringGetFileSystemRepresentation(location, fileRep, 1024))
-&
+
-            doCheck = TRUE;
-    
@@ -193 +202 @@
-        CFStringRef absLocation = CFSTR("/Library/PreferencePanes/Perian.prefPane/Contents/Resources/PerianUpdateChecker.app");
-        if(CFStringGetFileSystemRepresentation(absLocation, fileRep, 1024))
-&
+
-                return;  //We have failed
-    }
-
-
+
+
-}
-
@@ -290 +299 @@
-            Codecprintf(glob->fileLog, "Error opening the base image decompressor! Exiting.\n");
-        }
+                
+                // we allocate some space for copying the frame data since we need some padding at the end
+                // for ffmpeg's optimized bitstream readers. Size doesn't really matter, it'll grow if need be
+                FFusionDataSetup(&(glob->data), 256, 64*1024);
-        FFusionRunUpdateCheck();
-    }
@@ -315 +328 @@
-            DisposeImageCodecMPDrawBandUPP(glob->drawBandUPP);
-        }
-        
-        if (glob->avCodec)
-        {
-            avcodec_close(glob->avContext);
-        }
-                                
-        if (glob->avContext)
@@ -326 +334 @@
-                                free(glob->avContext->extradata);
-                                                
+                        if (glob->avContext->codec) avcodec_close(glob->avContext);
-            av_free(glob->avContext);
-        }
@@ -344 +353 @@
-                        fclose(glob->fileLog);
-                
+        memset(glob, 0, sizeof(FFusionGlobalsRecord));
-        DisposePtr((Ptr)glob);
-    }
@@ -453 +463 @@
-        long count = 0;
-        Handle imgDescExt;
+        OSErr err = noErr;
-        
-    // We first open libavcodec library and the codec corresponding
@@ -678 +689 @@
-                        ffusionParseExtraData(glob->begin.parser, glob->avContext->extradata, glob->avContext->extradata_size);
-                
+                // XXX: at the moment ffmpeg can't handle interlaced H.264 right
+                // specifically PAFF + spatial prediction
+                if (glob->componentType == 'avc1' && !ffusionIsParsedVideoDecodable(glob->begin.parser))
+                        err = featureUnsupported;
+                
-                // some hooks into ffmpeg's buffer allocation to get frames in 
-                // decode order without delay more easily
@@ -693 +709 @@
-            Codecprintf(glob->fileLog, "Error opening avcodec!\n");
-            
-            return -2
+                       err = paramErr
-        }
-                
-                // we allocate some space for copying the frame data since we need some padding at the end
-                // for ffmpeg's optimized bitstream readers. Size doesn't really matter, it'll grow if need be
-                FFusionDataSetup(&(glob->data), 256, 64*1024);
-    }
-    
@@ -736 +749 @@
-    index = 0;
-        
+        if (!err) {
-        switch (glob->avContext->pix_fmt)
-        {
@@ -756 +770 @@
-                        break;
-        }
+        }
-    
-    pos[index++] = 0;
@@ -771 +786 @@
-        capabilities->flags |= codecCanAsync | codecCanAsyncWhen;
-        
-
-
+
-}
-
@@ -833 +847 @@
-        myDrp->frameData = NULL;
-        myDrp->buffer = NULL;
+        
+        if (!glob->avContext) {
+                fprintf(stderr, "Perian Codec: QT tried to call BeginBand without preflighting!\n");
+                return internalComponentErr;
+        }
-        
-        if(myDrp->decoded)

trunk/FFusionCodec.h

@@ -29 +29 @@
-//---------------------------------------------------------------------------
-
-2
+3
-
-#define kDivX1CodecInfoResID            256

trunk/FrameBuffer.c

@@ -39 +39 @@
-                free(data->frames[i]);
-        }
-
+
+
-}
-

trunk/MatroskaCodecIDs.cpp

@@ -427 +427 @@
-}
-
+static const unsigned char aac_lc_vos[] = {0x11, 0x90};
+
-static Handle CreateEsdsExt(KaxTrackEntry *tr_entry, bool audio)
-{
@@ -436 +438 @@
-    uint8_t *vosBuf = codecPrivate ? codecPrivate->GetBuffer() : NULL;
-        size_t esdsLen;
+        
+        if (!vosBuf) { // minimal AAC-LC descriptor
+                vosBuf = (uint8_t*)aac_lc_vos;
+                vosLen = 2;
+        }
-
-        Handle esdsExt = NewHandleClear(4);
@@ -720 +727 @@
-                                
-                        case kAudioFormatAC3:
+                        case kAudioFormatAC3MS:
-                                acl = ac3ChannelLayouts[channelIndex];
-                                break;
@@ -753 +761 @@
-        { kAudioFormatMPEGLayer2, 0x50 },
-        { kAudioFormatMPEGLayer3, 0x55 },
-
+MS
-        { kAudioFormatDTS, 0x2001 },
-        { kAudioFormatMPEG4AAC, 0xff },
@@ -795 +803 @@
-        { kAudioFormatMPEGLayer2, "A_MPEG/L2" },
-        { kAudioFormatMPEGLayer3, "A_MPEG/L3" },
-
+MS
-        { kAudioFormatAC3MS, "A_AC3" },
-        // anything special for these two?
-
-
+MS
+MS
-        { kAudioFormatXiphVorbis, "A_VORBIS" },
-        { kAudioFormatXiphFLAC, "A_FLAC" },

trunk/MatroskaImport.cpp

@@ -116 +116 @@
-        err = store->ImportDataRef((Handle)alias, rAliasType, theMovie, targetTrack,
-                                                           usedTrack, atTime, durationAdded, inFlags, outFlags);
-
-
-
-
+
-bail:
-        if (alias)
@@ -131 +128 @@
-                                                                          Track *usedTrack, TimeValue atTime, TimeValue *durationAdded, long inFlags, long *outFlags)
-{
-return
+ComponentResult res =
-                                                                usedTrack, atTime, durationAdded, inFlags, outFlags);
+        
+        LoadExternalSubtitlesFromFileDataRef(dataRef, dataRefType, theMovie);
+        return res;
-}
-
@@ -254 +254 @@
-                        // invalid file, validate should catch this
-                        return invalidMovie;
-
+               
-                err = SetupMovie();
-                if (err) return err;

trunk/MatroskaImportPrivate.cpp

@@ -657 +657 @@
-                                                                           dataRef, HandleDataHandlerSubType);
-        if (chapterMedia == NULL) {
-
+
+
-                DisposeMovieTrack(chapterTrack);
-GetMoviesError()
+err
-        }
-        
@@ -966 +967 @@
-        bool replaceSoundDesc = false;
-        
-
-
-
-
+
+
+
+
+
+
+
-        }
-        

trunk/MatroskaImportVersion.h

@@ -24 +24 @@
-
-// The high word is the codecInterfaceVersion
-1
+2

trunk/Perian.xcodeproj/project.pbxproj

@@ -1804 +1804 @@
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                FRAMEWORK_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                );
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -1836 +1831 @@
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                FRAMEWORK_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                );
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                                GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -1868 +1858 @@
-                                DEAD_CODE_STRIPPING = NO;
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
-                                FRAMEWORK_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-                                );
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -1897 +1880 @@
-                                INFOPLIST_FILE = "Plists/Perian-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Library/QuickTime";
-
-
-
-
-
+
-                                OTHER_LDFLAGS = (
-                                        "-framework",
@@ -1915 +1894 @@
-                                PRODUCT_NAME = Perian;
-                                REZ_PREPROCESSOR_DEFINITIONS = "";
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                WRAPPER_EXTENSION = component;
-                                ZERO_LINK = NO;
@@ -1929 +1907 @@
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                                GCC_ENABLE_OBJC_GC = YES;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
@@ -1947 +1926 @@
-                                INFOPLIST_FILE = "Plists/Perian-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Library/QuickTime";
-
-
-
-
+
-                                OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
-                                OTHER_CFLAGS_i386 = "-march=pentium-m -mtune=nocona $(OTHER_CFLAGS)";
@@ -1983 +1959 @@
-                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_MODEL_TUNING = G5;
+                                OTHER_LDFLAGS = (
+                                        "-read_only_relocs",
+                                        suppress,
+                                );
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                        };
@@ -1999 +1979 @@
-                                GCC_STRICT_ALIASING = YES;
-                                MACOSX_DEPLOYMENT_TARGET = 10.4;
+                                OTHER_LDFLAGS = (
+                                        "-read_only_relocs",
+                                        suppress,
+                                );
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                STRIP_INSTALLED_PRODUCT = NO;
@@ -2049 +2033 @@
-                                DEAD_CODE_STRIPPING = YES;
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
-                                FRAMEWORK_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-                                );
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                                GCC_ENABLE_OBJC_GC = YES;
-                                GCC_FAST_MATH = YES;
-                                GCC_MODEL_TUNING = G5;
@@ -2078 +2056 @@
-                                INFOPLIST_FILE = "Plists/Perian-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Library/QuickTime";
-
-
-
-
-
+
-                                OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
-                                OTHER_CFLAGS_i386 = "-march=pentium-m -mtune=nocona $(OTHER_CFLAGS)";
@@ -2096 +2070 @@
-                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                WRAPPER_EXTENSION = component;
-                                ZERO_LINK = NO;
@@ -2187 +2160 @@
-                                PREBINDING = NO;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                WRAPPER_EXTENSION = prefPane;
-                                ZERO_LINK = NO;
@@ -2197 +2169 @@
-                        buildSettings = {
-                                COPY_PHASE_STRIP = YES;
-                                FRAMEWORK_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                                );
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                                GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -2231 +2198 @@
-                                GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD;
-                                GCC_STRICT_ALIASING = YES;
+                                OTHER_LDFLAGS = (
+                                        "-read_only_relocs",
+                                        suppress,
+                                );
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                STRIP_INSTALLED_PRODUCT = NO;
@@ -2336 +2307 @@
-                                PREBINDING = NO;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                WRAPPER_EXTENSION = prefPane;
-                                ZERO_LINK = YES;
@@ -2361 +2331 @@
-                                PREBINDING = NO;
-                                PRODUCT_NAME = Perian;
-                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                                WRAPPER_EXTENSION = prefPane;
-                                ZERO_LINK = NO;

trunk/PerianAviImporter.r

@@ -21 +21 @@
-****************************************************************************/
-
-Rafz
+Peri
-
-#define thng_RezTemplateVersion 2

trunk/Plists/Perian-Info.plist

@@ -8 +8 @@
-        <string>Perian</string>
-        <key>CFBundleGetInfoString</key>
-0.9999
+1
-        <key>CFBundleIdentifier</key>
-        <string>org.perian.Perian</string>
@@ -16 +16 @@
-        <string>BNDL</string>
-        <key>CFBundleShortVersionString</key>
-0.9999
+1
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-0.9999
+1
-        <key>CSResourcesFileMapped</key>
-        <string>yes</string>

trunk/Plists/PerianPane-Info.plist

@@ -33 +33 @@
-        <string>????</string>
-        <key>CFBundleVersion</key>
-0.9999
+1
-        <key>CFBundleName</key>
-        <string>Perian</string>

trunk/Plists/PerianUpdateChecker-Info.plist

@@ -18 +18 @@
-        <string>????</string>
-        <key>CFBundleVersion</key>
-0.9999
+1
-        <key>NSMainNibFile</key>
-        <string>UpdateCheckerMainMenu</string>

trunk/Release/Changes.txt

@@ -3 +3 @@
-- TrueAudio, MP1, and DTS audio support
-- Slice-based multithreaded decoding for MPEG-1/2/H.264
-Better support for interlaced H.264
-2
+Apple H.264 now handles AVCHD/interlaced video
+4
-- Objective-C GC compatibility
-- Fixed a crash in Toast

trunk/Release/Makefile

@@ -4 +4 @@
-# Check the Perian.component target and PerianPane target.
-
-0b5
+1
-BETA=FALSE
-SRC_DIR=..

trunk/Release/Read Me.rtf

@@ -2 +2 @@
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww16040\viewh15820\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\f0\b\fs24 \cf0 About
-\b0 \
-at providing a single package to provide
+to provide a single package for
- \'95 libavcodec, from the ffmpeg project, along with code from the old FFusion component:\
-        \'95 MS-MPEG4 v1 & v2\
-        \'95 DivX\
-X
+x
-        \'95 H.264\
-        \'95 Flash Video\
@@ -19 +20 @@
-        \'95 HuffYUV\
-        \'95 ffvhuff\
-v
-RAPS
+V
+raps (up to v4)
-        \'95 Windows Media Audio v1 & v2\
-        \'95 Flash ADPCM\
-        \'95 Xiph Vorbis (in Matroska)\
-
+
+
+
- \'95 libavformat, from the ffmpeg project. along with AVIImporter.component:\
-        \'95 AVI file format\
@@ -30 +33 @@
- \'95 libmatroska, along with matroska-qt.component:\
-        \'95 MKV file format\
- parsing
+s:
-        \'95 SSA file format\
-        \'95 SRT file format\
-
+:
-        \'95 AC3 audio\
-\
-s
-GPL. The project site is located at <http://trac.cod3r.com/a52codec/> and the project s
+S
+the GPL. The project site is located at <http://trac.cod3r.com/a52codec/> and the project S
-\
-
@@ -58 +61 @@
-\b0 \
-J\'e9r\'f4me Cornet and his FFusion project for giving me the idea and code to start from Christoph N\'e4geli's AVI Importer from his XviD component, which allowed us to leverage libavformat.\
-
+
+
+
+
-The Mozilla Foundation and Dag \'c5gren for the universal charset detector.\
+(http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html, http://wakaba.c3.cx/s/apps/unarchiver.html)\
+\
-Adrian Thurston for the Ragel parser generator.\
+(http://www.cs.queensu.ca/~thurston/ragel/)\
+\
-Matroska for their library.\
+(http://www.matroska.org/)\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
+
+
+
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
+
+
+
-\
-\

trunk/Subtitles/SubATSUIRenderer.m

@@ -262 +262 @@
-        free(ubuffer);
-        UCDisposeTextBreakLocator(&breakLocator);
+        ATSUDisposeTextLayout(layout);
-        [super dealloc];
-}
@@ -269 +270 @@
-        free(ubuffer);
-        UCDisposeTextBreakLocator(&breakLocator);
+        ATSUDisposeTextLayout(layout);
-        [super finalize];
-}
@@ -349 +351 @@
-}
-
-
+tra
-{
-        ATSUDisposeStyle(ex);
@@ -541 +543 @@
-}
-
-
+extraHeight, Fixed 
-{
-        ATSTrapezoid trap = {0};
@@ -555 +557 @@
-                ATSUGetGlyphBounds(layout, 0, baseY, breaks[i], end-breaks[i], kATSUseDeviceOrigins, 1, &trap, &trapCount);
-
-
+ + extraHeight
-                
-                rect.bottom = MAX(trap.lowerLeft.y, trap.lowerRight.y);
@@ -575 +577 @@
-        *width = largeRect.right - largeRect.left;
-}
+
+#if 0
+static void GetImageBoundingBoxForLayout(ATSUTextLayout layout, UniCharArrayOffset *breaks, ItemCount breakCount, Fixed extraHeight, Fixed *lX, Fixed *lY, Fixed *height, Fixed *width)
+{
+        Rect largeRect = {0};
+        ATSUTextMeasurement baseY = 0;
+        int i;
+        
+        for (i = breakCount; i >= 0; i--) {
+                UniCharArrayOffset end = breaks[i+1];
+                Rect rect;
+                
+                ATSUMeasureTextImage(layout, breaks[i], end-breaks[i], 0, baseY, &rect);
+                
+                baseY += GetLineHeight(layout, breaks[i]) + extraHeight;
+                
+                if (i == breakCount) largeRect = rect;
+                
+                largeRect.bottom = MAX(largeRect.bottom, rect.bottom);
+                largeRect.left = MIN(largeRect.left, rect.left);
+                largeRect.top = MIN(largeRect.top, rect.top);
+                largeRect.right = MAX(largeRect.right, rect.right);
+                        }
+        
+        
+        if (lX) *lX = IntToFixed(largeRect.left);
+        if (lY) *lY = IntToFixed(largeRect.bottom);
+        *height = IntToFixed(largeRect.bottom - largeRect.top);
+        *width = IntToFixed(largeRect.right - largeRect.left);
+}
+#endif
-
-enum {fillc, strokec};
@@ -806 +839 @@
-                ATSUTextMeasurement lineWidth, lineHeight, lineX, lineY;
-                UniCharArrayOffset breaks[2] = {thisBreak, thisBreak + lineLen};
-