ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU: Global volume control

This commit is contained in:
Connor McLaughlin 2019-10-20 16:44:08 +10:00
parent f3cd100b16
commit 33f1cf4fd4
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/spu.cpp
View File

@ -790,12 +790,12 @@ std::tuple<s32, s32> SPU::SampleVoice(u32 voice_index)
}
// interpolate/sample and apply ADSR volume
const s32 sample = ApplyVolumeUnsaturated(voice.Interpolate(), voice.regs.adsr_volume);
const s32 sample = ApplyVolume(voice.Interpolate(), voice.regs.adsr_volume);
voice.TickADSR();
// apply per-channel volume
const s16 left = ApplyVolumeUnsaturated(sample, voice.regs.volume_left.GetVolume());
const s16 right = ApplyVolumeUnsaturated(sample, voice.regs.volume_right.GetVolume());
const s32 left = ApplyVolume(sample, voice.regs.volume_left.GetVolume());
const s32 right = ApplyVolume(sample, voice.regs.volume_right.GetVolume());
return std::make_tuple(left, right);
}
@ -821,6 +821,12 @@ void SPU::GenerateSample()
left_sum += left;
right_sum += right;
}
if (!m_SPUCNT.mute_n)
{
left_sum = 0;
right_sum = 0;
}
}
// Mix in CD audio.
@ -831,9 +837,11 @@ void SPU::GenerateSample()
right_sum += s32(m_cd_audio_buffer.Pop());
}
// Log_DebugPrintf("SPU sample %d %d", left_sum, right_sum);
AudioStream::SampleType samples[2] = {Clamp16(left_sum), Clamp16(right_sum)};
m_audio_stream->WriteSamples(samples, 1);
// Apply main volume before clamping.
std::array<AudioStream::SampleType, 2> out_samples;
out_samples[0] = Clamp16(ApplyVolume(left_sum, m_main_volume_left.GetVolume()));
out_samples[1] = Clamp16(ApplyVolume(right_sum, m_main_volume_right.GetVolume()));
m_audio_stream->WriteSamples(out_samples.data(), 1);
#if 0
static FILE* fp = nullptr;
@ -841,7 +849,7 @@ void SPU::GenerateSample()
fp = std::fopen("D:\\spu.raw", "wb");
if (fp)
{
std::fwrite(samples, sizeof(AudioStream::SampleType), 2, fp);
std::fwrite(out_samples.data(), sizeof(AudioStream::SampleType), 2, fp);
std::fflush(fp);
}
#endif

5
src/core/spu.h
View File

@ -72,7 +72,7 @@ private:
u16 bits;
BitField<u16, bool, 15, 1> enable;
BitField<u16, bool, 14, 1> mute;
BitField<u16, bool, 14, 1> mute_n;
BitField<u16, u8, 10, 4> noise_frequency_shift;
BitField<u16, u8, 8, 2> noise_frequency_step;
BitField<u16, bool, 7, 1> reverb_master_enable;
@ -256,8 +256,7 @@ private:
return (value < -0x8000) ? -0x8000 : (value > 0x7FFF) ? 0x7FFF : static_cast<s16>(value);
}
static constexpr s16 ApplyVolume(s16 sample, s16 volume) { return Clamp16((s32(sample) * s32(volume)) >> 15); }
static constexpr s32 ApplyVolumeUnsaturated(s32 sample, s16 volume) { return (sample * s32(volume)) >> 15; }
static constexpr s32 ApplyVolume(s32 sample, s16 volume) { return (sample * s32(volume)) >> 15; }
static ADSRPhase GetNextADSRPhase(ADSRPhase phase);