Fixed missing process of slot2 by SerialDV

f4exb · Jan 12, 2017 · 684584a · 684584a
1 parent 1098cc7
commit 684584a
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/dsd_main.cpp b/dsd_main.cpp
@@ -421,6 +421,7 @@ int main(int argc, char **argv)
             if (dsdDecoder.mbeDVReady1())
             {
                 dvController.decode(dvAudioSamples, (const unsigned char *) dsdDecoder.getMbeDVFrame1(), (SerialDV::DVRate) dsdDecoder.getMbeRate(), dvGain_dB);
+
                 if (dsdDecoder.upsampling())
                 {
                     upsamplingEngine.upsample(dsdDecoder.upsampling(), dvAudioSamples, &dvAudioSamples[SerialDV::MBE_AUDIO_BLOCK_SIZE], SerialDV::MBE_AUDIO_BLOCK_SIZE);
@@ -430,8 +431,26 @@ int main(int argc, char **argv)
                 {
                     result = write(out_file_fd, (const void *) dvAudioSamples, SerialDV::MBE_AUDIO_BLOCK_BYTES); // TODO: upsampling
                 }
+
                 dsdDecoder.resetMbeDV1();
             }
+
+            if (dsdDecoder.mbeDVReady2())
+            {
+                dvController.decode(dvAudioSamples, (const unsigned char *) dsdDecoder.getMbeDVFrame2(), (SerialDV::DVRate) dsdDecoder.getMbeRate(), dvGain_dB);
+
+                if (dsdDecoder.upsampling())
+                {
+                    upsamplingEngine.upsample(dsdDecoder.upsampling(), dvAudioSamples, &dvAudioSamples[SerialDV::MBE_AUDIO_BLOCK_SIZE], SerialDV::MBE_AUDIO_BLOCK_SIZE);
+                    result = write(out_file_fd, (const void *) &dvAudioSamples[SerialDV::MBE_AUDIO_BLOCK_SIZE], SerialDV::MBE_AUDIO_BLOCK_BYTES * dsdDecoder.upsampling());
+                }
+                else
+                {
+                    result = write(out_file_fd, (const void *) dvAudioSamples, SerialDV::MBE_AUDIO_BLOCK_BYTES); // TODO: upsampling
+                }
+
+                dsdDecoder.resetMbeDV2();
+            }
         }
         else
 #endif