Changeset 1042

Timestamp:

04/20/09 21:09:28 (1 year ago)

Author:

astrange

Message:

MovieImport?:
- allow importing AVI with no video track (fixes a file I generated while testing)
- improve audio sample descriptions (MP3 should work better, don't know how to test it)
- pass magic cookies through to all API that supports them, minus AAC since that breaks

FFusion:
- fix memory leak if update checker isn't found

Files:

• trunk/FFusionCodec.c (modified) (1 diff)
• trunk/ff_MovieImport.c (modified) (1 diff)
• trunk/ff_private.c (modified) (4 diffs)

trunk/FFusionCodec.c

@@ -233 +233 @@
-        if(CFStringGetFileSystemRepresentation(absLocation, fileRep, 1024))
-            if(FSPathMakeRef((UInt8 *)fileRep, updateCheckRef, NULL) != noErr)
-return
+goto err
-    }
-        pthread_t thread;
-        pthread_create(&thread, NULL, launchUpdateChecker, updateCheckRef);
+        
+        return;
+err:
+        free(updateCheckRef);
-}
-

trunk/ff_MovieImport.c

@@ -376 +376 @@
-                        enum CodecID id = codec_get_id(codec_bmp_tags, BSWAP(fourcc));
-                        
-NONE || id == CODEC_ID_
+
-                                *valid = 0;
-                        

trunk/ff_private.c

@@ -210 +210 @@
-        AVCodecContext *codec;
-        UInt32 ioSize;
-
+ = noErr
-        
-        uint8_t *cookie = NULL;
@@ -228 +228 @@
-        
-        /* Ask the AudioToolbox about vbr of the codec */
+        // FIXME this sets vbr even if it was encoded in CBR mode
+        // which means our mBytesPerPacket is wrong for CBR mp3 (does not really matter)
-        ioSize = sizeof(UInt32);
-        AudioFormatGetProperty(kAudioFormatProperty_FormatIsVBR, sizeof(AudioStreamBasicDescription), &asbd, &ioSize, &map->vbr);
-        
+        cookie = create_cookie(codec, &cookieSize, asbd.mFormatID, map->vbr);
+        
-        /* ask the toolbox about more information */
-
-
+
+
+
+
+
+
+
+
-        
-        /* Set some fields of the AudioStreamBasicDescription. Then ask the AudioToolbox
@@ -239 +249 @@
-        asbd.mSampleRate = codec->sample_rate;
-        asbd.mChannelsPerFrame = codec->channels;
-asbd.mBytesPerPacket == 0
+!asbd.mBytesPerPacket
-                asbd.mBytesPerPacket = codec->block_align; /* this is tested for alaw/mulaw/msadpcm */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        if (asbd.mFormatID == kAudioFormatMPEG4AAC)
-                asbd.mFramesPerPacket = 1024;
-else if (asbd.mBytesPerPacket == 0 && asbd.mFramesPerPacket == 0
+if (!asbd.mFramesPerPacket && !asbd.mBytesPerPacket
-                asbd.mFramesPerPacket = 1;
+        asbd.mBitsPerChannel = codec->bits_per_coded_sample;
-        
-        // if we don't have mBytesPerPacket, we can't import as CBR. Probably should be VBR, and the codec
@@ -309 +326 @@
-        }
-        
-
-
+
+
+
-                if(err) {
-                        fprintf(stderr, "AVI IMPORTER: Error %ld creating the sound description\n", err);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-        }       
-        map->sampleHdl = (SampleDescriptionHandle)sndHdl;
-        map->asbd = asbd;
+        
+bail:
+        if(cookie)
+                av_free(cookie);
-        
-        return noErr;