M src/platform/sdl/sdl-audio.c → src/platform/sdl/sdl-audio.c

@@ -46,9 +46,10 @@ int32_t left[BUFFER_SIZE];
 	int32_t right[BUFFER_SIZE];
 
 	// toRead is in GBA samples
+	// TODO: Do this with fixed-point math
 	int toRead = samples / context->ratio;
 	while (samples > 0) {
-		int currentRead = BUFFER_SIZE >> 2;
+		int currentRead = BUFFER_SIZE >> 1;
 		if (currentRead > toRead) {
 			currentRead = toRead;
 		}
@@ -57,22 +58,25 @@ toRead -= read;
 		unsigned i;
 		for (i = 0; i < read; ++i) {
 			context->drift += context->ratio;
-			while (context->drift >= 0) {
+			while (context->drift >= 1.f) {
 				output->left = left[i];
 				output->right = right[i];
 				++output;
 				--samples;
-#ifndef NDEBUG
+				context->drift -= 1.f;
 				if (samples < 0) {
-					abort();
+					return;
 				}
-#endif
-				context->drift -= 1.f;
 			}
 		}
 		if (read < BUFFER_SIZE >> 2) {
-			memset(output, 0, toRead);
-			return;
+			if (samples > 1) {
+				memset(output, 0, samples * sizeof(struct StereoSample));
+				return;
+			} else {
+				// Account for lost sample due to floating point conversion
+				toRead = 1;
+			}
 		}
 	}
 }