Changeset 347

Timestamp:

02/22/07 02:23:48 (2 years ago)

Author:

astrange

Message:

Remove/comment out various unused variables.
Enable -fstrict-aliasing for ffmpeg build: 56% -> 49% CPU on test h264 video.

Files:

• trunk/ColorConversions.c (modified) (3 diffs)
• trunk/CommonUtils.c (modified) (1 diff)
• trunk/FFusionCodec.c (modified) (5 diffs)
• trunk/MatroskaImportPrivate.cpp (modified) (1 diff)
• trunk/SSADocument.m (modified) (5 diffs)
• trunk/SubImport.mm (modified) (2 diffs)
• trunk/bitstream_info.c (modified) (1 diff)
• trunk/createStaticLibs.sh (modified) (4 diffs)
• trunk/ff_MovieImport.c (modified) (3 diffs)

trunk/ColorConversions.c

@@ -288 +288 @@
-void RGB32toRGB32(UInt8 *baseAddr, unsigned rowBytes, unsigned width, unsigned height, AVFrame *picture)
-{
-x, 
+
-        UInt8 *srcPtr = picture->data[0];
-        
@@ -295 +295 @@
-                memcpy(baseAddr, srcPtr, width * 4);
-#else
+                unsigned x;
-                UInt32 *oRow = (UInt32 *)baseAddr, *iRow = (UInt32 *)srcPtr;
-                for (x = 0; x < width; x++) {oRow[x] = EndianU32_BtoN(iRow[x]);}
@@ -307 +308 @@
-{
-        UInt8          *yc = picture->data[0], *u = picture->data[1], *v = picture->data[2];
-x2, 
+
-        
-        for (y = 0; y < height; y++) {

trunk/CommonUtils.c

@@ -230 +230 @@
-static int readDescr(UInt8 **buffer, int *tag)
-{
-        int len;
-        *tag = *(*buffer)++;
-        return readDescrLen(buffer);

trunk/FFusionCodec.c

@@ -236 +236 @@
-pascal ComponentResult FFusionCodecClose(FFusionGlobals glob, ComponentInstance self)
-{
-
-
+
-    
-    if (glob) 
@@ -390 +389 @@
-{
-    OSType *pos;
-, i
+
-    CodecCapabilities *capabilities = p->capabilities;
-    long bitfield;
-    char altivec = 0;
-    Byte* myptr;
-        long count = 0;
@@ -715 +712 @@
-        
-    //////
-
+/*
-    WindowRef           window;
-    OSStatus            err;
@@ -724 +721 @@
-    ControlRef          theControl;
-    KeyMap              currentKeyMap;
-
+ */
-    ///////
-        
@@ -1231 +1228 @@
-static void FFusionReleaseBuffer(AVCodecContext *s, AVFrame *pic)
-{
-
+//
-        FFusionBuffer *buf = pic->opaque;
-        

trunk/MatroskaImportPrivate.cpp

@@ -889 +889 @@
-void MatroskaTrack::FinishTrack(bool addSamples)
-{
-        OSStatus err = noErr;
-        
-        if (type == track_subtitle && !is_vobsub)

trunk/SSADocument.m

@@ -117 +117 @@
-                
-                ATSUAttributeValuePtr vals[] = {&font, &matrix, &opt, &size, &tracking, &s->bold, &s->italic, &s->underline, &s->strikeout};
-
-
+//
+//
-                
-                font = FMGetFontFromATSFontRef(ATSFontFindFromName((CFStringRef)s->font,kATSOptionFlagsDefault));
@@ -311 +311 @@
-        NSArray *lines = [ssa componentsSeparatedByString:@"\n"];
-        NSEnumerator *lenum = [lines objectEnumerator];
-styleType, *
+
-        NSArray *format;
-        NSMutableDictionary *headers, *styleDict;
@@ -378 +378 @@
--(void) loadHeader:(NSString*)ssa width:(float)width height:(float)height
-{
-        NSError *err;
-        NSStringEncoding se = NSUTF8StringEncoding;
-        if (!ssa) return;
-        NSArray *lines = [[ssa stringByStandardizingNewlines] componentsSeparatedByString:@"\n"];
@@ -390 +388 @@
-        unichar cai;
-        int formatc;
-        int readorder = 0;
-        
-        headers = [[NSMutableDictionary alloc] init];
@@ -491 +488 @@
-        SSADocument *ssa = [[SSADocument alloc] init];
-        Handle sampleHndl = NULL, headerHndl=NULL, drefHndl;
-        Ptr initData = NewPtr(0);
-        const char *header;
-        int i, packetCount, sampleLen;

trunk/SubImport.mm

@@ -118 +118 @@
-        UInt8 *path = (UInt8*)malloc(PATH_MAX);
-        NSString *srtfile;
-
-
+
-        
-        FSRefMakePath(theDirectory, path, PATH_MAX);
@@ -409 +408 @@
-        unsigned times[num*2], last_last_end = 0;
-        SubLine *slines[num], *last=nil;
-, all_overlap = true
+
-        
-        [lines sortUsingFunction:cmp_line context:nil];

trunk/bitstream_info.c

@@ -95 +95 @@
-        
-        /* This is a valid frame!!! */
-
+//
-        int sample_rate = ac3_freqs[fscod];
-        

trunk/createStaticLibs.sh

@@ -34 +34 @@
-        mkdir "$BUILDDIR"
-        
-
+ -fstrict-aliasing
-
-        cd "$BUILDDIR"
@@ -42 +42 @@
-                "$SRCROOT/ffmpeg/configure" $extraConfigureOptions $generalConfigureOptions --cpu=pentium-m --extra-cflags='-gdwarf-2 $optCFlags'
-        fi
+        
-        make -C libavutil   depend
-        make -C libavcodec  depend
@@ -62 +63 @@
-        mkdir "$BUILDDIR"
-        
-
+ -fstrict-aliasing
-        
-        cd "$BUILDDIR"
@@ -70 +71 @@
-                "$SRCROOT/ffmpeg/configure" --cross-compile --arch=ppc  --extra-ldflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-cflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -gdwarf-2 $optCFlags' $extraConfigureOptions $generalConfigureOptions
-        fi
+        
-        make -C libavutil   depend
-        make -C libavcodec  depend

trunk/ff_MovieImport.c

@@ -295 +295 @@
-        AVProbeData *pd = (AVProbeData *)malloc(sizeof(AVProbeData));
-        ByteIOContext byteContext;
-        AVFormatParameters params;
-        int success, i;
-
-        /* default */
@@ -380 +378 @@
-        AVFormatContext *ic = NULL;
-        AVFormatParameters params;
-        AVPacket pkt;
-        OSType mediaType;
-        Media media;
-i, 
+
-                
-        /* make sure that in case of error, the flag movieImportResultComplete is not set */
@@ -482 +479 @@
-        } else if(inFlags & movieImportWithIdle) {
-                if(addedDuration && ic->duration > 0) {
-                        TimeValue sampleTime;
-                        TimeScale movieTimeScale = GetMovieTimeScale(theMovie);
-                        *addedDuration = movieTimeScale * ic->duration / AV_TIME_BASE;