AudioProcessor: Stabilize the work, and fixed loop end of XQOA files

Author: Wohlstand

_common/AudioProcessor/audio_processor.cpp

@@ -264,6 +264,9 @@ int64_t MoondustAudioProcessor::getBytesWrittenStat() const
 
 int64_t MoondustAudioProcessor::getSamplesReadStat() const
 {
+    if(!m_in_file.get())
+        return 0;
+
     const auto &source = m_in_file->getSpec();
     size_t sample_in = (SDL_AUDIO_BITSIZE(source.m_sample_format) / 8) * source.m_channels;
 
@@ -272,6 +275,9 @@ int64_t MoondustAudioProcessor::getSamplesReadStat() const
 
 int64_t MoondustAudioProcessor::getSamplesWrittenStat() const
 {
+    if(!m_out_file.get())
+        return 0;
+
     const auto &obtained = m_out_file->getSpec();
     size_t sample_out = (SDL_AUDIO_BITSIZE(obtained.m_sample_format) / 8) * obtained.m_channels;
 
@@ -300,7 +306,11 @@ bool MoondustAudioProcessor::runChunk(bool dry)
     {
         filled = SDL_AudioStreamGet(m_cvt_stream, m_out_buffer.data(), m_out_buffer.size());
         if(filled != 0)
+        {
+            if(filled < 0)
+                return false;
             break;
+        }
 
         amount = m_in_file->readChunk(m_in_buffer.data(), m_in_buffer.size(), &spec_changed);
 

_common/AudioProcessor/codec/audio_qoa.cpp

@@ -398,7 +398,17 @@ bool MDAudioQOA::close()
         if(m_file)
         {
             if(sample_data_pos > 0)
+            {
+                if(m_spec.m_loop_len != 0)
+                {
+                    // Extra samples to make loop end to not fail
+                    if(sample_data_pos + 4 <= sample_data_len)
+                        sample_data_pos += 4;
+                    else
+                        sample_data_pos = sample_data_len;
+                }
                 encode_frame(); // Finish the data that was left
+            }
 
             // Finalize the written data and update the header
             SDL_RWseek(m_file, qoa_file_begin, SEEK_SET);

test/Maintainer/AudioConverterTest/coverter_dialogue.cpp

@@ -93,12 +93,12 @@ void CoverterDialogue::on_runCvt_clicked()
     else // Otherwise, just write down as-is
     {
         m_phase = PHASE_CONVERSION;
+    }
 
-        if(!m_cvt.openOutFile(ui->fileOut->text().toStdString(), ui->dstFormat->currentData().toInt(), m_dstSpec))
-        {
-            qWarning() << "Failed to open output file" << ui->fileOut->text() << QString::fromStdString(m_cvt.getLastError());
-            return;
-        }
+    if(!m_cvt.openOutFile(ui->fileOut->text().toStdString(), ui->dstFormat->currentData().toInt(), m_dstSpec))
+    {
+        qWarning() << "Failed to open output file" << ui->fileOut->text() << QString::fromStdString(m_cvt.getLastError());
+        return;
     }
 
     m_runner = QtConcurrent::run<void>(this, &CoverterDialogue::runner);
@@ -137,7 +137,12 @@ void CoverterDialogue::runner()
             switch(m_phase)
             {
             case PHASE_LENGHT_MEASURE:
-                m_cvt.runChunk(true);
+                if(!m_cvt.runChunk(true))
+                {
+                    qWarning() << "Conversion failed: (Phase Measure) can't read source file";
+                    emit workFinished();
+                    return;
+                }
 
                 if(prev_progress != m_cvt.curChunk())
                 {
@@ -161,7 +166,7 @@ void CoverterDialogue::runner()
 
                     m_cvt.rewindRead();
 
-                    if(!m_cvt.openOutFile(ui->fileOut->text().toStdString(), FORMAT_OGG_VORBIS, m_dstSpec))
+                    if(!m_cvt.openOutFile(ui->fileOut->text().toStdString(), ui->dstFormat->currentData().toInt(), m_dstSpec))
                     {
                         qWarning() << "Failed to open output file" << ui->fileOut->text();
                         emit workFinished();
@@ -173,7 +178,12 @@ void CoverterDialogue::runner()
 
                 break;
             case PHASE_CONVERSION:
-                m_cvt.runChunk(false);
+                if(!m_cvt.runChunk(false))
+                {
+                    qWarning() << "Conversion failed: (Phase Conversion) can't read source file";
+                    emit workFinished();
+                    return;
+                }
 
                 if(prev_progress != m_cvt.curChunk())
                 {
@@ -187,7 +197,13 @@ void CoverterDialogue::runner()
         }
         else
         {
-            m_cvt.runChunk();
+            if(!m_cvt.runChunk())
+            {
+                qWarning() << "Conversion failed: can't read source file";
+                emit workFinished();
+                return;
+            }
+
             emit updateProgress(m_cvt.curChunk());
         }
     }