Merge pull request hrydgard#15009 from unknownbrackets/audio-cleanup

Audio: Correct protection against time skew
unknownbrackets · Oct 11, 2021 · bb64c17 · bb64c17
2 parents e91b8af + b1e31d8
commit bb64c17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
@@ -283,7 +283,7 @@ void StereoResampler::PushSamples(const s32 *samples, unsigned int numSamples) {
 	}
 
 	// Check if we need to roll over to the start of the buffer during the copy.
-	int indexW_left_samples = m_maxBufsize * 2 - (indexW & INDEX_MASK);
+	unsigned int indexW_left_samples = m_maxBufsize * 2 - (indexW & INDEX_MASK);
 	if (numSamples * 2 > indexW_left_samples) {
 		ClampBufferToS16WithVolume(&m_buffer[indexW & INDEX_MASK], samples, indexW_left_samples);
 		ClampBufferToS16WithVolume(&m_buffer[0], samples + indexW_left_samples, numSamples * 2 - indexW_left_samples);

diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp
@@ -345,7 +345,7 @@ int BackgroundAudio::Play() {
 
 	double now = time_now_d();
 	int sz = 44100 / 60;
-	if (lastPlaybackTime_ > 0.0 && lastPlaybackTime_ >= now) {
+	if (lastPlaybackTime_ > 0.0 && lastPlaybackTime_ <= now) {
 		sz = (int)((now - lastPlaybackTime_) * 44100);
 	}
 	sz = std::min(BUFSIZE / 2, sz);