1 files changed, 50 insertions, 26 deletions

diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index 7de0695e8c..c651c177b5 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
+/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -30,6 +30,7 @@
 
 #include "audio_stream.h"
 #include "core/os/os.h"
+#include "core/project_settings.h"
 
 //////////////////////////////
 
@@ -48,8 +49,9 @@ void AudioStreamPlaybackResampled::_begin_resample() {
 void AudioStreamPlaybackResampled::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
 
 	float target_rate = AudioServer::get_singleton()->get_mix_rate();
+	float global_rate_scale = AudioServer::get_singleton()->get_global_rate_scale();
 
-	uint64_t mix_increment = uint64_t(((get_stream_sampling_rate() * p_rate_scale) / double(target_rate)) * double(FP_LEN));
+	uint64_t mix_increment = uint64_t(((get_stream_sampling_rate() * p_rate_scale) / double(target_rate * global_rate_scale)) * double(FP_LEN));
 
 	for (int i = 0; i < p_frames; i++) {
 
@@ -82,8 +84,8 @@ void AudioStreamPlaybackResampled::mix(AudioFrame *p_buffer, float p_rate_scale,
 				_mix_internal(internal_buffer + 4, INTERNAL_BUFFER_LEN);
 			} else {
 				//fill with silence, not playing
-				for (int i = 0; i < INTERNAL_BUFFER_LEN; ++i) {
-					internal_buffer[i + 4] = AudioFrame(0, 0);
+				for (int j = 0; j < INTERNAL_BUFFER_LEN; ++j) {
+					internal_buffer[j + 4] = AudioFrame(0, 0);
 				}
 			}
 			mix_offset -= (INTERNAL_BUFFER_LEN << FP_BITS);
@@ -132,27 +134,31 @@ AudioStreamMicrophone::AudioStreamMicrophone() {
 
 void AudioStreamPlaybackMicrophone::_mix_internal(AudioFrame *p_buffer, int p_frames) {
 
-	AudioDriver::get_singleton()->lock();
+	AudioServer::get_singleton()->lock();
 
-	Vector<int32_t> buf = AudioDriver::get_singleton()->get_input_buffer();
-	unsigned int input_size = AudioDriver::get_singleton()->get_input_size();
+	PoolVector<int32_t> capture_buffer = AudioServer::get_singleton()->get_capture_buffer();
+	unsigned int capture_size = AudioServer::get_singleton()->get_capture_size();
+	int mix_rate = AudioServer::get_singleton()->get_mix_rate();
+	unsigned int playback_delay = MIN(((50 * mix_rate) / 1000) * 2, capture_buffer.size() >> 1);
+#ifdef DEBUG_ENABLED
+	unsigned int capture_position = AudioServer::get_singleton()->get_capture_position();
+#endif
 
-	// p_frames is multiplied by two since an AudioFrame is stereo
-	if ((p_frames + MICROPHONE_PLAYBACK_DELAY * 2) > input_size) {
+	if (playback_delay > capture_size) {
 		for (int i = 0; i < p_frames; i++) {
 			p_buffer[i] = AudioFrame(0.0f, 0.0f);
 		}
-		input_ofs = 0;
+		capture_ofs = 0;
 	} else {
 		for (int i = 0; i < p_frames; i++) {
-			if (input_size >= input_ofs) {
-				float l = (buf[input_ofs++] >> 16) / 32768.f;
-				if (input_ofs >= buf.size()) {
-					input_ofs = 0;
+			if (capture_size > capture_ofs && (int)capture_ofs < capture_buffer.size()) {
+				float l = (capture_buffer[capture_ofs++] >> 16) / 32768.f;
+				if ((int)capture_ofs >= capture_buffer.size()) {
+					capture_ofs = 0;
 				}
-				float r = (buf[input_ofs++] >> 16) / 32768.f;
-				if (input_ofs >= buf.size()) {
-					input_ofs = 0;
+				float r = (capture_buffer[capture_ofs++] >> 16) / 32768.f;
+				if ((int)capture_ofs >= capture_buffer.size()) {
+					capture_ofs = 0;
 				}
 
 				p_buffer[i] = AudioFrame(l, r);
@@ -162,7 +168,13 @@ void AudioStreamPlaybackMicrophone::_mix_internal(AudioFrame *p_buffer, int p_fr
 		}
 	}
 
-	AudioDriver::get_singleton()->unlock();
+#ifdef DEBUG_ENABLED
+	if (capture_ofs > capture_position && (int)(capture_ofs - capture_position) < (p_frames * 2)) {
+		print_verbose(String(get_class_name()) + " buffer underrun: capture_position=" + itos(capture_position) + " capture_ofs=" + itos(capture_ofs) + " capture_size=" + itos(capture_size));
+	}
+#endif
+
+	AudioServer::get_singleton()->unlock();
 }
 
 void AudioStreamPlaybackMicrophone::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
@@ -174,17 +186,29 @@ float AudioStreamPlaybackMicrophone::get_stream_sampling_rate() {
 }
 
 void AudioStreamPlaybackMicrophone::start(float p_from_pos) {
-	input_ofs = 0;
 
-	AudioDriver::get_singleton()->capture_start();
+	if (active) {
+		return;
+	}
+
+	if (!GLOBAL_GET("audio/enable_audio_input")) {
+		WARN_PRINTS("Need to enable Project settings > Audio > Enable Audio Input option to use capturing.");
+		return;
+	}
+
+	capture_ofs = 0;
 
-	active = true;
-	_begin_resample();
+	if (AudioServer::get_singleton()->capture_start() == OK) {
+		active = true;
+		_begin_resample();
+	}
 }
 
 void AudioStreamPlaybackMicrophone::stop() {
-	AudioDriver::get_singleton()->capture_stop();
-	active = false;
+	if (active) {
+		AudioServer::get_singleton()->capture_stop();
+		active = false;
+	}
 }
 
 bool AudioStreamPlaybackMicrophone::is_playing() const {
@@ -200,7 +224,7 @@ float AudioStreamPlaybackMicrophone::get_playback_position() const {
 }
 
 void AudioStreamPlaybackMicrophone::seek(float p_time) {
-	return; // Can't seek a microphone input
+	// Can't seek a microphone input
 }
 
 AudioStreamPlaybackMicrophone::~AudioStreamPlaybackMicrophone() {