From 120233eebde9cff978661b86f5372e0a7646ec20 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sun, 21 Dec 2008 04:14:16 +0000
Subject: [PATCH] - OggMod improperly decodes the right channel of stereo
 samples when sending   them to OggEnc, so I have no choice but to convert
 them to mono by chopping   off the right channel and only using the left
 channel information.

SVN r1327 (trunk)
---
 docs/rh-log.txt      |  5 +++++
 dumb/src/it/readxm.c | 42 ++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 68a1872d9..3aaa379d7 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,8 @@
+December 20, 2008
+- OggMod improperly decodes the right channel of stereo samples when sending
+  them to OggEnc, so I have no choice but to convert them to mono by chopping
+  off the right channel and only using the left channel information.
+
 December 19, 2008
 - Fixed: OggMod passes the raw sample data to OggEnc for stereo samples, so
   the resultant Vorbis stream is not actually stereo but mono with the right
diff --git a/dumb/src/it/readxm.c b/dumb/src/it/readxm.c
index 13633339f..502e0fa14 100644
--- a/dumb/src/it/readxm.c
+++ b/dumb/src/it/readxm.c
@@ -660,6 +660,18 @@ static int it_xm_read_sample_data(IT_SAMPLE *sample, unsigned char roguebytes, D
 			outlen <<= 1;
 		}
 
+		if (sample->flags & IT_SAMPLE_STEREO)
+		{
+			/* OggMod knows nothing of stereo samples and compresses them as mono,
+			 * screwing up the second channel. (Because for whatever reason,
+			 * ModPlug delta encodes them independantly, even though it presents
+			 * the sample as a double-length mono sound to other players.)
+			 */
+			sample->flags &= ~IT_SAMPLE_STEREO;
+			outlen >>= 1;
+			sample->loop_start >>= 1;
+			sample->loop_end >>= 1;
+		}
 		output = dumb_decode_vorbis(outlen, (char *)sample->data + 4, datasizebytes - 4);
 		if (output != NULL)
 		{
@@ -674,28 +686,6 @@ static int it_xm_read_sample_data(IT_SAMPLE *sample, unsigned char roguebytes, D
 			}
 
 			it_xm_fixup_sample_points(sample);
-			/* Stereo samples are still passed to OggEnc as mono sounds, just like
-			 * uncompressed samples, so we need to interleave them now. */
-			ibuffer = malloc(sample->length << 2);
-			if (ibuffer == NULL)
-			{
-				/* No memory => ignore stereo bits at the end */
-				sample->flags &= ~IT_SAMPLE_STEREO;
-			}
-			else
-			{
-				for (i = 0; i < sample->length; ++i)
-				{
-					((short *)ibuffer)[i*2]   = ((short *)sample->data)[i];
-					((short *)ibuffer)[i*2+1] = ((short *)sample->data)[i + sample->length];
-				}
-				for (i = 0; i < sample->length; ++i)
-				{
-					((short *)ibuffer)[i*2+1] -= ((short *)ibuffer)[sample->length*2 - 1];
-				}
-				free(sample->data);
-				sample->data = ibuffer;
-			}
 			return 0;
 		}
 		/* Decode failed, so assume it's normal sample data that just so
@@ -895,7 +885,9 @@ static DUMB_IT_SIGDATA *it_xm_load_sigdata(DUMBFILE *f, int * version)
 			int buffersize = 0;
 			for (i = 0; i < sigdata->n_patterns; i++) {
 				if (it_xm_read_pattern(&sigdata->pattern[i], f, n_channels, &buffer, &buffersize, * version) != 0) {
-					free(buffer);
+					if (buffer != NULL) {
+						free(buffer);
+					}
 					_dumb_it_unload_sigdata(sigdata);
 					return NULL;
 				}
@@ -1087,7 +1079,9 @@ static DUMB_IT_SIGDATA *it_xm_load_sigdata(DUMBFILE *f, int * version)
 			int buffersize = 0;
 			for (i = 0; i < sigdata->n_patterns; i++) {
 				if (it_xm_read_pattern(&sigdata->pattern[i], f, n_channels, &buffer, &buffersize, * version) != 0) {
-					free(buffer);
+					if (buffer != NULL) {
+						free(buffer);
+					}
 					free(roguebytes);
 					_dumb_it_unload_sigdata(sigdata);
 					return NULL;