Changeset 918

Timestamp:

07/29/08 17:44:44 (4 months ago)

Author:

astrange

Message:

Support nellymoser in flv, closes #296

Files:

• trunk/CodecIDs.h (modified) (1 diff)
• trunk/FFissionCodec/FFissionCodec.r (modified) (1 diff)
• trunk/FFissionCodec/FFissionDecoder.cpp (modified) (1 diff)
• trunk/ff_MovieImport.c (modified) (1 diff)
• trunk/ff_private.c (modified) (1 diff)

trunk/CodecIDs.h

@@ -93 +93 @@
-        kAudioFormatRealLossless                = 'RALF',
-        kAudioFormatRealAtrac3                  = 'ATRC',
+        kAudioFormatNellymoser                                  = 'NELL',
-        
-        kSubFormatUTF8                          = 'SRT ',

trunk/FFissionCodec/FFissionCodec.r

@@ -98 +98 @@
-#define kComponentInfo                                  "An AudioCodec that decodes DCA Audio into linear PCM"
-#include "XCAResources.r"
+
+#define kPrimaryResourceID                              146
+#define kComponentType                                  'adec'
+#define kComponentSubtype                               kAudioFormatNellymoser
+#define kComponentName                                  "Nellymoser ASAO"
+#define kComponentInfo                                  "An AudioCodec that decodes Nellymoser ASAO into linear PCM"
+#include "XCAResources.r"

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -48 +48 @@
-        { kAudioFormatTTA, CODEC_ID_TTA },
-        { kAudioFormatDTS, CODEC_ID_DTS },
+        { kAudioFormatNellymoser, CODEC_ID_NELLYMOSER },
-        { 0, CODEC_ID_NONE }
-};

trunk/ff_MovieImport.c

@@ -118 +118 @@
-                REGISTER_DECODER(tta);
-                REGISTER_DECODER(dca);
+                REGISTER_DECODER(nellymoser);
-                
-                REGISTER_DECODER(dvdsub);

trunk/ff_private.c

@@ -386 +386 @@
-                case CODEC_ID_TTA:
-                        asbd->mFormatID = kAudioFormatTTA;
+                        break;
+                case CODEC_ID_NELLYMOSER:
+                        asbd->mFormatID = kAudioFormatNellymoser;
-                        break;
-                default: