Changeset 636

Timestamp:

07/16/07 01:52:41 (3 years ago)

Author:

dconrad

Message:

DTS decoder. Closes #91.
Add speaker order comments to the default channel layouts

Location:

trunk

Files:

• FFissionCodec/FFissionCodec.r (modified) (1 diff)
• FFissionCodec/FFissionDecoder.cpp (modified) (6 diffs)
• MatroskaCodecIDs.cpp (modified) (2 diffs)
• ff_MovieImport.c (modified) (1 diff)

trunk/FFissionCodec/FFissionCodec.r

@@ -91 +91 @@
 #define kComponentInfo                                  "An AudioCodec that decodes True Audio into linear PCM"
 #include "XCAResources.r"
+
+#define kPrimaryResourceID                              144
+#define kComponentType                                  'adec'
+#define kComponentSubtype                               kAudioFormatDTS
+#define kComponentName                                  "DTS Coherent Acoustics"
+#define kComponentInfo                                  "An AudioCodec that decodes DCA Audio into linear PCM"
+#include "XCAResources.r"

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -47 +47 @@
         { 0x6d730050, CODEC_ID_MP2 },
         { kAudioFormatTTA, CODEC_ID_TTA },
+        { kAudioFormatDTS, CODEC_ID_DTS },
         { 0, CODEC_ID_NONE }
 };
@@ -358 +359 @@
                                                                                          AudioStreamPacketDescription* outPacketDescription)
 {
-        UInt32 ans = kAudioCodecProduceOutputPacketSuccess;
+        UInt32 ans;
         
         if (!avCodec)
@@ -367 +368 @@
         
         UInt32 written = 0;
-        ioNumberPackets = 0;
         Byte *outData = (Byte *) outOutputData;
         
@@ -395 +395 @@
                         outBufUsed = 0;
                         ioOutputDataByteSize = written;
+                        ioNumberPackets = ioOutputDataByteSize / (2 * mOutputFormat.NumberChannels());
                         return kAudioCodecProduceOutputPacketFailure;
                 }
@@ -404 +405 @@
                 outBufUsed -= amountToCopy;
                 written += amountToCopy;
-                ioNumberPackets++;
                 
                 // and save what's left over
@@ -413 +413 @@
         if (written < ioOutputDataByteSize)
                 ans = kAudioCodecProduceOutputPacketNeedsMoreInputData;
-        else if (outBufUsed > written || inputBuffer.GetNumPackets() > 0)
-                // we have more left than what we wrote, or an entire other packet
+        else if (inputBuffer.GetNumPackets() > 0)
+                // we have an entire packet left to decode
                 ans = kAudioCodecProduceOutputPacketSuccessHasMore;
+        else
+                ans = kAudioCodecProduceOutputPacketSuccess;
         
         ioOutputDataByteSize = written;
+        ioNumberPackets = ioOutputDataByteSize / (2 * mOutputFormat.NumberChannels());
         
         return ans;

trunk/MatroskaCodecIDs.cpp

@@ -628 +628 @@
 static const AudioChannelLayout vorbisChannelLayouts[6] = {
         { kAudioChannelLayoutTag_UseChannelBitmap, kAudioChannelBit_Left | kAudioChannelBit_Right | kAudioChannelBit_CenterSurround },
-        { kAudioChannelLayoutTag_Quadraphonic },
-        { kAudioChannelLayoutTag_MPEG_5_0_C },
-        { kAudioChannelLayoutTag_MPEG_5_1_C }
+        { kAudioChannelLayoutTag_Quadraphonic },                // L R Ls Rs
+        { kAudioChannelLayoutTag_MPEG_5_0_C },                  // L C R Ls Rs
+        { kAudioChannelLayoutTag_MPEG_5_1_C },                  // L C R Ls Rs LFE
 };
 
 // these should be the default for the number of channels; esds can specify other mappings
 static const AudioChannelLayout aacChannelLayouts[6] = {
-        { kAudioChannelLayoutTag_MPEG_3_0_B },          // C L R according to wiki.multimedia.cx
-        { kAudioChannelLayoutTag_AAC_4_0 },
-        { kAudioChannelLayoutTag_AAC_5_0 },
-        { kAudioChannelLayoutTag_AAC_5_1 },
-        { kAudioChannelLayoutTag_AAC_6_1 },
-        { kAudioChannelLayoutTag_AAC_7_1 }
+        { kAudioChannelLayoutTag_MPEG_3_0_B },                  // C L R according to wiki.multimedia.cx
+        { kAudioChannelLayoutTag_AAC_4_0 },                             // C L R Cs
+        { kAudioChannelLayoutTag_AAC_5_0 },                             // C L R Ls Rs
+        { kAudioChannelLayoutTag_AAC_5_1 },                             // C L R Ls Rs Lfe
+        { kAudioChannelLayoutTag_AAC_6_1 },                             // C L R Ls Rs Cs Lfe
+        { kAudioChannelLayoutTag_AAC_7_1 },                             // C Lc Rc L R Ls Rs Lfe
 };
 
 static const AudioChannelLayout ac3ChannelLayouts[6] = {
-        { kAudioChannelLayoutTag_ITU_3_0 },
-        { kAudioChannelLayoutTag_ITU_3_1 },
-        { kAudioChannelLayoutTag_ITU_3_2 },
-        { kAudioChannelLayoutTag_ITU_3_2_1 }
+        { kAudioChannelLayoutTag_ITU_3_0 },                             // L R C
+        { kAudioChannelLayoutTag_ITU_3_1 },                             // L R C Cs
+        { kAudioChannelLayoutTag_ITU_3_2 },                             // L R C Ls Rs
+        { kAudioChannelLayoutTag_ITU_3_2_1 },                   // L R C LFE Ls Rs
 };
 
 static const AudioChannelLayout flacChannelLayouts[6] = {
-        { kAudioChannelLayoutTag_ITU_3_0 },
-        { kAudioChannelLayoutTag_Quadraphonic },
-        { kAudioChannelLayoutTag_ITU_3_2 },
-        { kAudioChannelLayoutTag_ITU_3_2_1 },
-        { kAudioChannelLayoutTag_MPEG_6_1_A },
-        { kAudioChannelLayoutTag_MPEG_7_1_C }
+        { kAudioChannelLayoutTag_ITU_3_0 },                             // L R C
+        { kAudioChannelLayoutTag_Quadraphonic },                // L R Ls Rs
+        { kAudioChannelLayoutTag_ITU_3_2 },                             // L R C Ls Rs
+        { kAudioChannelLayoutTag_ITU_3_2_1 },                   // L R C LFE Ls Rs
+        { kAudioChannelLayoutTag_MPEG_6_1_A },                  // L R C LFE Ls Rs Cs
+        { kAudioChannelLayoutTag_MPEG_7_1_C },                  // L R C LFE Ls Rs Rls Rrs
+};
+
+// 5.1 is tested, the others are just guesses
+static const AudioChannelLayout dtsChannelLayouts[6] = {
+        { kAudioChannelLayoutTag_MPEG_3_0_B },                  // C L R
+        { kAudioChannelLayoutTag_MPEG_4_0_B },                  // C L R Cs
+        { kAudioChannelLayoutTag_MPEG_5_0_D },                  // C L R Ls Rs
+        { kAudioChannelLayoutTag_MPEG_5_1_D },                  // C L R Ls Rs Lfe
 };
 
@@ -681 +689 @@
                         case kAudioFormatAC3:
                                 acl = ac3ChannelLayouts[channelIndex];
+                                break;
+                                
+                        case kAudioFormatDTS:
+                                acl = dtsChannelLayouts[channelIndex];
                                 break;
                 }

trunk/ff_MovieImport.c

@@ -91 +91 @@
                 register_avcodec(&mp2_decoder);
                 register_avcodec(&tta_decoder);
+                register_avcodec(&dca_decoder);
                 
                 av_log_set_callback(FFMpegCodecprintf);