Changeset 424

Timestamp:

04/17/07 15:03:05 (1 year ago)

Author:

dconrad

Message:

MP2 decoder. Closes #120

Files:

• trunk/FFissionCodec/FFissionCodec.r (modified) (1 diff)
• trunk/FFissionCodec/FFissionDecoder.cpp (modified) (1 diff)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (3 diffs)
• trunk/ff_MovieImport.c (modified) (1 diff)

trunk/FFissionCodec/FFissionCodec.r

@@ -63 +63 @@
-#define kComponentInfo                                  "An AudioCodec that decodes Vorbis audio into linear PCM"
-#include "XCAResources.r"
+
+#define kPrimaryResourceID                              136
+#define kComponentType                                  'adec'
+#define kComponentSubtype                               '.mp2'
+#define kComponentName                                  "MPEG Layer 2"
+#define kComponentInfo                                  "An AudioCodec that decodes MP2 audio into linear PCM"
+#include "XCAResources.r"

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -43 +43 @@
-        { kAudioFormatFlashADPCM, CODEC_ID_ADPCM_SWF },
-        { kAudioFormatXiphVorbis, CODEC_ID_VORBIS },
+        { kAudioFormatMPEGLayer2, CODEC_ID_MP2 },
-        { 0, CODEC_ID_NONE }
-};

trunk/Perian.xcodeproj/project.pbxproj

@@ -666 +666 @@
-                F560DF0203D622D001ABA332 /* FFusionCodec.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = FFusionCodec.r; sourceTree = "<group>"; };
-                F57755F40B51EB1800C7D833 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0
+includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"
-                F5CFD1BC0B5000CE00616865 /* GBPerianPanePListGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBPerianPanePListGenerator.h; sourceTree = "<group>"; };
-                F5CFD1BD0B5000CE00616865 /* GBPerianPanePListGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBPerianPanePListGenerator.m; sourceTree = "<group>"; };
@@ -1162 +1162 @@
-                                F5CFD2D60B5012A100616865 /* A52Codec.component */,
-                                F5CFD2D80B5012A100616865 /* AC3MovieImport.component */,
-A52
+
-                        );
-                        name = Products;
@@ -1430 +1430 @@
-                        sourceTree = BUILT_PRODUCTS_DIR;
-                };
-A52
+
-                        isa = PBXReferenceProxy;
-                        fileType = wrapper.application;
-A52
+
-                        remoteRef = F5CFD2D90B5012A100616865 /* PBXContainerItemProxy */;
-                        sourceTree = BUILT_PRODUCTS_DIR;

trunk/ff_MovieImport.c

@@ -87 +87 @@
-                register_avcodec(&adpcm_swf_decoder);
-                register_avcodec(&vorbis_decoder);
+                register_avcodec(&mp2_decoder);
-                
-                av_log_set_callback(FFMpegCodecprintf);