Merge pull request #3432 from Desdaemon/upstream-master

Audio: Add support for panning

Author: Ghabry

src/audio.cpp

@@ -33,7 +33,7 @@ AudioInterface& Audio() {
 	return default_;
 }
 
-void EmptyAudio::BGM_Play(Filesystem_Stream::InputStream, int, int, int) {
+void EmptyAudio::BGM_Play(Filesystem_Stream::InputStream, int, int, int, int) {
 	bgm_starttick = Player::GetFrames();
 	playing = true;
 }

src/audio.h

@@ -61,8 +61,9 @@ struct AudioInterface {
 	 * @param volume volume.
 	 * @param pitch pitch.
 	 * @param fadein fadein.
+	 * @param balance balance (0 - 100)
 	 */
-	virtual void BGM_Play(Filesystem_Stream::InputStream stream, int volume, int pitch, int fadein) = 0;
+	virtual void BGM_Play(Filesystem_Stream::InputStream stream, int volume, int pitch, int fadein, int balance) = 0;
 
 	/**
 	 * Stops the currently playing background music.
@@ -118,6 +119,11 @@ struct AudioInterface {
 	 */
 	virtual void BGM_Pitch(int pitch) = 0;
 
+	/**
+	 * Adjusts the balance of the currently playing background music.
+	 */
+	virtual void BGM_Balance(int balance) = 0;
+
 	/**
 	 * @return Type of music being played.
 	 */
@@ -129,8 +135,9 @@ struct AudioInterface {
 	 * @param se se to play.
 	 * @param volume volume.
 	 * @param pitch pitch.
+	 * @param balance balance (0 - 100)
 	 */
-	virtual void SE_Play(std::unique_ptr<AudioSeCache> se, int volume, int pitch) = 0;
+	virtual void SE_Play(std::unique_ptr<AudioSeCache> se, int volume, int pitch, int balance) = 0;
 
 	/**
 	 * Stops the currently playing sound effect.
@@ -162,7 +169,7 @@ struct AudioInterface {
 struct EmptyAudio : public AudioInterface {
 public:
 	explicit EmptyAudio(const Game_ConfigAudio& cfg);
-	void BGM_Play(Filesystem_Stream::InputStream, int, int, int) override;
+	void BGM_Play(Filesystem_Stream::InputStream, int, int, int, int) override;
 	void BGM_Pause() override {}
 	void BGM_Resume() override {}
 	void BGM_Stop() override;
@@ -172,8 +179,9 @@ struct EmptyAudio : public AudioInterface {
 	void BGM_Fade(int) override {}
 	void BGM_Volume(int) override {}
 	void BGM_Pitch(int) override {};
+	void BGM_Balance(int) override {}
 	std::string BGM_GetType() const override { return {}; };
-	void SE_Play(std::unique_ptr<AudioSeCache>, int, int) override {}
+	void SE_Play(std::unique_ptr<AudioSeCache>, int, int, int) override {}
 	void SE_Stop() override {}
 	void Update() override {}
 	void vGetConfig(Game_ConfigAudio& cfg) const override;

src/audio_decoder.cpp

@@ -17,9 +17,11 @@
 
 // Headers
 #include <cassert>
+#include <cmath>
 #include <cstdint>
 #include <cstring>
 #include "audio_decoder.h"
+#include "audio_decoder_base.h"
 #include "audio_midi.h"
 #include "audio_resampler.h"
 #include "output.h"
@@ -175,16 +177,16 @@ void AudioDecoder::Update(std::chrono::microseconds delta) {
 
 	volume += static_cast<float>(std::chrono::duration_cast<std::chrono::microseconds>(delta).count()) * delta_volume_step;
 	volume = Utils::Clamp(static_cast<float>(volume), 0.0f, 100.0f);
-	log_volume = AdjustVolume(volume);
+	ApplyLogVolume();
 }
 
-int AudioDecoder::GetVolume() const {
-	return static_cast<int>(log_volume);
+StereoVolume AudioDecoder::GetVolume() const {
+	return log_volume;
 }
 
 void AudioDecoder::SetVolume(int new_volume) {
 	volume = Utils::Clamp(static_cast<float>(new_volume), 0.0f, 100.0f);
-	log_volume = AdjustVolume(volume);
+	ApplyLogVolume();
 }
 
 void AudioDecoder::SetFade(int end, std::chrono::milliseconds duration) {
@@ -200,6 +202,11 @@ void AudioDecoder::SetFade(int end, std::chrono::milliseconds duration) {
 	delta_volume_step = (static_cast<float>(fade_volume_end) - volume) / fade_time.count();
 }
 
+void AudioDecoder::SetBalance(int balance) {
+	AudioDecoderBase::SetBalance(balance);
+	ApplyLogVolume();
+}
+
 int AudioDecoder::GetSamplesizeForFormat(AudioDecoderBase::Format format) {
 	switch (format) {
 		case AudioDecoderBase::Format::S8:
@@ -217,3 +224,17 @@ int AudioDecoder::GetSamplesizeForFormat(AudioDecoderBase::Format format) {
 	assert(false && "Bad format");
 	return -1;
 }
+
+void AudioDecoder::ApplyLogVolume() {
+	float base_gain = AdjustVolume(volume);
+	int balance = GetBalance();
+	float left_gain = 1.f, right_gain = 1.f;
+	constexpr float pan_exp = 0.5012f;
+	if (balance <= 50) {
+		right_gain = std::pow(pan_exp, (50 - balance) / 10.f);
+	} else {
+		left_gain = std::pow(pan_exp, (balance - 50) / 10.f);
+	}
+	log_volume.left_volume = base_gain * left_gain;
+	log_volume.right_volume = base_gain * right_gain;
+}

src/audio_decoder.h

@@ -71,7 +71,7 @@ class AudioDecoder : public AudioDecoderBase {
 	 *
 	 * @return current volume (from 0 - 100)
 	 */
-	int GetVolume() const final override;
+	StereoVolume GetVolume() const final override;
 
 	/**
 	 * Sets the volume of the audio decoder.
@@ -100,14 +100,21 @@ class AudioDecoder : public AudioDecoderBase {
 	 * @param delta Time in us since the last call of this function.
 	 */
 	void Update(std::chrono::microseconds delta) final override;
+
+	/**
+	 * Sets the pan/balance of the audio decoder.
+	 */
+	void SetBalance(int new_balance) override;
 private:
 	bool paused = false;
 	float volume = 0.0f;
-	float log_volume = 0.0f; // as used by RPG_RT
+	StereoVolume log_volume = {0.f, 0.f}; // as used by RPG_RT
 
 	int fade_volume_end = 0;
 	std::chrono::microseconds fade_time = std::chrono::microseconds(0);
 	float delta_volume_step = 0.0f;
+
+	void ApplyLogVolume();
 };
 
 #endif

src/audio_decoder_base.cpp

@@ -26,7 +26,7 @@
 float AudioDecoderBase::AdjustVolume(float volume) {
 	// Adjust to RPG_RT (Direct Sound) volume scale
 	if (volume > 0) {
-		return 100.0f * std::pow(10.0f, (-100 + volume) / 60.0f);
+		return 100.0f * std::pow(10.0f, -(35.0f / 20.0f) * (1.0f - volume / 100.0f));
 	}
 	return 0.0f;
 }
@@ -73,6 +73,14 @@ int AudioDecoderBase::GetLoopCount() const {
 	return loop_count;
 }
 
+int AudioDecoderBase::GetBalance() const {
+	return balance;
+}
+
+void AudioDecoderBase::SetBalance(int new_balance) {
+	balance = Utils::Clamp(new_balance, 0, 100);
+}
+
 bool AudioDecoderBase::WasInited() const {
 	return true;
 }

src/audio_decoder_base.h

@@ -27,6 +27,15 @@
 #include <chrono>
 #include "filesystem_stream.h"
 
+/**
+ * Stereo volume for left and right channels.
+ * Both values are in the range 0 - 100.
+ */
+struct StereoVolume {
+	float left_volume;
+	float right_volume;
+};
+
 /**
  * The AudioDecoder class provides an abstraction over the decoding of
  * common audio formats.
@@ -107,6 +116,18 @@ class AudioDecoderBase {
 	 */
 	virtual int GetLoopCount() const;
 
+	/**
+	 * Gets the current balance of the audio decoder.
+	 * The value is in the range 0 - 100, where 0 is full left, 100 is full right
+	 */
+	virtual int GetBalance() const;
+
+	/**
+	 * Sets the balance of the audio decoder.
+	 * The value is clamped to the range 0 - 100.
+	 */
+	virtual void SetBalance(int new_balance);
+
 	// Functions to be implemented by the audio decoder
 	/**
 	 * Assigns a stream to the audio decoder.
@@ -131,9 +152,9 @@ class AudioDecoderBase {
 	 * Gets the current volume of the audio decoder.
 	 * Fades are considered.
 	 *
-	 * @return current volume (from 0 - 100)
+	 * @return left-right pair of current volume (from 0 - 100)
 	 */
-	virtual int GetVolume() const = 0;
+	virtual StereoVolume GetVolume() const = 0;
 
 	/**
 	 * Sets the current volume of the audio decoder.
@@ -282,6 +303,7 @@ class AudioDecoderBase {
 
 	bool looping = false;
 	int loop_count = 0;
+	int balance = 50;
 
 	int Decode(uint8_t* buffer, int length, int recursion_depth);
 };

src/audio_decoder_midi.cpp

@@ -17,10 +17,12 @@
 
 #include <array>
 #include <algorithm>
+#include <cmath>
 #include "audio.h"
 #include "audio_decoder_midi.h"
 #include "midisequencer.h"
 #include "output.h"
+#include "utils.h"
 
 using namespace std::chrono_literals;
 
@@ -38,6 +40,7 @@ constexpr int samples_per_play = 64 / sample_divider;
 
 static const uint8_t midi_set_reg_param_upper = 0x6;
 static const uint8_t midi_control_volume = 0x7;
+static const uint8_t midi_control_pan = 0xA;
 static const uint8_t midi_event_control_change = 0xB;
 static const uint8_t midi_set_reg_param_lower = 0x26;
 static const uint8_t midi_control_all_sound_off = 0x78;
@@ -66,6 +69,10 @@ static uint32_t midimsg_volume(uint8_t channel, uint8_t volume) {
 	return midimsg_make(midi_event_control_change, channel, midi_control_volume, volume);
 }
 
+static uint32_t midimsg_pan(uint8_t channel, uint8_t pan) {
+	return midimsg_make(midi_event_control_change, channel, midi_control_pan, pan);
+}
+
 static uint32_t midimsg_reset_all_controller(uint8_t channel) {
 	return midimsg_make(midi_event_control_change, channel, midi_control_reset_all_controller, 0);
 }
@@ -112,6 +119,7 @@ AudioDecoderMidi::AudioDecoderMidi(std::unique_ptr<MidiDecoder> mididec)
 	: mididec(std::move(mididec)) {
 	seq = std::make_unique<midisequencer::sequencer>();
 	channel_volumes.fill(127);
+	midi_requested_channel_pans.fill(64);
 	music_type = "midi";
 }
 
@@ -175,14 +183,14 @@ void AudioDecoderMidi::Resume() {
 	}
 }
 
-int AudioDecoderMidi::GetVolume() const {
+StereoVolume AudioDecoderMidi::GetVolume() const {
 	// When handled by Midi messages fake a 100 otherwise the volume is adjusted twice
 
 	if (!mididec->SupportsMidiMessages()) {
-		return static_cast<int>(log_volume);
+		return log_volume;
 	}
 
-	return 100;
+	return {100, 100};
 }
 
 void AudioDecoderMidi::SetVolume(int new_volume) {
@@ -195,9 +203,7 @@ void AudioDecoderMidi::SetVolume(int new_volume) {
 		mididec->SendMidiMessage(msg);
 	}
 
-	if (!mididec->SupportsMidiMessages()) {
-		log_volume = AdjustVolume(volume * 100.0f);
-	}
+	ApplyLogVolume();
 }
 
 void AudioDecoderMidi::SetFade(int end, std::chrono::milliseconds duration) {
@@ -214,6 +220,16 @@ void AudioDecoderMidi::SetFade(int end, std::chrono::milliseconds duration) {
 	delta_volume_step = (fade_volume_end - volume) / fade_steps;
 }
 
+void AudioDecoderMidi::SetBalance(int new_balance) {
+	AudioDecoderBase::SetBalance(new_balance);
+	ApplyLogVolume();
+
+	for (int channel = 0; channel < 16; channel++) {
+		uint32_t msg = midimsg_pan(channel, ChannelPan(midi_requested_channel_pans[channel]));
+		mididec->SendMidiMessage(msg);
+	}
+}
+
 bool AudioDecoderMidi::Seek(std::streamoff offset, std::ios_base::seekdir origin) {
 	assert(!tempo.empty());
 
@@ -251,9 +267,7 @@ void AudioDecoderMidi::Update(std::chrono::microseconds delta) {
 	}
 	if (fade_steps > 0 && mtime - last_fade_mtime > 0.1s) {
 		volume = Utils::Clamp<float>(volume + delta_volume_step, 0.0f, 1.0f);
-		if (!mididec->SupportsMidiMessages()) {
-			log_volume = AdjustVolume(volume * 100.0f);
-		}
+		ApplyLogVolume();
 		for (int i = 0; i < 16; i++) {
 			uint32_t msg = midimsg_volume(i, static_cast<uint8_t>(channel_volumes[i] * volume * global_volume));
 			mididec->SendMidiMessage(msg);
@@ -392,6 +406,9 @@ void AudioDecoderMidi::midi_message(int, uint_least32_t message) {
 		channel_volumes[channel] = value2;
 		// Send the modified volume to midiout
 		message = midimsg_volume(channel, static_cast<uint8_t>(value2 * volume * global_volume));
+	} else if (event_type == midi_event_control_change && value1 == midi_control_pan) {
+		midi_requested_channel_pans[channel] = value2;
+		message = midimsg_pan(channel, ChannelPan(value2));
 	}
 	if (midimsg_validate(message)) {
 		mididec->SendMidiMessage(message);
@@ -480,3 +497,23 @@ int AudioDecoderMidi::MidiTempoData::GetSamples(std::chrono::microseconds mtime_
 	int ticks_since_last = static_cast<int>(ticks_per_us * delta.count());
 	return samples + static_cast<int>(ticks_since_last * samples_per_tick);
 }
+
+void AudioDecoderMidi::ApplyLogVolume() {
+	if (!mididec->SupportsMidiMessages()) {
+		float base_gain = AdjustVolume(volume);
+		int balance = GetBalance();
+		float left_gain = 1.f, right_gain = 1.f;
+		constexpr float pan_exp = 0.5012f;
+		if (balance <= 50) {
+			right_gain = std::pow(pan_exp, (50 - balance) / 10.f);
+		} else {
+			left_gain = std::pow(pan_exp, (balance - 50) / 10.f);
+		}
+		log_volume.left_volume = base_gain * left_gain;
+		log_volume.right_volume = base_gain * right_gain;
+	}
+}
+
+int AudioDecoderMidi::ChannelPan(int desired_pan) const {
+	return Utils::Clamp(desired_pan + ((GetBalance() - 50) * 2), 0, 127);
+}