AudioProcessor: Use the wanted spec when possible

This also avoids glitches happen at the XQOA while encoding

Author: Wohlstand

XTConvert/src/libxtconvert.cpp

@@ -1294,7 +1294,32 @@ class Converter
 
     bool convert_sfx(const QString&, const QString& in_path, const QString& out_path)
     {
-        if(!m_audioCvt.openInFile(in_path.toStdString()))
+        MDAudioFileSpecWanted spec_wanted;
+
+        switch(m_spec.target_platform)
+        {
+        default:
+            spec_wanted.m_sample_rate = 44100;
+            break;
+
+        case TargetPlatform::T3X:
+            spec_wanted.m_sample_rate = 44100;
+            spec_wanted.m_channels = 2;
+            break;
+
+        case TargetPlatform::TPL:
+            spec_wanted.m_sample_format = AUDIO_S16MSB;
+            spec_wanted.m_sample_rate = 32000;
+            spec_wanted.m_channels = 2;
+            break;
+
+        case TargetPlatform::DSG:
+            spec_wanted.m_sample_rate = 16384;
+            spec_wanted.m_channels = 1;
+            break;
+        }
+
+        if(!m_audioCvt.openInFile(in_path.toStdString(), std::string(), nullptr, &spec_wanted))
         {
             log_file(LogCategory::SkippedInvalid, in_path);
             m_audioCvt.close();
@@ -1353,7 +1378,32 @@ class Converter
 
     bool convert_music_xqoa(const QString&, const QString& in_path, const QString& out_path, const QString &musicArgs = QString())
     {
-        if(!m_audioCvt.openInFile(in_path.toStdString(), musicArgs.toStdString()))
+        MDAudioFileSpecWanted spec_wanted;
+
+        switch(m_spec.target_platform)
+        {
+        default:
+            spec_wanted.m_sample_rate = 44100;
+            break;
+
+        case TargetPlatform::T3X:
+            spec_wanted.m_sample_rate = 44100;
+            spec_wanted.m_channels = 2;
+            break;
+
+        case TargetPlatform::TPL:
+            spec_wanted.m_sample_format = AUDIO_S16MSB;
+            spec_wanted.m_sample_rate = 32000;
+            spec_wanted.m_channels = 2;
+            break;
+
+        case TargetPlatform::DSG:
+            spec_wanted.m_sample_rate = 16384;
+            spec_wanted.m_channels = 1;
+            break;
+        }
+
+        if(!m_audioCvt.openInFile(in_path.toStdString(), musicArgs.toStdString(), nullptr, &spec_wanted))
         {
             log_file(LogCategory::SkippedInvalid, in_path);
             m_audioCvt.close();

_common/AudioProcessor/audio_processor.cpp

@@ -114,7 +114,7 @@ const MDAudioFileSpec &MoondustAudioProcessor::getOutSpec() const
     return m_out_file->getSpec();
 }
 
-bool MoondustAudioProcessor::openInFile(const std::string &file, const std::string &argsString, int *detectedFormat)
+bool MoondustAudioProcessor::openInFile(const std::string &file, const std::string &argsString, int *detectedFormat, const MDAudioFileSpecWanted *spec_wanted)
 {
     AudioFormats format = FORMAT_UNKNOWN;
     MusicArgs args(argsString);
@@ -260,6 +260,9 @@ bool MoondustAudioProcessor::openInFile(const std::string &file, const std::stri
         return false;
     }
 
+    if(spec_wanted)
+        m_in_file->setWantedSpec(*spec_wanted);
+
     m_in_file->setArgs(args);
 
     if(!m_in_file->openRead(m_rw_in))

_common/AudioProcessor/audio_processor.h

@@ -79,7 +79,7 @@ class MoondustAudioProcessor
      */
     const MDAudioFileSpec &getOutSpec() const;
 
-    bool openInFile(const std::string &file, const std::string &args = std::string(), int *detectedFormat = nullptr);
+    bool openInFile(const std::string &file, const std::string &args = std::string(), int *detectedFormat = nullptr, const MDAudioFileSpecWanted *spec_wanted = nullptr);
     bool openOutFile(const std::string &file, int dstFormat, const MDAudioFileSpec &dstSpec);
 
     void close();

test/Maintainer/AudioConverterTest/coverter_dialogue.cpp

@@ -158,6 +158,7 @@ void CoverterDialogue::on_runCvt_clicked()
 
     QString inPath = ui->fileIn->text();
     QString inPathArgs;
+    MDAudioFileSpecWanted wanted;
     int argsBegin = inPath.indexOf('|');
 
     if(argsBegin >= 0)
@@ -166,7 +167,13 @@ void CoverterDialogue::on_runCvt_clicked()
         inPath.remove(argsBegin, inPath.size() - argsBegin);
     }
 
-    if(!m_cvt.openInFile(inPath.toStdString(), inPathArgs.toStdString()))
+    if(ui->channels->isChecked())
+        wanted.m_channels = ui->dstChannels->value();
+
+    if(ui->rate->isChecked())
+        wanted.m_sample_rate = ui->dstRate->value();
+
+    if(!m_cvt.openInFile(inPath.toStdString(), inPathArgs.toStdString(), nullptr, &wanted))
     {
         auto err = QString("Failed to open input file %1: %2").arg(inPath, QString::fromStdString(m_cvt.getLastError()));
         qWarning() << err;