Changeset 1076

Timestamp:

06/13/09 22:31:28 (15 months ago)

Author:

gbooker

Message:

Create channel interleaver for DTS (We need to add layouts for other codecs).
Fixes #404

Location:

trunk/FFissionCodec

Files:

• FFissionDecoder.cpp (modified) (5 diffs)
• FFissionDecoder.h (modified) (2 diffs)

trunk/FFissionCodec/FFissionDecoder.cpp

@@ -102 +102 @@
         }
         else
-                dtsPassthrough = 0;     
+                dtsPassthrough = 0;
+        
+        int initialMap[6] = {0, 1, 2, 3, 4, 5};
+        memcpy(fullChannelMap, initialMap, sizeof(initialMap));
 }
 
@@ -327 +330 @@
         if(mInputFormat.mFormatID != kAudioFormatDTS)
                 dtsPassthrough = 0;
+        else
+        {
+                switch (mInputFormat.mChannelsPerFrame) {
+                        case 3:
+                        case 6:
+                        {
+                                int chanMap[6] = {1, 2, 0, 5, 3, 4};//L R C -> C L R  and  L R C LFE Ls Rs -> C L R Ls Rs LFE
+                                memcpy(fullChannelMap, chanMap, sizeof(chanMap));
+                                break;
+                        }
+                        case 4:
+                        case 5:
+                        {
+                                int chanMap[6] = {1, 2, 0, 3, 4, 5};//L R C Cs -> C L R Cs  and  L R C Ls Rs -> C L R Ls Rs
+                                memcpy(fullChannelMap, chanMap, sizeof(chanMap));
+                                break;
+                        }
+                        default:
+                                break;
+                }
+        }
 }
 
@@ -492 +516 @@
 }
 
+UInt32 FFissionDecoder::InterleaveSamples(void *outputDataUntyped, Byte *inputDataUntyped, int amountToCopy)
+{
+        SInt16 *outputData = (SInt16 *)outputDataUntyped;
+        SInt16 *inputData = (SInt16 *)inputDataUntyped;
+        int channelCount = avContext->channels;
+        int framesToCopy = amountToCopy / channelCount / 2;
+        for(int i=0; i<framesToCopy; i++)
+        {
+                for(int j=0; j<channelCount; j++)
+                {
+                        outputData[fullChannelMap[j]] = inputData[j];
+                }
+                outputData += channelCount;
+                inputData += channelCount;
+        }
+        
+        return framesToCopy * channelCount * 2;
+}
+
 UInt32 FFissionDecoder::ProduceOutputPackets(void* outOutputData,
                                                                                          UInt32& ioOutputDataByteSize,  // number of bytes written to outOutputData
@@ -511 +554 @@
         if (outBufUsed > 0) {
                 int amountToCopy = FFMIN(outBufUsed, ioOutputDataByteSize);
-                memcpy(outData, outputBuffer, amountToCopy);
+                amountToCopy = InterleaveSamples(outData, outputBuffer, amountToCopy);
                 outBufUsed -= amountToCopy;
                 written += amountToCopy;
@@ -550 +593 @@
                 // copy up to the amount requested
                 int amountToCopy = FFMIN(outBufUsed, ioOutputDataByteSize - written);
-                memcpy(outData + written, outputBuffer, amountToCopy);
+                amountToCopy = InterleaveSamples(outData + written, outputBuffer, amountToCopy);
                 outBufUsed -= amountToCopy;
                 written += amountToCopy;

trunk/FFissionCodec/FFissionDecoder.h

@@ -44 +44 @@
 
         virtual void AppendInputData(const void* inInputData, UInt32& ioInputDataByteSize, UInt32& ioNumberPackets, const AudioStreamPacketDescription* inPacketDescription);
+        virtual UInt32 InterleaveSamples(void *outputDataUntyped, Byte *inputDataUntyped, int amountToCopy);
         virtual UInt32 ProduceOutputPackets(void* outOutputData, UInt32& ioOutputDataByteSize, UInt32& ioNumberPackets, AudioStreamPacketDescription* outPacketDescription);
         
@@ -60 +61 @@
         int outBufUsed;
         bool dtsPassthrough;
+        int fullChannelMap[6];
 };