Trying to workaround the bug in loadPCMFromByteArray

sclements · sclements · commit 5ccb92f8d71a · 2015-05-19T22:54:22.000-06:00
diff --git a/src/scratch/ScratchSound.as b/src/scratch/ScratchSound.as
@@ -58,7 +58,7 @@ public class ScratchSound {
 		this.soundName = name;
 		if (sndData != null) {
 			try {
-				var info:* = WAVFile.decode(sndData);
+				var info:Object = WAVFile.decode(sndData);
 				if ([1, 3, 17].indexOf(info.encoding) == -1) throw Error('Unsupported WAV format');
 				soundData = sndData;
 				if (info.encoding == 17)
diff --git a/src/sound/WAVFile.as b/src/sound/WAVFile.as
@@ -91,6 +91,7 @@ public class WAVFile {
 			result.sampleCount = (result.bitsPerSample == 8) ? result.sampleDataSize : result.sampleDataSize / 2;
 		} else if (encoding == 3) {
 			result.sampleCount = Math.floor(result.sampleDataSize / (result.bitsPerSample >>> 3));
+			waveData.position = result.sampleDataStart;
 		} else if (encoding == 17) {
 			if (formatChunk.length < 20) throw Error("WAVFile: adpcm format chunk is too small");
 			if (result.channels != 1) throw Error("WAVFile: adpcm supports only one channel (monophonic)");
diff --git a/src/sound/mp3/MP3Loader.as b/src/sound/mp3/MP3Loader.as
@@ -57,7 +57,7 @@ public class MP3Loader {
 		function convertNextChunk():void {
 			buf.position = 0;
 			var count:int = mp3Snd.extract(buf, 4000);
-			if (count == 0) { // finished!
+			if (count == 0 || convertedSamples >= mp3SampleCount) { // finished!
 				if (Scratch.app.lp) Scratch.app.lp.setTitle('Compressing...');
 				setTimeout(compressSamples, 50);
 				return;
diff --git a/src/ui/media/MediaLibrary.as b/src/ui/media/MediaLibrary.as
@@ -686,13 +686,16 @@ spriteFeaturesFilter.visible = false; // disable features filter for now
 			SCRATCH::allow3d {
 				sound = new Sound();
 				try {
-					if (snd && snd.format == 'float')
-						sound.loadPCMFromByteArray(data, snd.sampleCount / snd.channels, "float", snd.channels == 2, snd.rate);
-					else {
+					var sampleCount:uint = 0;
+					if (snd && snd.format == 'float') {
+						sampleCount = snd.sampleCount / snd.channels;
+						sound.loadPCMFromByteArray(snd.soundData, sampleCount, "float", snd.channels == 2, snd.rate);
+					} else {
 						data.position = 0;
 						sound.loadCompressedDataFromByteArray(data, data.length);
+						sampleCount = sound.length * 44.1;
 					}
-					MP3Loader.extractSamples(origName, sound, sound.length * 44.1, function (out:ScratchSound):void {
+					MP3Loader.extractSamples(origName, sound, sampleCount, function (out:ScratchSound):void {
 						snd = out;
 						startSoundUpload(out, origName, uploadComplete);
 					});
