- fixed endless loop in replay gain analyzer when getting passed musi…

…c with an unhandled sample rate.
ZDoom · Jul 17, 2021 · 3748f60 · 3748f60
1 parent 45dcbbc
commit 3748f60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/source/common/audio/music/music.cpp b/source/common/audio/music/music.cpp
@@ -613,17 +613,20 @@ static void CheckReplayGain(const char *musicname, EMidiDevice playertype, const
 	ZMusic_Close(handle);
 
 	GainAnalyzer analyzer;
-	analyzer.InitGainAnalysis(fmt.mSampleRate);
-	int result = analyzer.AnalyzeSamples(lbuffer.Data(), rbuffer.Size() == 0 ? nullptr : rbuffer.Data(), lbuffer.Size(), rbuffer.Size() == 0? 1: 2);
+	int result = analyzer.InitGainAnalysis(fmt.mSampleRate);
 	if (result == GAIN_ANALYSIS_OK)
 	{
-		auto gain = analyzer.GetTitleGain();
-		Printf("Calculated replay gain for %s at %f dB\n", hash.GetChars(), gain);
+		result = analyzer.AnalyzeSamples(lbuffer.Data(), rbuffer.Size() == 0 ? nullptr : rbuffer.Data(), lbuffer.Size(), rbuffer.Size() == 0 ? 1 : 2);
+		if (result == GAIN_ANALYSIS_OK)
+		{
+			auto gain = analyzer.GetTitleGain();
+			Printf("Calculated replay gain for %s at %f dB\n", hash.GetChars(), gain);
 
-		gainMap.Insert(hash, gain);
-		mus_playing.replayGain = gain;
-		mus_playing.replayGainFactor = dBToAmplitude(mus_playing.replayGain + mus_gainoffset);
-		SaveGains();
+			gainMap.Insert(hash, gain);
+			mus_playing.replayGain = gain;
+			mus_playing.replayGainFactor = dBToAmplitude(mus_playing.replayGain + mus_gainoffset);
+			SaveGains();
+		}
 	}
 }
 

diff --git a/source/common/thirdparty/gain_analysis.cpp b/source/common/thirdparty/gain_analysis.cpp
@@ -251,6 +251,7 @@ GainAnalyzer::ResetSampleFrequency(int samplefreq) {
             freqindex = 9;
             break;
         case 11025:
+        case 11111: // SW shareware tries to play a VOC with this frequency as music. This is close enough to 11025 to use the same table.
             freqindex = 10;
             break;
         case 8000: