Changeset 806

Timestamp:

02/09/08 13:55:44 (2 years 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};
-
+FloatToFixed(spanEx->outlineRadius), 
-                
-                CGRect borderRect = CGRectMake(FixedToFloat(lineX + penX), FixedToFloat(penY - lineY), FixedToFloat(lineWidth), FixedToFloat(lineHeight));
@@ -867 +900 @@
-                                                                                                                 (textType == kTextLayerShadow) ? (penY - FloatToFixed(spanEx->shadowDist)) : penY, c, div, spanEx, textType);
-                                extraHeight = MAX(extraHeight, spanEx->outlineRadius);
+                                lastSpanEx = spanEx;
-                        }
-                
@@ -954 +988 @@
-                ATSUTextMeasurement imageWidth, imageHeight;
-
-
+FloatToFixed(div->styleLine->outlineRadius), 
-
-                if (div->posX == -1) {
@@ -974 +1008 @@
-                                        } else penY = centerPen;
-                                        
-0; breakc.lEnd = breakCount+1; breakc.direction = -
+breakCount; breakc.lEnd = -1; breakc.direction = 
-                                        break;
-                                case kSubAlignmentTop:
@@ -984 +1018 @@
-                                        break;
-                        }
-
+
+
-                        penX = FloatToFixed(div->posX * screenScaleX);
-                        penY = FloatToFixed((context->resY - div->posY) * screenScaleY);
@@ -993 +1028 @@
-                        }
-                        
+                        ATSUGetLineControl(layout, kATSUFromTextBeginning, kATSULineDescentTag, sizeof(ATSUTextMeasurement), &descent, NULL);
+
-                        switch (div->alignV) {
-                                case kSubAlignmentMiddle: penY -= imageHeight / 2; break;
-
-
-
+
+
+
+
+
-                        SetLayoutPositioning(layout, imageWidth, div->alignH);
-                        storePen = NULL; breakc.lStart = breakCount; breakc.lEnd = -1; breakc.direction = 1;
@@ -1023 +1062 @@
-}
-
-
-
+
+
+
-        NSString *hdr = [[NSString alloc] initWithBytesNoCopy:(void*)header length:headerLen encoding:NSUTF8StringEncoding freeWhenDone:NO];
-
-        SubtitleRendererPtr s = [[SubATSUIRenderer alloc] initWithSSAHeader:hdr videoWidth:width videoHeight:height];
-        [hdr release];
+        CFRetain(s);
+        [pool release];
-        return s;
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-{
-        return s->srgbCSpace;
-}
-
-extern 
+
-{
-        [s renderPacket:(NSString*)str inContext:c width:cWidth height:cHeight];
-}
-
-
-
+
+
+
+
-        [s release];
+        [pool release];
-}
-@end

trunk/Subtitles/SubContext.h

@@ -30 +30 @@
-        BOOL bold, italic, underline, strikeout;
-        UInt8 alignH, alignV, borderStyle;
-
+__strong 
-        Float32 platformSizeScale;
-        SubRenderer *delegate;

trunk/Subtitles/SubContext.m

@@ -52 +52 @@
-{
-        switch (a) {
-
+default: 
-                case 4 ... 6: *alignV = kSubAlignmentMiddle; break;
-                case 7 ... 9: *alignV = kSubAlignmentTop; break;
@@ -59 +59 @@
-        switch (a) {
-                case 1: case 4: case 7: *alignH = kSubAlignmentLeft; break;
-
+default: 
-                case 3: case 6: case 9: *alignH = kSubAlignmentRight; break;
-        }
@@ -84 +84 @@
-        sty->alignH = kSubAlignmentCenter;
-        sty->alignV = kSubAlignmentBottom;
-0
+kSubBorderStyleNormal
-        sty->ex = [delegate completedStyleParsing:sty];
-        sty->delegate = delegate;
@@ -96 +96 @@
-                delegate = delegate_;
-                                
-s objectForKey: @""#
+[s objectForKey: @""#n] retai
-#define fv(fn, n) fn = [[s objectForKey:@""#n] floatValue]
-#define iv(fn, n) fn = [[s objectForKey:@""#n] intValue]
@@ -175 +175 @@
-        
-        // obscure res rules copied from VSFilter
-!resXS && !resYS
+(!resXS && !resYS) || (!resX && !resY)
-                resX = 384; resY = 288;
-        } else if (!resYS) {
@@ -200 +200 @@
-                        for (i=0; i < nstyles; i++) {
-                                NSDictionary *style = [styles_ objectAtIndex:i];
-SubStyle alloc] initWithDictionary:style scriptVersion:scriptType delegate:delegat
+[SubStyle alloc] initWithDictionary:style scriptVersion:scriptType delegate:delegate] autoreleas
-                                                                                                forKey:[style objectForKey:@"Name"]];
-                        }

trunk/Subtitles/SubImport.h

@@ -12 +12 @@
-#include <QuickTime/QuickTime.h>
-
+#ifndef __OBJC_GC__
+#ifndef __strong
+#define __strong
+#endif
+#endif
+
-#ifdef __cplusplus
-extern "C"
@@ -19 +25 @@
-short GetFilenameLanguage(CFStringRef filename);
-ComponentResult LoadExternalSubtitles(const FSRef *theFile, Movie theMovie);
+ComponentResult LoadExternalSubtitlesFromFileDataRef(Handle dataRef, OSType dataRefType, Movie theMovie);
-Track CreatePlaintextSubTrack(Movie theMovie, ImageDescriptionHandle imgDesc, TimeScale timescale, Handle dataRef, OSType dataRefType, FourCharCode subType, Handle imageExtension, Rect movieBox);
-
@@ -57 +64 @@
-class CXXSubSerializer
-{
-
+__strong 
-        
-public:
@@ -73 +80 @@
-class CXXAutoreleasePool
-{
-
+__strong 
-public:
-        CXXAutoreleasePool();

trunk/Subtitles/SubImport.mm

@@ -315 +315 @@
-        
-bail:
+        [ss release];
-        [pool release];
-        
@@ -443 +444 @@
-}
-
+ComponentResult LoadExternalSubtitlesFromFileDataRef(Handle dataRef, OSType dataRefType, Movie theMovie)
+{
+        if (dataRefType != AliasDataHandlerSubType) return noErr;
+        
+        CFStringRef cfPath;
+        FSRef ref;
+        uint8_t path[PATH_MAX];
+        
+        QTGetDataReferenceFullPathCFString(dataRef, dataRefType, kQTPOSIXPathStyle, &cfPath);
+        CFStringGetCString(cfPath, (char*)path, PATH_MAX, kCFStringEncodingUTF8);
+        FSPathMakeRef(path, &ref, NULL);
+        CFRelease(cfPath);
+        
+        return LoadExternalSubtitles(&ref, theMovie);
+}
+
-#pragma mark Obj-C Classes
-

trunk/Subtitles/SubParsing.h

@@ -37 +37 @@
-        @public;
-        UniCharArrayOffset offset;
-
+__strong 
-        SubRenderer *delegate;
-}

trunk/Subtitles/SubParsing.m.rl

@@ -48 +48 @@
-{
-        int i, sc = [spans count];
-%d spans:",
+\"%@\" with %d spans:", text, 
-        for (i = 0; i < sc; i++) {[tmp appendFormat:@" %d",((SubRenderSpan*)[spans objectAtIndex:i])->offset];}
-        [tmp appendFormat:@" %d", [text length]];

trunk/Subtitles/SubRenderer.h

@@ -15 +15 @@
-          tag_alpha, tag_1a, tag_2a, tag_3a, tag_4a, tag_r} SSATagType;
-
+#ifndef __OBJC_GC__
+#ifndef __strong
+#define __strong
+#endif
+#endif
+
-@interface SubRenderer : NSObject
--(void)completedHeaderParsing:(SubContext*)sc;

trunk/TextSubCodec.c

@@ -233 +233 @@
-        glob->ssa = NULL;
-        
-        return noErr;
-}
-
-// ImageCodecBeginBand
-//              The ImageCodecBeginBand function allows your image decompressor component to save information about
-// a band before decompressing it. This function is never called at interrupt time. The base image decompressor
-// preserves any changes your component makes to any of the fields in the ImageSubCodecDecompressRecord
-// or CodecDecompressParams structures. If your component supports asynchronous scheduled decompression, it
-// may receive more than one ImageCodecBeginBand call before receiving an ImageCodecDrawBand call.
-pascal ComponentResult TextSubCodecBeginBand(TextSubGlobals glob, CodecDecompressParams *p, ImageSubCodecDecompressRecord *drp, long flags)
-{
-        long offsetH, offsetV;
-        TextSubDecompressRecord *myDrp = (TextSubDecompressRecord *)drp->userDecompressRecord;
-
-        offsetH = (long)(p->dstRect.left - p->dstPixMap.bounds.left) * (long)(p->dstPixMap.pixelSize >> 3);
-        offsetV = (long)(p->dstRect.top - p->dstPixMap.bounds.top) * (long)drp->rowBytes;
-
-        drp->baseAddr = p->dstPixMap.baseAddr + offsetH + offsetV;
-        
-        // Let base codec know that all our frames are key frames (a.k.a., sync samples)
-        // This allows the base codec to perform frame dropping on our behalf if needed 
-    drp->frameType = kCodecFrameTypeKey;
-
-        myDrp->width = p->dstRect.right - p->dstRect.left;
-        myDrp->height = p->dstRect.bottom - p->dstRect.top;
-        myDrp->depth = (**p->imageDescription).depth;
-    myDrp->dataSize = p->bufferSize;
-        
-        if (!glob->ssa) {
-                if ((**p->imageDescription).cType == kSubFormatSSA) {
@@ -271 +243 @@
-                                GetImageDescriptionExtension(p->imageDescription,&ssaheader,kSubFormatSSA,1);
-                                
-myDrp->width, myDrp->
+(**p->imageDescription).width, (**p->imageDescription).
-                        } 
-                } 
-                
-myDrp->width,myDrp->
+(**p->imageDescription).width,(**p->imageDescription).
-                
-                //SSA_PrerollFonts(glob->ssa);
@@ -281 +253 @@
-                glob->colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-        }
+        
+        return noErr;
+}
+
+// ImageCodecBeginBand
+//              The ImageCodecBeginBand function allows your image decompressor component to save information about
+// a band before decompressing it. This function is never called at interrupt time. The base image decompressor
+// preserves any changes your component makes to any of the fields in the ImageSubCodecDecompressRecord
+// or CodecDecompressParams structures. If your component supports asynchronous scheduled decompression, it
+// may receive more than one ImageCodecBeginBand call before receiving an ImageCodecDrawBand call.
+pascal ComponentResult TextSubCodecBeginBand(TextSubGlobals glob, CodecDecompressParams *p, ImageSubCodecDecompressRecord *drp, long flags)
+{
+        long offsetH, offsetV;
+        TextSubDecompressRecord *myDrp = (TextSubDecompressRecord *)drp->userDecompressRecord;
+
+        offsetH = (long)(p->dstRect.left - p->dstPixMap.bounds.left) * (long)(p->dstPixMap.pixelSize >> 3);
+        offsetV = (long)(p->dstRect.top - p->dstPixMap.bounds.top) * (long)drp->rowBytes;
+
+        drp->baseAddr = p->dstPixMap.baseAddr + offsetH + offsetV;
+        
+        // Let base codec know that all our frames are key frames (a.k.a., sync samples)
+        // This allows the base codec to perform frame dropping on our behalf if needed 
+    drp->frameType = kCodecFrameTypeKey;
+
+        myDrp->width = p->dstRect.right - p->dstRect.left;
+        myDrp->height = p->dstRect.bottom - p->dstRect.top;
+        myDrp->depth = (**p->imageDescription).depth;
+    myDrp->dataSize = p->bufferSize;
-        
-        return noErr;

trunk/TextSubCodec.r

@@ -59 +59 @@
-// These flags specify information about the capabilities of the component
-// Works with 1-bit, 8-bit, 16-bit and 32-bit Pixel Maps
-odecInfoDoesSpool | c
+
-
-// These flags specify the possible format of compressed data produced by the component

trunk/UniversalDetector/UniversalDetector.xcodeproj/project.pbxproj

@@ -668 +668 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
+                                GCC_ENABLE_OBJC_GC = YES;
-                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                                GCC_WARN_UNUSED_VARIABLE = YES;

trunk/VobSubCodec.r

@@ -60 +60 @@
-// These flags specify information about the capabilities of the component
-// Works with 1-bit, 8-bit, 16-bit and 32-bit Pixel Maps
-odecInfoDoesSpool | c
+
-
-// These flags specify the possible format of compressed data produced by the component

trunk/bitstream_info.c

@@ -12 +12 @@
-#include <AudioToolbox/AudioToolbox.h>
-#include <QuickTime/QuickTime.h>
+#include "CodecIDs.h"
-
-#import "ac3tab.h"
@@ -128 +129 @@
-        memset(asbd, 0, sizeof(AudioStreamBasicDescription));
-        asbd->mSampleRate = sample_rate >> shift;
-
+MS
-        asbd->mFramesPerPacket = 1;
-        asbd->mChannelsPerFrame = nfchans_tbl[acmod] + lfe;
@@ -249 +250 @@
-        int num_ref_frames_in_pic_order_cnt_cycle;
-        int sum_of_offset_for_ref_frames;
+        
+        int chroma_format_idc;
-}H264ParserContext;
-
@@ -330 +333 @@
-        if(profile_idc >= 100)
-        {
+                context->chroma_format_idc = get_ue_golomb(gb);
-                //high profile
-get_ue_golomb(gb)
+context->chroma_format_idc
-                        get_bits1(gb);                  //residual_color_transfrom_flag
-                get_ue_golomb(gb);                      //bit_depth_luma_minus8
@@ -353 +357 @@
-                for(i=0; i<context->num_ref_frames_in_pic_order_cnt_cycle; i++)
-                        context->sum_of_offset_for_ref_frames += get_se_golomb(gb); //offset_for_ref_frame[i]
-       get_ue_golomb(gb);      //num_ref_frames
-       get_bits1(gb);          //gaps_in_frame_num_value_allowed_flag
-       get_ue_golomb(gb);      //pic_width_in_mbs_minus1
-       get_ue_golomb(gb);      //pic_height_in_map_unit
-       context->frame_mbs_only_flag = get_bits1(gb);
-}
+}
+get_ue_golomb(gb);     //num_ref_frames
+get_bits1(gb);         //gaps_in_frame_num_value_allowed_flag
+get_ue_golomb(gb);     //pic_width_in_mb
+get_ue_golomb(gb);     //pic_height_in_map_units_minus1
+context->frame_mbs_only_flag = get_bits1(gb);
-}
-
@@ -525 +529 @@
-                        start_offset = buf_index + 1;
-                        //do start code prefix search
-
+buf_index++
-                        {
-                                if(buf[buf_index] == 0)
@@ -732 +736 @@
-                av_free(parser->avctx);
-        if(parser->internalContext)
-
+av_
-        free(parser);
-}
@@ -783 +787 @@
-        parserContext->parserStructure = ffParser;
-        if(ffParser->internalContextSize)
-malloc
+av_mallocz
-        else
-                parserContext->internalContext = NULL;
@@ -819 +823 @@
-        return 0;
-}
+
+int ffusionIsParsedVideoDecodable(FFusionParserContext *parser)
+{
+        if (parser->parserStructure == &ffusionH264Parser) {
+                H264ParserContext *h264parser = parser->internalContext;
+                
+                // don't try to decode interlaced or 4:2:2 H.264
+                return (h264parser->frame_mbs_only_flag == 1) && (h264parser->chroma_format_idc <= 1);
+        }
+        
+        return 1;
+}

trunk/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);
+int ffusionIsParsedVideoDecodable(FFusionParserContext *parser);
-
-#ifdef __cplusplus

trunk/createStaticLibs.sh

@@ -54 +54 @@
-    exit 0
-fi
+
+if [ -e ffmpeg/patched ] ; then
+        (cd ffmpeg && svn revert -R . && rm patched)
+fi
+
+(cd ffmpeg; patch -p1 < ../Patches/ffmpeg.diff)
-
-if [ "$buildid_ffmpeg" = "$oldbuildid_ffmpeg" ] ; then

trunk/ff_MovieImport.c

@@ -322 +322 @@
-                } else if (tag == 'strh'){
-                        // 4-byte offset to the fourcc
-
-
+
+
+
+
+
-                } else
-                        url_fskip(pb, size + (size & 1));
@@ -336 +339 @@
-        uint8_t buf[PROBE_BUF_SIZE];
-        AVProbeData *pd = (AVProbeData *)malloc(sizeof(AVProbeData));
-
+*
-
-        /* default */
@@ -361 +364 @@
-                if (IS_AVI(storage->componentType)) {
-                        /* Prepare the iocontext structure */
-                        memset(&byteContext, 0, sizeof(byteContext));
-                        result = url_open_dataref(&byteContext, dataRef, dataRefType, NULL, NULL, NULL);
-                        require_noerr(result, bail);
-                        
-&
+
-                        enum CodecID id = codec_get_id(codec_bmp_tags, BSWAP(fourcc));
-                        
-
+ || id == CODEC_ID_MSVIDEO1
-                                *valid = 0;
-                        
-&
+
-                }
-        }
@@ -403 +405 @@
-        result = FSpMakeFSRef(theFile, &theFileFSRef);
-        require_noerr(result, bail);
-
-
-
+
-bail:
-                if(dataRef)
@@ -417 +417 @@
-{
-        ComponentResult result = noErr;
-
+*
-        AVFormatContext *ic = NULL;
-        AVFormatParameters params;
@@ -432 +432 @@
-        if(valid != 255)
-                goto bail;
-
+       
-        /* Prepare the iocontext structure */
-        memset(&byteContext, 0, sizeof(byteContext));
-        result = url_open_dataref(&byteContext, dataRef, dataRefType, &storage->dataHandler, &storage->dataHandlerSupportsWideOffsets, &storage->dataSize);
-        storage->isStreamed = dataRefType == URLDataHandlerSubType;
@@ -441 +440 @@
-        /* Open the Format Context */
-        memset(&params, 0, sizeof(params));
-&
+
-        require_noerr(result,bail);
-        storage->format_context = ic;
@@ -547 +546 @@
-        }
-        
+        LoadExternalSubtitlesFromFileDataRef(dataRef, dataRefType, theMovie);
+
-bail:
-        if(result == noErr)
@@ -552 +553 @@
-        else
-                storage->movieLoadState == kMovieLoadStateError;
-
+       
-        return result;
-} /* FFAvi_MovieImportDataRef */

trunk/ff_MovieImportVersion.h

@@ -24 +24 @@
-#define __FF_MOVIEIMPORTVERSION__
-
-2
+3
-
-Rafz
+Peri
-
-#define kAVIthngResID 512

trunk/ff_dataref.c

@@ -199 +199 @@
-
-/* This is the public function to open bytecontext withs datarefs */
-
+*
-{
-        URLContext *uc;
@@ -217 +217 @@
-                return err;
-        }
-[0] = '\0'
+ = NULL
-        uc->prot = up;
-        uc->flags = URL_RDONLY; // we're just using the read access...

trunk/ff_private.c

@@ -320 +320 @@
-                        break;
-                case CODEC_ID_AC3:
-
+MS
-                        map->vbr = 1;
-                        break;
@@ -606 +606 @@
-                if(result < 0) goto bail;
-                
-
+
+
-                st = formatContext->streams[packet.stream_index];
-                

trunk/ff_private.h

@@ -93 +93 @@
-
-/* Public interface of the DataRef interface */
-
+*
-
-/* Import routines */

trunk/ffmpeg-patch

@@ -1 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {
++       if (!(x*y)) {
++#if H264_CHROMA_MC4_TMPL == put_h264_chroma_mc4_mmx
++               put_h264_chroma_mc4_c(dst,src,stride,h,x,y);
++#else
++               avg_h264_chroma_mc4_c(dst,src,stride,h,x,y);
++#endif
++               return;
++       }
++       
-     asm volatile(
--        "movq "MANGLE(bone)", %%mm5     \n\t"
-+        "movq %4, %%mm5     \n\t"
-         "movq (%1), %%mm0               \n\t"
-         "pavgb 1(%1), %%mm0             \n\t"
-         "add %3, %1                     \n\t"
-@@ -190,7 +190,7 @@
-         "sub $2, %0                     \n\t"
-         " jg 1b                         \n\t"
-         : "+r" (h), "+r" (blk1), "+r" (blk2)
--        : "r" ((long)stride)
-+        : "r" ((long)stride), "m" (bone)
-     );
- }
- 
-@@ -258,7 +258,7 @@
-         "punpckhbw %%mm7, %%mm5         \n\t"
-         "paddw %%mm4, %%mm2             \n\t"
-         "paddw %%mm5, %%mm3             \n\t"
--        "movq 16+"MANGLE(round_tab)", %%mm5 \n\t"
-+        "movq 16+%5, %%mm5 \n\t"
-         "paddw %%mm2, %%mm0             \n\t"
-         "paddw %%mm3, %%mm1             \n\t"
-         "paddw %%mm5, %%mm0             \n\t"
-@@ -281,7 +281,7 @@
-         "add %4, %%"REG_a"              \n\t"
-         " js 1b                         \n\t"
-         : "+a" (len)
--        : "r" (blk1 - len), "r" (blk1 -len + stride), "r" (blk2 - len), "r" ((long)stride)
-+        : "r" (blk1 - len), "r" (blk1 -len + stride), "r" (blk2 - len), "r" ((long)stride), "m" (round_tab[0])
-     );
- }
- 
-Index: libavcodec/i386/dsputil_h264_template_mmx.c
-===================================================================
---- libavcodec/i386/dsputil_h264_template_mmx.c (revision 10865)
-+++ libavcodec/i386/dsputil_h264_template_mmx.c (working copy)
-@@ -188,8 +188,8 @@
-         "pxor   %%mm7, %%mm7        \n\t"
-         "movd %5, %%mm2             \n\t"
@@ -54 +124 @@
-         "punpcklwd %%mm3, %%mm3     \n\t"
-         "punpcklwd %%mm2, %%mm2     \n\t"
-46
+58
-         "sub $2, %2                 \n\t"
-         "jnz 1b                     \n\t"
@@ -63 +133 @@
- }
- 
-
-
-
-
-
+
+
+
+
- 
- #define QPEL_V_LOW(m3,m4,m5,m6, pw_20, pw_3, rnd, in0, in1, in2, in7, out, OP)\
@@ -76 +145 @@
-         "movq "#in7", " #m3 "             \n\t" /* d */\
-         "movq "#in0", %%mm5               \n\t" /* D */\
-29,7 +1929
+30,7 +1930
-         "paddw " #m5 ", %%mm6             \n\t" /* x2 */\
-         "paddw %%mm6, %%mm6               \n\t" /* 2x2 */\
@@ -85 +154 @@
-         "paddw %%mm4, %%mm5               \n\t" /* 20x1 - 6x2 + 3x3 - x4 */\
-         "psraw $5, %%mm5                  \n\t"\
-3,10 +1963
+4,10 +1964
-         "paddw %%mm5, %%mm5               \n\t" /* 2b */\
-         "psubw %%mm5, %%mm6               \n\t" /* c - 2b */\
@@ -98 +167 @@
-         "paddw %6, %%mm6                  \n\t"\
-         "paddw %%mm6, %%mm0               \n\t" /* 20a - 6b + 3c - d */\
-89,10 +1989
+90,10 +1990
-         "psrlq $24, %%mm6                 \n\t" /* IJKLM000 */\
-         "punpcklbw %%mm7, %%mm2           \n\t" /* 0F0G0H0I */\
@@ -111 +180 @@
-         "paddw %6, %%mm1                  \n\t"\
-         "paddw %%mm1, %%mm3               \n\t" /* 20a - 6b +3c - d */\
-5,7 +2015
+6,7 +2016
-         "psubw %%mm5, %%mm0               \n\t" /* c - 2b */\
-         "movq %%mm3, %%mm5                \n\t" /* JKLMNOPQ */\
@@ -120 +189 @@
-         "paddw %%mm3, %%mm2               \n\t" /* d */\
-         "psubw %%mm2, %%mm0               \n\t" /* -6b + 3c - d */\
-3,7 +2023
+4,7 +2024
-         "punpcklbw %%mm7, %%mm2           \n\t" /* 0J0K0L0M */\
-         "punpckhbw %%mm7, %%mm5           \n\t" /* 0N0O0P0Q */\
@@ -129 +198 @@
-         "paddw %%mm6, %%mm0               \n\t" /* 20a - 6b + 3c - d */\
-         "psraw $5, %%mm0                  \n\t"\
-8,8 +2038
+9,8 +2039
-         "paddw %%mm2, %%mm5               \n\t" /* d */\
-         "paddw %%mm6, %%mm6               \n\t" /* 2b */\
@@ -140 +209 @@
-         "paddw %6, %%mm4                  \n\t"\
-         "paddw %%mm3, %%mm4               \n\t" /* 20a - 6b + 3c - d */\
-2,7 +2052
+3,7 +2053
-         "decl %2                          \n\t"\
-         " jnz 1b                          \n\t"\
@@ -151 +220 @@
-     );\
- }\
-0,10 +2132
+1,10 +2133
-         "paddw %%mm5, %%mm5               \n\t" /* 2b */\
-         "psubw %%mm5, %%mm6               \n\t" /* c - 2b */\
@@ -164 +233 @@
-         "paddw %6, %%mm6                  \n\t"\
-         "paddw %%mm6, %%mm0               \n\t" /* 20a - 6b + 3c - d */\
-1,8 +2153
+2,8 +2154
-         "paddw %%mm5, %%mm4               \n\t" /* d */\
-         "paddw %%mm2, %%mm2               \n\t" /* 2b */\
@@ -175 +244 @@
-         "paddw %6, %%mm1                  \n\t"\
-         "paddw %%mm1, %%mm3               \n\t" /* 20a - 6b + 3c - d */\
-5,7 +2167
+6,7 +2168
-         "decl %2                          \n\t"\
-         " jnz 1b                          \n\t"\
@@ -186 +255 @@
-     );\
- }\
-4,31 +2248
+5,31 +2249
-         "movq 8(%0), %%mm1              \n\t"\
-         "movq 16(%0), %%mm2             \n\t"\
@@ -234 +303 @@
-         "add $136, %0                   \n\t"\
-         "add %6, %1                     \n\t"\
-6,7 +2280
+7,7 +2281
-         " jnz 1b                        \n\t"\
-         \
@@ -245 +314 @@
-     );\
- }\
-6,19 +2322
+7,19 +2323
-         "movq 8(%0), %%mm1              \n\t"\
-         "movq 16(%0), %%mm2             \n\t"\
@@ -273 +342 @@
-         "add $72, %0                    \n\t"\
-         "add %6, %1                     \n\t"\
-6,7 +2342
+7,7 +2343
-         " jnz 1b                        \n\t"\
-          \
@@ -284 +353 @@
-    );\
- }\
-67,7 +2975
+72,7 +2980
-     double c = 2.0 / (len-1.0);
-     int n2 = len>>1;
@@ -292 +361 @@
-         "movsd   %0,     %%xmm7 \n\t"
-         "movapd  %1,     %%xmm6 \n\t"
-85,17 +2992
+90,17 +2997
-         "movapd   %%xmm6,  %%xmm0   \n\t"\
-         "subpd    %%xmm1,  %%xmm0   \n\t"\
@@ -317 +386 @@
-          "r"(data+n2), "r"(data+len-2-n2)\
-     );
-
-
-
-
+
+
+
-@@ -341,21 +341,21 @@
- // in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask)
@@ -380 +448 @@
- }
- 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -363,7 +363,7 @@
-         "movq " #src4 ", %%mm1          \n\t" /* R6     R2      r6      r2 */\