Changeset 20

Timestamp:

07/11/06 14:45:46 (2 years ago)

Author:

durin42

Message:

Initial version of the AVI Importer merge-in. It doesn't actually work yet,
as it likes to crash every time it calls ffmpeg code, but one thing at a time.

Files:

• trunk/FFusionCodec.r (modified) (1 diff)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (18 diffs)
• trunk/PerianAviImporter.r (added)
• trunk/ff_MovieImport.c (added)
• trunk/ff_MovieImportDispatch.h (added)
• trunk/ff_MovieImportVersion.h (added)
• trunk/ff_dataref.c (added)
• trunk/ff_private.c (added)
• trunk/ff_private.h (added)

trunk/FFusionCodec.r

@@ -1648 +1648 @@
-        "FFusionCodecComponentDispatch"
-};
+

trunk/Perian.xcodeproj/project.pbxproj

@@ -22 +22 @@
-
-/* Begin PBXBuildFile section */
+                112E0C820A6436BA00DB4C29 /* FFusionCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = F560DF0003D61D0101ABA332 /* FFusionCodec.c */; };
-                11A70ACE0A3D0131002058D4 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D4EEFC0A3CE7FA0066D45F /* Carbon.framework */; };
-                11A70ACF0A3D0131002058D4 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D4EFA10A3CE8C10066D45F /* libavcodec.a */; };
@@ -28 +29 @@
-                11A70AD20A3D0131002058D4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1156DBD80A3CE9F500963B0E /* libz.dylib */; };
-                11A70AD30A3D0131002058D4 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D4EED50A3CE7EC0066D45F /* QuickTime.framework */; };
-                11A70AD70A3D013E002058D4 /* FFusionCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = F560DF0003D61D0101ABA332 /* FFusionCodec.c */; };
-                11A70AD80A3D0149002058D4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
-                11A70AD90A3D0149002058D4 /* FFusion.icns in Resources */ = {isa = PBXBuildFile; fileRef = F50D440703EAD8DF01B1D299 /* FFusion.icns */; };
-                11A70ADA0A3D0149002058D4 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 02B4991D040D596C0049362E /* main.nib */; };
-                11A70ADB0A3D0149002058D4 /* PostProcessing.strings in Resources */ = {isa = PBXBuildFile; fileRef = 02B499DE040D7A180049362E /* PostProcessing.strings */; };
-
+
+
+
+
+
+
+
+
-/* End PBXBuildFile section */
-
@@ -56 +63 @@
-                11A709DA0A3CFCB6002058D4 /* Perian-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Perian-Info.plist"; sourceTree = "<group>"; };
-                11A70AC10A3D0105002058D4 /* Perian.component */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Perian.component; sourceTree = BUILT_PRODUCTS_DIR; };
+                11C85ED30A641E6400DF3D73 /* ff_dataref.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ff_dataref.c; sourceTree = "<group>"; };
+                11C85ED40A641E6400DF3D73 /* ff_MovieImport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ff_MovieImport.c; sourceTree = "<group>"; };
+                11C85ED50A641E6400DF3D73 /* ff_MovieImportVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ff_MovieImportVersion.h; sourceTree = "<group>"; };
+                11C85ED60A641E6400DF3D73 /* ff_private.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ff_private.c; sourceTree = "<group>"; };
+                11C85ED70A641E6400DF3D73 /* ff_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ff_private.h; sourceTree = "<group>"; };
-                11D4EED50A3CE7EC0066D45F /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
-                11D4EEFC0A3CE7FA0066D45F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
@@ -61 +73 @@
-                11D4EFA20A3CE8C10066D45F /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = build/Universal/libavutil.a; sourceTree = "<group>"; };
-                11D4EFA30A3CE8C10066D45F /* libpostproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpostproc.a; path = build/Universal/libpostproc.a; sourceTree = "<group>"; };
+                8F483B540A642644002CCA73 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = build/Universal/libavformat.a; sourceTree = "<group>"; };
+                8F483B5D0A6426C1002CCA73 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
+                8F483B8B0A642886002CCA73 /* PerianAviImporter.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = PerianAviImporter.r; sourceTree = "<group>"; };
+                8F483BBC0A642B3D002CCA73 /* ff_MovieImportDispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ff_MovieImportDispatch.h; sourceTree = "<group>"; };
-                F50D440703EAD8DF01B1D299 /* FFusion.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = FFusion.icns; sourceTree = "<group>"; };
-                F560DECD03D61B6101ABA332 /* Components.k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Components.k.h; sourceTree = "<group>"; };
@@ -67 +83 @@
-                F560DF0003D61D0101ABA332 /* FFusionCodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = FFusionCodec.c; sourceTree = "<group>"; };
-                F560DF0203D622D001ABA332 /* FFusionCodec.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = FFusionCodec.r; sourceTree = "<group>"; };
-                F560DF0403D623F301ABA332 /* EI_Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EI_Image.h; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
@@ -81 +96 @@
-                                11A70AD20A3D0131002058D4 /* libz.dylib in Frameworks */,
-                                11A70AD30A3D0131002058D4 /* QuickTime.framework in Frameworks */,
+                                8F483B550A642644002CCA73 /* libavformat.a in Frameworks */,
+                                8F483B5E0A6426C1002CCA73 /* AudioToolbox.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -102 +119 @@
-                        isa = PBXGroup;
-                        children = (
+                                8F483B5D0A6426C1002CCA73 /* AudioToolbox.framework */,
-                                1156DBD80A3CE9F500963B0E /* libz.dylib */,
-                                11D4EFA10A3CE8C10066D45F /* libavcodec.a */,
+                                8F483B540A642644002CCA73 /* libavformat.a */,
-                                11D4EFA20A3CE8C10066D45F /* libavutil.a */,
-                                11D4EFA30A3CE8C10066D45F /* libpostproc.a */,
@@ -115 +134 @@
-                        isa = PBXGroup;
-                        children = (
+                                8F483B8B0A642886002CCA73 /* PerianAviImporter.r */,
-                                089C167DFE841241C02AAC07 /* InfoPlist.strings */,
-                                02B499DE040D7A180049362E /* PostProcessing.strings */,
@@ -127 +147 @@
-                        isa = PBXGroup;
-                        children = (
-
+
+
+
+
+
+
-                                F560DECD03D61B6101ABA332 /* Components.k.h */,
-                                F560DEFC03D61BE301ABA332 /* FFusionCodec.h */,
@@ -200 +225 @@
-                                11A70ADA0A3D0149002058D4 /* main.nib in Resources */,
-                                11A70ADB0A3D0149002058D4 /* PostProcessing.strings in Resources */,
+                                11C85FE70A64315500DF3D73 /* Perian-Info.plist in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -210 +236 @@
-                        buildActionMask = 2147483647;
-                        files = (
-
+
+
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -251 +278 @@
-                        buildActionMask = 2147483647;
-                        files = (
-
+
+
+
+
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -308 +338 @@
-                                        "$(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;
@@ -322 +354 @@
-                                        ffmpeg/libavutil,
-                                        ffmpeg/libpostproc,
+                                        ffmpeg/libavformat,
-                                );
-                                INFOPLIST_FILE = "Perian-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-
+
+
+
+
+
-                                OTHER_LDFLAGS = (
-                                        "-framework",
@@ -353 +390 @@
-                                        "$(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_ENABLE_FIX_AND_CONTINUE = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -364 +403 @@
-                                        ffmpeg/libavutil,
-                                        ffmpeg/libpostproc,
+                                        ffmpeg/libavformat,
-                                );
-                                INFOPLIST_FILE = "Perian-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-
+
+
+
+
+
-                                OTHER_LDFLAGS = (
-                                        "-framework",
@@ -393 +437 @@
-                                        "$(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_ENABLE_FIX_AND_CONTINUE = YES;
-                                GCC_MODEL_TUNING = G4;
@@ -403 +449 @@
-                                        ffmpeg/libavutil,
-                                        ffmpeg/libpostproc,
+                                        ffmpeg/libavformat,
-                                );
-                                INFOPLIST_FILE = "Perian-Info.plist";
-                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-
+
+
+
+
+
-                                OTHER_LDFLAGS = (
-                                        "-framework",