1 files changed, 117 insertions, 31 deletions

diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h
index 922335508e..7c4577977d 100644
--- a/servers/audio/audio_stream.h
+++ b/servers/audio/audio_stream.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 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       */
@@ -40,6 +40,8 @@
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
 
+class AudioStream;
+
 class AudioStreamPlayback : public RefCounted {
 	GDCLASS(AudioStreamPlayback, RefCounted);
 
@@ -52,6 +54,7 @@ protected:
 	GDVIRTUAL0RC(float, _get_playback_position)
 	GDVIRTUAL1(_seek, float)
 	GDVIRTUAL3R(int, _mix, GDNativePtr<AudioFrame>, float, int)
+	GDVIRTUAL0(_tag_used_streams)
 public:
 	virtual void start(float p_from_pos = 0.0);
 	virtual void stop();
@@ -62,6 +65,8 @@ public:
 	virtual float get_playback_position() const;
 	virtual void seek(float p_time);
 
+	virtual void tag_used_streams();
+
 	virtual int mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames);
 };
 
@@ -72,19 +77,24 @@ class AudioStreamPlaybackResampled : public AudioStreamPlayback {
 		FP_BITS = 16, //fixed point used for resampling
 		FP_LEN = (1 << FP_BITS),
 		FP_MASK = FP_LEN - 1,
-		INTERNAL_BUFFER_LEN = 256,
+		INTERNAL_BUFFER_LEN = 128, // 128 warrants 3ms positional jitter at much at 44100hz
 		CUBIC_INTERP_HISTORY = 4
 	};
 
 	AudioFrame internal_buffer[INTERNAL_BUFFER_LEN + CUBIC_INTERP_HISTORY];
 	unsigned int internal_buffer_end = -1;
-	uint64_t mix_offset;
+	uint64_t mix_offset = 0;
 
 protected:
-	void _begin_resample();
+	void begin_resample();
 	// Returns the number of frames that were mixed.
-	virtual int _mix_internal(AudioFrame *p_buffer, int p_frames) = 0;
-	virtual float get_stream_sampling_rate() = 0;
+	virtual int _mix_internal(AudioFrame *p_buffer, int p_frames);
+	virtual float get_stream_sampling_rate();
+
+	GDVIRTUAL2R(int, _mix_resampled, GDNativePtr<AudioFrame>, int)
+	GDVIRTUAL0RC(float, _get_stream_sampling_rate)
+
+	static void _bind_methods();
 
 public:
 	virtual int mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
@@ -96,18 +106,42 @@ class AudioStream : public Resource {
 	GDCLASS(AudioStream, Resource);
 	OBJ_SAVE_TYPE(AudioStream); // Saves derived classes with common type so they can be interchanged.
 
+	enum {
+		MAX_TAGGED_OFFSETS = 8
+	};
+
+	uint64_t tagged_frame = 0;
+	uint64_t offset_count = 0;
+	float tagged_offsets[MAX_TAGGED_OFFSETS];
+
 protected:
 	static void _bind_methods();
 
-	GDVIRTUAL0RC(Ref<AudioStreamPlayback>, _instance_playback)
+	GDVIRTUAL0RC(Ref<AudioStreamPlayback>, _instantiate_playback)
 	GDVIRTUAL0RC(String, _get_stream_name)
 	GDVIRTUAL0RC(float, _get_length)
+	GDVIRTUAL0RC(bool, _is_monophonic)
+	GDVIRTUAL0RC(double, _get_bpm)
+	GDVIRTUAL0RC(bool, _has_loop)
+	GDVIRTUAL0RC(int, _get_bar_beats)
+	GDVIRTUAL0RC(int, _get_beat_count)
 
 public:
-	virtual Ref<AudioStreamPlayback> instance_playback();
+	virtual Ref<AudioStreamPlayback> instantiate_playback();
 	virtual String get_stream_name() const;
 
+	virtual double get_bpm() const;
+	virtual bool has_loop() const;
+	virtual int get_bar_beats() const;
+	virtual int get_beat_count() const;
+
 	virtual float get_length() const;
+	virtual bool is_monophonic() const;
+
+	void tag_used(float p_offset);
+	uint64_t get_tagged_frame() const;
+	uint32_t get_tagged_frame_count() const;
+	float get_tagged_frame_offset(int p_index) const;
 };
 
 // Microphone
@@ -118,17 +152,19 @@ class AudioStreamMicrophone : public AudioStream {
 	GDCLASS(AudioStreamMicrophone, AudioStream);
 	friend class AudioStreamPlaybackMicrophone;
 
-	Set<AudioStreamPlaybackMicrophone *> playbacks;
+	HashSet<AudioStreamPlaybackMicrophone *> playbacks;
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual Ref<AudioStreamPlayback> instance_playback() override;
+	virtual Ref<AudioStreamPlayback> instantiate_playback() override;
 	virtual String get_stream_name() const override;
 
 	virtual float get_length() const override; //if supported, otherwise return 0
 
+	virtual bool is_monophonic() const override;
+
 	AudioStreamMicrophone();
 };
 
@@ -136,14 +172,15 @@ class AudioStreamPlaybackMicrophone : public AudioStreamPlaybackResampled {
 	GDCLASS(AudioStreamPlaybackMicrophone, AudioStreamPlaybackResampled);
 	friend class AudioStreamMicrophone;
 
-	bool active;
-	unsigned int input_ofs;
+	bool active = false;
+	unsigned int input_ofs = 0;
 
 	Ref<AudioStreamMicrophone> microphone;
 
 protected:
 	virtual int _mix_internal(AudioFrame *p_buffer, int p_frames) override;
 	virtual float get_stream_sampling_rate() override;
+	virtual float get_playback_position() const override;
 
 public:
 	virtual int mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
@@ -154,51 +191,96 @@ public:
 
 	virtual int get_loop_count() const override; //times it looped
 
-	virtual float get_playback_position() const override;
 	virtual void seek(float p_time) override;
 
+	virtual void tag_used_streams() override;
+
 	~AudioStreamPlaybackMicrophone();
 	AudioStreamPlaybackMicrophone();
 };
 
 //
 
-class AudioStreamPlaybackRandomPitch;
+class AudioStreamPlaybackRandomizer;
 
-class AudioStreamRandomPitch : public AudioStream {
-	GDCLASS(AudioStreamRandomPitch, AudioStream);
-	friend class AudioStreamPlaybackRandomPitch;
+class AudioStreamRandomizer : public AudioStream {
+	GDCLASS(AudioStreamRandomizer, AudioStream);
 
-	Set<AudioStreamPlaybackRandomPitch *> playbacks;
-	Ref<AudioStream> audio_stream;
-	float random_pitch;
+public:
+	enum PlaybackMode {
+		PLAYBACK_RANDOM_NO_REPEATS,
+		PLAYBACK_RANDOM,
+		PLAYBACK_SEQUENTIAL,
+	};
+
+private:
+	friend class AudioStreamPlaybackRandomizer;
+
+	struct PoolEntry {
+		Ref<AudioStream> stream;
+		float weight;
+	};
+
+	HashSet<AudioStreamPlaybackRandomizer *> playbacks;
+	Vector<PoolEntry> audio_stream_pool;
+	float random_pitch_scale = 1.1f;
+	float random_volume_offset_db = 5.0f;
+
+	Ref<AudioStreamPlayback> instance_playback_random();
+	Ref<AudioStreamPlayback> instance_playback_no_repeats();
+	Ref<AudioStreamPlayback> instance_playback_sequential();
+
+	Ref<AudioStream> last_playback = nullptr;
+	PlaybackMode playback_mode = PLAYBACK_RANDOM_NO_REPEATS;
 
 protected:
 	static void _bind_methods();
 
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+
 public:
-	void set_audio_stream(const Ref<AudioStream> &p_audio_stream);
-	Ref<AudioStream> get_audio_stream() const;
+	void add_stream(int p_index);
+	void move_stream(int p_index_from, int p_index_to);
+	void remove_stream(int p_index);
 
-	void set_random_pitch(float p_pitch);
+	void set_stream(int p_index, Ref<AudioStream> p_stream);
+	Ref<AudioStream> get_stream(int p_index) const;
+	void set_stream_probability_weight(int p_index, float p_weight);
+	float get_stream_probability_weight(int p_index) const;
+
+	void set_streams_count(int p_count);
+	int get_streams_count() const;
+
+	void set_random_pitch(float p_pitch_scale);
 	float get_random_pitch() const;
 
-	virtual Ref<AudioStreamPlayback> instance_playback() override;
+	void set_random_volume_offset_db(float p_volume_offset_db);
+	float get_random_volume_offset_db() const;
+
+	void set_playback_mode(PlaybackMode p_playback_mode);
+	PlaybackMode get_playback_mode() const;
+
+	virtual Ref<AudioStreamPlayback> instantiate_playback() override;
 	virtual String get_stream_name() const override;
 
 	virtual float get_length() const override; //if supported, otherwise return 0
+	virtual bool is_monophonic() const override;
 
-	AudioStreamRandomPitch();
+	AudioStreamRandomizer();
 };
 
-class AudioStreamPlaybackRandomPitch : public AudioStreamPlayback {
-	GDCLASS(AudioStreamPlaybackRandomPitch, AudioStreamPlayback);
-	friend class AudioStreamRandomPitch;
+class AudioStreamPlaybackRandomizer : public AudioStreamPlayback {
+	GDCLASS(AudioStreamPlaybackRandomizer, AudioStreamPlayback);
+	friend class AudioStreamRandomizer;
 
-	Ref<AudioStreamRandomPitch> random_pitch;
+	Ref<AudioStreamRandomizer> randomizer;
 	Ref<AudioStreamPlayback> playback;
 	Ref<AudioStreamPlayback> playing;
+
 	float pitch_scale;
+	float volume_scale;
 
 public:
 	virtual void start(float p_from_pos = 0.0) override;
@@ -212,7 +294,11 @@ public:
 
 	virtual int mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
 
-	~AudioStreamPlaybackRandomPitch();
+	virtual void tag_used_streams() override;
+
+	~AudioStreamPlaybackRandomizer();
 };
 
+VARIANT_ENUM_CAST(AudioStreamRandomizer::PlaybackMode);
+
 #endif // AUDIO_STREAM_H