[Scummvm-git-logs] scummvm master -> df1fc611cda8fe9f96d33916ceb79f90041feeb4

[fracturehill]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
df1fc611cd Revert "AUDIO: Optimize case for !inStereo && outStereo"


Commit: df1fc611cda8fe9f96d33916ceb79f90041feeb4
    https://github.com/scummvm/scummvm/commit/df1fc611cda8fe9f96d33916ceb79f90041feeb4
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-21T15:01:14+02:00

Commit Message:
Revert "AUDIO: Optimize case for !inStereo && outStereo"

This reverts commit f4e399cf4fa5f56dabb52ea914e3cfd9f2b9ed17.

Changed paths:
    audio/rate.cpp
    audio/rate.h


diff --git a/audio/rate.cpp b/audio/rate.cpp
index 3b4db4c6867..c1007a09912 100644
--- a/audio/rate.cpp
+++ b/audio/rate.cpp
@@ -122,7 +122,7 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::copyConvert(AudioStr
 		outL = (inL * (int)volL) / Audio::Mixer::kMaxMixerVolume;
 		outR = (inR * (int)volR) / Audio::Mixer::kMaxMixerVolume;
 
-		if (inStereo && outStereo) {
+		if (outStereo) {
 			// Output left channel
 			clampedAdd(outBuffer[reverseStereo    ], outL);
 
@@ -132,12 +132,9 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::copyConvert(AudioStr
 			outBuffer += 2;
 		} else {
 			// Output mono channel
-			st_sample_t val = clampedAdd(outBuffer[0], (outL + outR) / 2);
+			clampedAdd(outBuffer[0], (outL + outR) / 2);
 
 			outBuffer += 1;
-
-			if (outStereo)
-				*outBuffer++ = val;
 		}
 	}
 
@@ -185,7 +182,7 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::simpleConvert(AudioS
 		outL = (inL * (int)volL) / Audio::Mixer::kMaxMixerVolume;
 		outR = (inR * (int)volR) / Audio::Mixer::kMaxMixerVolume;
 
-		if (inStereo && outStereo) {
+		if (outStereo) {
 			// output left channel
 			clampedAdd(outBuffer[reverseStereo    ], outL);
 
@@ -195,12 +192,9 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::simpleConvert(AudioS
 			outBuffer += 2;
 		} else {
 			// output mono channel
-			st_sample_t val = clampedAdd(outBuffer[0], (outL + outR) / 2);
+			clampedAdd(outBuffer[0], (outL + outR) / 2);
 
 			outBuffer += 1;
-
-			if (outStereo)
-				*outBuffer++ = val;
 		}
 	}
 	return (outBuffer - outStart) / (outStereo ? 2 : 1);
@@ -253,7 +247,7 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::interpolateConvert(A
 			outL = (inL * (int)volL) / Audio::Mixer::kMaxMixerVolume;
 			outR = (inR * (int)volR) / Audio::Mixer::kMaxMixerVolume;
 
-			if (inStereo && outStereo) {
+			if (outStereo) {
 				// Output left channel
 				clampedAdd(outBuffer[reverseStereo    ], outL);
 
@@ -263,12 +257,9 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::interpolateConvert(A
 				outBuffer += 2;
 			} else {
 				// Output mono channel
-				st_sample_t val = clampedAdd(outBuffer[0], (outL + outR) / 2);
+				clampedAdd(outBuffer[0], (outL + outR) / 2);
 
 				outBuffer += 1;
-
-				if (outStereo)
-					*outBuffer++ = val;
 			}
 
 			// Increment output position
diff --git a/audio/rate.h b/audio/rate.h
index 637a83e99fd..4fc0213038d 100644
--- a/audio/rate.h
+++ b/audio/rate.h
@@ -46,7 +46,7 @@ enum {
 	ST_SAMPLE_MIN = (-ST_SAMPLE_MAX - 1L)
 };
 
-static inline int16 clampedAdd(int16& a, int b) {
+static inline void clampedAdd(int16& a, int b) {
 	int val;
 #ifdef OUTPUT_UNSIGNED_AUDIO
 	val = (a ^ 0x8000) + b;
@@ -64,7 +64,6 @@ static inline int16 clampedAdd(int16& a, int b) {
 #else
 	a = val;
 #endif
-	return (int16)val;
 }
 
 /**