Merge unpitched rates rewrite 2 #1323

src/Etterna/Singletons/GameSoundManager.cpp

@@ -287,6 +287,8 @@ GameSoundManager::StartMusic(MusicToPlay& ToPlay)
 		p.m_fFadeOutSeconds = ToPlay.fFadeOutLengthSeconds;
 		p.m_StartTime = when;
 		p.m_bAccurateSync = ToPlay.bAccurateSync;
+		if (ToPlay.bApplyMusicRate)
+			p.m_fSpeed = GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate;
 		if (ToPlay.bForceLoop)
 			p.StopMode = RageSoundParams::M_LOOP;
 		NewMusic->m_Music->SetParams(p);

src/RageUtil/CMakeLists.txt

@@ -151,6 +151,7 @@ list(APPEND SMDATA_RAGE_SOUND_SRC
   "Sound/RageSoundReader_Preload.cpp"
   "Sound/RageSoundReader_Resample_Good.cpp"
   "Sound/RageSoundReader_SpeedChange.cpp"
+  "Sound/RageSoundReader_SpeedChange_Good.cpp"
   "Sound/RageSoundReader_ThreadedBuffer.cpp"
   "Sound/RageSoundReader_WAV.cpp"
   "Sound/RageSoundUtil.cpp"
@@ -173,6 +174,7 @@ list(APPEND SMDATA_RAGE_SOUND_HPP
   "Sound/RageSoundReader_Preload.h"
   "Sound/RageSoundReader_Resample_Good.h"
   "Sound/RageSoundReader_SpeedChange.h"
+  "Sound/RageSoundReader_SpeedChange_Good.h"
   "Sound/RageSoundReader_ThreadedBuffer.h"
   "Sound/RageSoundReader_WAV.h"
   "Sound/RageSoundUtil.h"

src/RageUtil/Sound/RageSound.cpp

@@ -242,12 +242,12 @@ RageSound::Load(const std::string& sSoundFilePath,
 	m_pSource = new RageSoundReader_Extend(m_pSource);
 	if (bNeedBuffer)
 		m_pSource = new RageSoundReader_ThreadedBuffer(m_pSource);
-	m_pSource = new RageSoundReader_PostBuffering(m_pSource);
 
 	if (pParams->m_bSupportRateChanging) {
 		auto* pRate = new RageSoundReader_PitchChange(m_pSource);
 		m_pSource = pRate;
 	}
+	m_pSource = new RageSoundReader_PostBuffering(m_pSource);
 
 	if (pParams->m_bSupportPan)
 		m_pSource = new RageSoundReader_Pan(m_pSource);

src/RageUtil/Sound/RageSoundReader_PitchChange.cpp

@@ -13,14 +13,23 @@
 #include "RageSoundReader_PitchChange.h"
 #include "RageSoundReader_Resample_Good.h"
 #include "RageSoundReader_SpeedChange.h"
+#include "RageSoundReader_SpeedChange_Good.h"
+
+static Preference<bool> g_StepmaniaUnpitchRates("StepmaniaUnpitchRates", false);
 
 RageSoundReader_PitchChange::RageSoundReader_PitchChange(
   RageSoundReader* pSource)
   : RageSoundReader_Filter(nullptr)
 {
-	m_pSpeedChange = new RageSoundReader_SpeedChange(pSource);
-	m_pResample = new RageSoundReader_Resample_Good(
-	  m_pSpeedChange, m_pSpeedChange->GetSampleRate());
+	bool bMepstania = g_StepmaniaUnpitchRates.Get();
+	if (bMepstania) {
+		m_pSpeedChange = new RageSoundReader_SpeedChange(pSource, bMepstania);
+		m_pResample = new RageSoundReader_Resample_Good(m_pSpeedChange, m_pSpeedChange->GetSampleRate());
+	} else {
+		m_pSpeedChangeGood = new RageSoundReader_SpeedChange_Good(pSource);
+		m_pSpeedChange = new RageSoundReader_SpeedChange(m_pSpeedChangeGood, bMepstania);
+		m_pResample = new RageSoundReader_Resample_Good(m_pSpeedChange, m_pSpeedChange->GetSampleRate());
+	}
 	m_pSource = std::unique_ptr<RageSoundReader_Resample_Good>(m_pResample);
 	m_fSpeedRatio = 1.0f;
 	m_fPitchRatio = 1.0f;
@@ -44,6 +53,11 @@ RageSoundReader_PitchChange::RageSoundReader_PitchChange(
 	ASSERT_M(pspdchng != nullptr,
 			 "Dynamic cast to RageSoundReader SpeedChange failed at runtime.");
 	m_pSpeedChange = pspdchng;
+	auto pspdchnggd =
+	  dynamic_cast<RageSoundReader_SpeedChange_Good*>(m_pSpeedChange->GetSource());
+	ASSERT_M(pspdchnggd != nullptr,
+			 "Dynamic cast to RageSoundReader SpeedChange failed at runtime.");
+	m_pSpeedChangeGood = pspdchnggd;
 	m_fSpeedRatio = cpy.m_fSpeedRatio;
 	m_fPitchRatio = cpy.m_fPitchRatio;
 	m_fLastSetSpeedRatio = cpy.m_fLastSetSpeedRatio;
@@ -73,7 +87,22 @@ RageSoundReader_PitchChange::Read(float* pBuf, int iFrames)
 		m_pResample->SetRate(m_fPitchRatio);
 		float fActualPitchRatio = m_pResample->GetRate();
 		float fRequestedSpeedRatio = m_fSpeedRatio / fActualPitchRatio;
-		m_pSpeedChange->SetSpeedRatio(fRequestedSpeedRatio);
+
+		bool bMepstania = g_StepmaniaUnpitchRates.Get();
+		if (bMepstania) {
+			m_pSpeedChange->SetSpeedRatio(fRequestedSpeedRatio);
+		} else {
+			// SpeedChange_Good is bad at downrates, but bad in a different way than SpeedChange.
+			// And both sound okay for small down rates. So doing half the down rate in one and then the other
+			// sounds better than either one alone.......
+			if ((fRequestedSpeedRatio >= 0.5f) && (fRequestedSpeedRatio < 1.0f)) {
+				m_pSpeedChange->SetSpeedRatio(sqrtf(fRequestedSpeedRatio * 1.05f));
+				m_pSpeedChangeGood->SetSpeedRatio(sqrtf(fRequestedSpeedRatio / 1.05f));
+			} else {
+				m_pSpeedChange->SetSpeedRatio(1.0f);
+				m_pSpeedChangeGood->SetSpeedRatio(fRequestedSpeedRatio);
+			}
+		}
 
 		m_fLastSetSpeedRatio = m_fSpeedRatio;
 		m_fLastSetPitchRatio = m_fPitchRatio;

src/RageUtil/Sound/RageSoundReader_PitchChange.h

@@ -7,6 +7,7 @@
 #include "RageSoundReader_Filter.h"
 
 class RageSoundReader_SpeedChange;
+class RageSoundReader_SpeedChange_Good;
 class RageSoundReader_Resample_Good;
 
 class RageSoundReader_PitchChange : public RageSoundReader_Filter
@@ -29,6 +30,8 @@ class RageSoundReader_PitchChange : public RageSoundReader_Filter
   private:
 	RageSoundReader_SpeedChange*
 	  m_pSpeedChange; // freed by RageSoundReader_Filter
+	RageSoundReader_SpeedChange_Good*
+	  m_pSpeedChangeGood; // freed by RageSoundReader_Filter
 	RageSoundReader_Resample_Good*
 	  m_pResample; // freed by RageSoundReader_Filter
 

src/RageUtil/Sound/RageSoundReader_SpeedChange.cpp

@@ -5,13 +5,11 @@
 
 #include <algorithm>
 
-static Preference<bool> g_StepmaniaUnpitchRates("StepmaniaUnpitchRates", false);
-
 RageSoundReader_SpeedChange::RageSoundReader_SpeedChange(
-  RageSoundReader* pSource)
+  RageSoundReader* pSource, bool bStepMania)
   : RageSoundReader_Filter(pSource)
-  , m_iWindowSize(g_StepmaniaUnpitchRates ? 30 : 70)
-  , m_bMidSideEncoding(!g_StepmaniaUnpitchRates)
+  , m_iWindowSize(bStepMania ? 30 : 70)
+  , m_bMidSideEncoding(!bStepMania)
 {
 	m_Channels.resize(pSource->GetNumChannels());
 	m_fSpeedRatio = m_fTrailingSpeedRatio = 1.0f;

src/RageUtil/Sound/RageSoundReader_SpeedChange.h

@@ -12,7 +12,7 @@
 class RageSoundReader_SpeedChange : public RageSoundReader_Filter
 {
   public:
-	RageSoundReader_SpeedChange(RageSoundReader* pSource);
+	RageSoundReader_SpeedChange(RageSoundReader* pSource, bool bStepMania);
 
 	virtual int SetPosition(int iFrame);
 	virtual int Read(float* pBuf, int iFrames);