Changeset 584

Timestamp:

06/20/07 01:28:35 (1 year ago)

Author:

dconrad

Message:

TTA support

Files:

• trunk/FFissionCodec/FFissionCodec.r (modified) (1 diff)
• trunk/FFissionCodec/FFissionDecoder.cpp (modified) (2 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (2 diffs)
• trunk/PerianAviImporter.r (modified) (1 diff)
• trunk/ff_MovieImport.c (modified) (2 diffs)
• trunk/ff_MovieImportVersion.h (modified) (1 diff)
• trunk/ff_private.c (modified) (1 diff)

trunk/FFissionCodec/FFissionCodec.r

@@ -70 +70 @@
-#define kComponentInfo                                  "An AudioCodec that decodes MP2 audio into linear PCM"
-#include "XCAResources.r"
+
+#define kPrimaryResourceID                              138
+#define kComponentType                                  'adec'
+#define kComponentSubtype                               kAudioFormatTTA
+#define kComponentName                                  "True Audio"
+#define kComponentInfo                                  "An AudioCodec that decodes True Audio into linear PCM"
+#include "XCAResources.r"

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -44 +44 @@
-        { kAudioFormatXiphVorbis, CODEC_ID_VORBIS },
-        { kAudioFormatMPEGLayer2, CODEC_ID_MP2 },
+        { kAudioFormatTTA, CODEC_ID_TTA },
-        { 0, CODEC_ID_NONE }
-};
@@ -133 +134 @@
-                case kAudioFormatWMA1MS:
-                case kAudioFormatWMA2MS:
+                case kAudioFormatTTA:
-                        if (magicCookieSize < 12 + 18 + 8 + 8)
-                                return;

trunk/Perian.xcodeproj/project.pbxproj

@@ -1165 +1165 @@
-                                F5CFD2D60B5012A100616865 /* A52Codec.component */,
-                                F5CFD2D80B5012A100616865 /* AC3MovieImport.component */,
-A52
+
-                        );
-                        name = Products;
@@ -1433 +1433 @@
-                        sourceTree = BUILT_PRODUCTS_DIR;
-                };
-A52
+
-                        isa = PBXReferenceProxy;
-                        fileType = wrapper.application;
-A52
+
-                        remoteRef = F5CFD2D90B5012A100616865 /* PBXContainerItemProxy */;
-                        sourceTree = BUILT_PRODUCTS_DIR;

trunk/PerianAviImporter.r

@@ -270 +270 @@
-};
-
+/* Component Manager Things - 
+        TTA */
+resource 'thng' (kTTAthngResID) {
+        'eat ',                                 // Type
+        'TTA ',                                 // SubType
+        'soun',                                 // Manufacturer
+        0,
+        0,
+        0,
+        0,
+        'STR ',                                         // Name Type
+        kTTAthngResID,                                          // Name ID
+        0,                                                      // Info Type
+        0,                                                      // Info ID
+        0,                                                      // Icon Type
+        0,                                                      // Icon ID
+        kFFAviComponentVersion,         // Version
+        componentHasMultiplePlatforms +
+        componentDoAutoVersion,         // Registratin Flags
+        0,                                                      // Resource ID of Icon Family
+{
+        kFFAvi_MovieImportFlags | movieImportSubTypeIsFileExtension,
+        'dlle',                                 // Code Resource type
+        512,
+        platformIA32NativeEntryPoint,           // IA32
+        kFFAvi_MovieImportFlags | movieImportSubTypeIsFileExtension,
+        'dlle',
+        512,
+        platformPowerPCNativeEntryPoint,        // PowerPC
+},
+'thnr', kTTAthngResID
+};
+
+resource 'thnr' (kTTAthngResID) {
+{
+        'mime', 1, 0,
+        'mime', kTTAthngResID, 0,
+}
+};
+
+resource 'mime' (kTTAthngResID) {
+{
+        kMimeInfoMimeTypeTag,           1, "audio/x-tta";
+        kMimeInfoFileExtensionTag,      1, "tta";
+        kMimeInfoDescriptionTag,        1, "True Audio";
+};
+};
+
+resource 'STR ' (kTTAthngResID) {
+        "True Audio Importer"
+};
+
-resource 'dlle' (512) {
-        "FFAvi_MovieImportComponentDispatch"

trunk/ff_MovieImport.c

@@ -64 +64 @@
-                av_register_input_format(&avi_demuxer);
-                av_register_input_format(&flv_demuxer);
+                av_register_input_format(&tta_demuxer);
-                register_parsers();
-                
@@ -89 +90 @@
-                register_avcodec(&vorbis_decoder);
-                register_avcodec(&mp2_decoder);
+                register_avcodec(&tta_decoder);
-                
-                av_log_set_callback(FFMpegCodecprintf);

trunk/ff_MovieImportVersion.h

@@ -30 +30 @@
-#define kAVIthngResID 512
-#define kFLVthngResID 515
+#define kTTAthngResID 517
-
-#endif

trunk/ff_private.c

@@ -341 +341 @@
-                case CODEC_ID_ADPCM_SWF:
-                        asbd->mFormatID = kAudioFormatFlashADPCM;
+                        break;
+                case CODEC_ID_TTA:
+                        asbd->mFormatID = kAudioFormatTTA;
-                        break;
-                default: