Changeset 57

Timestamp:

07/27/07 17:50:03 (1 year ago)

Author:

gbooker

Message:

A much better passthrough method. Doesn't require 2 channel output only anymore (although, I expect it fails with mono AC3 :( ).

Files:

• trunk/A52/ACShepA52Decoder.cpp (modified) (3 diffs)

trunk/A52/ACShepA52Decoder.cpp

@@ -165 +165 @@
-        CFPreferencesSetAppValue(USE_DPLII_KEY, NULL, myApp);
-
-
+
+
-        {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        if(!passthrough)
-                        {
-                                // 32 bit int
-                                CAStreamBasicDescription theOutputFormat1(sample_rates[sample_index], kAudioFormatLinearPCM, 0, 1, 0, 2, 32, kIntPCMOutFormatFlag);
-                                AddOutputFormat(theOutputFormat1);
-                                // 32 bit float
-                                CAStreamBasicDescription theOutputFormat2(sample_rates[sample_index], kAudioFormatLinearPCM, 0, 1, 0, 2, 32, kFloatPCMOutFormatFlag);
-                                AddOutputFormat(theOutputFormat2);
-                        }
-                        for (int channels = 1; channels <= 6; channels++) {
-                                //      This decoder only takes an A/52 or AC-3 stream as it's input
-                                CAStreamBasicDescription theInputFormat1(sample_rates[sample_index], kAudioFormatAC3, 0, 256*6, 0, channels, 0, 0);
-                                AddInputFormat(theInputFormat1);
-                                CAStreamBasicDescription theInputFormat2(sample_rates[sample_index], kAudioFormatAVIAC3, 0, 256*6, 0, channels, 0, 0);
-                                AddInputFormat(theInputFormat2);
-                        }
-                }
-        }
-        else
-        {
-                static int sample_rates[] = {48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 6000, 5512, 4000};
-                for (int sample_index = 0; sample_index < 12; sample_index ++)
-                {
-                        for (int channels = 1; channels <= 6; channels++) {
-                                //      This decoder only takes an A/52 or AC-3 stream as it's input
-                                CAStreamBasicDescription theInputFormat1(sample_rates[sample_index], kAudioFormatAC3, 0, 256*6, 0, channels, 0, 0);
-                                AddInputFormat(theInputFormat1);
-                                CAStreamBasicDescription theInputFormat2(sample_rates[sample_index], kAudioFormatAVIAC3, 0, 256*6, 0, channels, 0, 0);
-                                AddInputFormat(theInputFormat2);
-                                
-                                // Output 16-Bit Ints
-                                CAStreamBasicDescription theOutputFormat1(sample_rates[sample_index], kAudioFormatLinearPCM, 0, 1, 0, channels, 16, kIntPCMOutFormatFlag);
-                                AddOutputFormat(theOutputFormat1);
-                                
-                                // And 32-Bit
-                                CAStreamBasicDescription theOutputFormat2(sample_rates[sample_index], kAudioFormatLinearPCM, 0, 1, 0, channels, 32, kIntPCMOutFormatFlag);
@@ -598 +575 @@
-                        myOutputData += output_offset * output_sample_size;  //output_offset is in 16-bit ints
-                        
-
+
+
-                        input_data = GetBytes(bytes_to_read);
-                        
-                        if (mOutputFormat.mFormatFlags & kLinearPCMFormatFlagIsBigEndian)
-                        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                myOutputData[4] = input_data[5] & 0x7;
-                                myOutputData[6] = (bytes_to_read >> 4) & 0xff;
@@ -611 +602 @@
-                        else
-                        {
-
-
-
-
+
+
+
+
+
-                                unsigned int i;
-
+
+
-                                {
-
-
+
+
+
+
+
-                                }
-                        }