[Scummvm-cvs-logs] CVS: tools compress.c,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Mon Dec 27 10:00:01 CET 2004


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25112

Modified Files:
	compress.c 
Log Message:
Properly encode raw stereo data to mp3 (not sure if that ever happens); do not force non-raw data to be encoded as mono (again not sure if that ever happened, but if it did, then only in BS1/2; if it did happen, then this change might cause regressions)

Index: compress.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- compress.c	27 Dec 2004 16:47:12 -0000	1.4
+++ compress.c	27 Dec 2004 17:59:09 -0000	1.5
@@ -134,12 +134,12 @@
 
 	case kMP3Mode:
 		tmp += sprintf(tmp, "lame -t ");
-		tmp += sprintf(tmp, "-m m ");	/* FIXME: Why do we always encode to mono? */
 		if (rawInput) {
 			tmp += sprintf(tmp, "-r ");
 			tmp += sprintf(tmp, "--bitwidth %d ", rawAudioType.bitsPerSample);
 			if (rawAudioType.isLittleEndian)
 				tmp += sprintf(tmp, "-x ");
+			tmp += sprintf(tmp, (rawAudioType.isStereo ? "-m j " : "-m m "));
 			tmp += sprintf(tmp, "-s %d ", rawSamplerate);
 		}
 





More information about the Scummvm-git-logs mailing list