comparison data/fileio/CSVFileReader.cpp @ 1518:9c09a3f05139 import-audio-data

Pull allocation/deallocation out of the inner loop

     bool haveEndTime = false;
     bool pitchLooksLikeMIDI = true;
 
     sv_frame_t startFrame = 0; // for calculation of dense model resolution
     bool firstEverValue = true;
-
-    map<QString, int> labelCountMap;
     
     int valueColumns = 0;
     for (int i = 0; i < m_format.getColumnCount(); ++i) {
         if (m_format.getColumnPurpose(i) == CSVFormat::ColumnValue) {
             ++valueColumns;
         }
     }
+
+    int audioChannels = 0;
+    float **audioSamples = 0;
+    float sampleShift = 0.f;
+    float sampleScale = 1.f;
+
+    if (modelType == CSVFormat::WaveFileModel) {
+
+        audioChannels = valueColumns;
+                
+        audioSamples =
+            breakfastquay::allocate_and_zero_channels<float>
+            (audioChannels, 1);
+
+        switch (m_format.getAudioSampleRange()) {
+        case CSVFormat::SampleRangeSigned1:
+        case CSVFormat::SampleRangeOther:
+            sampleShift = 0.f;
+            sampleScale = 1.f;
+            break;
+        case CSVFormat::SampleRangeUnsigned255:
+            sampleShift = -128.f;
+            sampleScale = 1.f / 128.f;
+            break;
+        case CSVFormat::SampleRangeSigned32767:
+            sampleShift = 0.f;
+            sampleScale = 1.f / 32768.f;
+            break;
+        }
+    }
+
+    map<QString, int> labelCountMap;
 
     bool abandoned = false;
     
     while (!in.atEnd() && !abandoned) {
 

             float pitch = 0.f;
             QString label = "";
 
             duration = 0.f;
             haveEndTime = false;
-
+            
             for (int i = 0; i < list.size(); ++i) {
 
                 QString s = list[i];
 
                 CSVFormat::ColumnPurpose purpose = m_format.getColumnPurpose(i);

 
                 model3->setColumn(lineno, values);
 
             } else if (modelType == CSVFormat::WaveFileModel) {
 
-                int channels = modelW->getChannelCount();
-                
-                float **samples =
-                    breakfastquay::allocate_and_zero_channels<float>
-                    (channels, 1);
-
                 int channel = 0;
-                float shift = 0.f;
-                float scale = 1.f;
-
-                switch (m_format.getAudioSampleRange()) {
-                case CSVFormat::SampleRangeSigned1:
-                case CSVFormat::SampleRangeOther:
-                    shift = 0.f;
-                    scale = 1.f;
-                    break;
-                case CSVFormat::SampleRangeUnsigned255:
-                    shift = -128.f;
-                    scale = 1.f / 128.f;
-                    break;
-                case CSVFormat::SampleRangeSigned32767:
-                    shift = 0.f;
-                    scale = 1.f / 32768.f;
-                    break;
-                }
-                
-                for (int i = 0; i < list.size() && channel < channels; ++i) {
+
+                for (int i = 0;
+                     i < list.size() && channel < audioChannels;
+                     ++i) {
 
                     if (m_format.getColumnPurpose(i) !=
                         CSVFormat::ColumnValue) {
                         continue;
                     }
 
                     bool ok = false;
                     float value = list[i].toFloat(&ok);
-
-                    value += shift;
-                    value *= scale;
+                    if (!ok) {
+                        value = 0.f;
+                    }
+
+                    value += sampleShift;
+                    value *= sampleScale;
                     
-                    samples[channel][0] = value;
+                    audioSamples[channel][0] = value;
 
                     ++channel;
                 }
 
-                bool ok = modelW->addSamples(samples, 1);
-
-                breakfastquay::deallocate_channels(samples, channels);
+                while (channel < audioChannels) {
+                    audioSamples[channel][0] = 0.f;
+                    ++channel;
+                }
+
+                bool ok = modelW->addSamples(audioSamples, 1);
                 
                 if (!ok) {
                     if (warnings < warnLimit) {
                         SVCERR << "WARNING: CSVFileReader::load: "
                                << "Unable to add sample to wave-file model"

         model3->setMinimumLevel(min);
         model3->setMaximumLevel(max);
     }
 
     if (modelW) {
+        breakfastquay::deallocate_channels(audioSamples, audioChannels);
         modelW->updateModel();
         modelW->writeComplete();
     }
 
     return model;