Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 05:57:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactoring in the audio-mixer for spherical injector and FreeVerb

Browse source
This commit is contained in:
Stephen Birarda 2013-06-05 15:55:39 -07:00
parent 2db7b5de4e
commit 60b018b8b2
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
audio-mixer/src/main.cpp
View file

@ -129,6 +129,8 @@ int main(int argc, const char* argv[]) {
// zero out the client mix for this agent // zero out the client mix for this agent
memset(clientSamples, 0, sizeof(clientSamples)); memset(clientSamples, 0, sizeof(clientSamples));
const int PHASE_DELAY_AT_90 = 20;
for (AgentList::iterator otherAgent = agentList->begin(); otherAgent != agentList->end(); otherAgent++) { for (AgentList::iterator otherAgent = agentList->begin(); otherAgent != agentList->end(); otherAgent++) {
if (((PositionalAudioRingBuffer*) otherAgent->getLinkedData())->willBeAddedToMix() if (((PositionalAudioRingBuffer*) otherAgent->getLinkedData())->willBeAddedToMix()
&& (otherAgent != agent || (otherAgent == agent && agentRingBuffer->shouldLoopbackForAgent()))) { && (otherAgent != agent || (otherAgent == agent && agentRingBuffer->shouldLoopbackForAgent()))) {
@ -143,10 +145,10 @@ int main(int argc, const char* argv[]) {
stk::FreeVerb* otherAgentFreeVerb = NULL; stk::FreeVerb* otherAgentFreeVerb = NULL;
if (otherAgent != agent) { if (otherAgent != agent) {
glm::vec3 listenerPosition = agentRingBuffer->getPosition(); glm::vec3 listenerPosition = agentRingBuffer->getPosition();
glm::vec3 relativePosition = otherAgentBuffer->getPosition() - agentRingBuffer->getPosition(); glm::vec3 relativePosition = otherAgentBuffer->getPosition() - agentRingBuffer->getPosition();
glm::quat inverseOrientation = glm::inverse(agentRingBuffer->getOrientation()); glm::quat inverseOrientation = glm::inverse(agentRingBuffer->getOrientation());
glm::vec3 rotatedSourcePosition = inverseOrientation * relativePosition;
float distanceSquareToSource = glm::dot(relativePosition, relativePosition); float distanceSquareToSource = glm::dot(relativePosition, relativePosition);
float radius = 0.0f; float radius = 0.0f;
@ -161,19 +163,10 @@ int main(int argc, const char* argv[]) {
if (radius > 0) { if (radius > 0) {
// this is a spherical source - the distance used for the coefficient // this is a spherical source - the distance used for the coefficient
// needs to be the closest point on the boundary to the source // needs to be the closest point on the boundary to the source
// multiply the normalized vector between the center of the sphere
// and the position of the source by the radius to get the
// closest point on the boundary of the sphere to the source
glm::vec3 closestPoint = glm::normalize(relativePosition) * radius;
// for the other calculations the agent position is the closest point on the sphere
rotatedSourcePosition = inverseOrientation * closestPoint;
// ovveride the distance to the agent with the distance to the point on the // ovveride the distance to the agent with the distance to the point on the
// boundary of the sphere // boundary of the sphere
distanceSquareToSource = glm::distance2(listenerPosition, -closestPoint); distanceSquareToSource -= (radius * radius);
} else { } else {
// calculate the angle delivery for off-axis attenuation // calculate the angle delivery for off-axis attenuation
@ -193,6 +186,8 @@ int main(int argc, const char* argv[]) {
attenuationCoefficient *= offAxisCoefficient; attenuationCoefficient *= offAxisCoefficient;
} }
glm::vec3 rotatedSourcePosition = inverseOrientation * relativePosition;
const float DISTANCE_SCALE = 2.5f; const float DISTANCE_SCALE = 2.5f;
const float GEOMETRIC_AMPLITUDE_SCALAR = 0.3f; const float GEOMETRIC_AMPLITUDE_SCALAR = 0.3f;
const float DISTANCE_LOG_BASE = 2.5f; const float DISTANCE_LOG_BASE = 2.5f;
@ -216,7 +211,6 @@ int main(int argc, const char* argv[]) {
glm::vec3(0.0f, 1.0f, 0.0f)); glm::vec3(0.0f, 1.0f, 0.0f));
const float PHASE_AMPLITUDE_RATIO_AT_90 = 0.5; const float PHASE_AMPLITUDE_RATIO_AT_90 = 0.5;
const int PHASE_DELAY_AT_90 = 20;
// figure out the number of samples of delay and the ratio of the amplitude // figure out the number of samples of delay and the ratio of the amplitude
// in the weak channel for audio spatialization // in the weak channel for audio spatialization
@ -245,7 +239,7 @@ int main(int argc, const char* argv[]) {
float effectMix = powf(2.0f, (0.5f * logf(distanceSquareToSource) float effectMix = powf(2.0f, (0.5f * logf(distanceSquareToSource)
/ logf(2.0f)) - DISTANCE_REVERB_LOG_REMAINDER) / logf(2.0f)) - DISTANCE_REVERB_LOG_REMAINDER)
* DISTANCE_REVERB_MAX_WETNESS / 64.0f;; * DISTANCE_REVERB_MAX_WETNESS / 64.0f;
otherAgentFreeVerb->setEffectMix(effectMix); otherAgentFreeVerb->setEffectMix(effectMix);
} }
@ -266,24 +260,28 @@ int main(int argc, const char* argv[]) {
if (s < numSamplesDelay) { if (s < numSamplesDelay) {
// pull the earlier sample for the delayed channel // pull the earlier sample for the delayed channel
int earlierSample = delaySamplePointer[s] int earlierSample = delaySamplePointer[s]
* attenuationCoefficient * attenuationCoefficient
* weakChannelAmplitudeRatio; * weakChannelAmplitudeRatio;
// apply the STK FreeVerb effect
if (otherAgentFreeVerb) {
earlierSample = otherAgentFreeVerb->tick(earlierSample);
}
plateauAdditionOfSamples(delayedChannel[s], earlierSample); plateauAdditionOfSamples(delayedChannel[s], earlierSample);
} }
int16_t currentSample = (otherAgentBuffer->getNextOutput()[s] * attenuationCoefficient); int16_t currentSample = otherAgentBuffer->getNextOutput()[s];
// apply the STK FreeVerb effect // apply the STK FreeVerb effect
if (otherAgentFreeVerb) { if (otherAgentFreeVerb) {
currentSample = otherAgentFreeVerb->tick(currentSample); currentSample = otherAgentFreeVerb->tick(currentSample);
if (s >= BUFFER_LENGTH_SAMPLES_PER_CHANNEL - PHASE_DELAY_AT_90) {
// there is the possiblity this will be re-used as a delayed sample
// so store the reverbed sample so that is what will be pulled
otherAgentBuffer->getNextOutput()[s] = currentSample;
}
} }
currentSample *= attenuationCoefficient;
plateauAdditionOfSamples(goodChannel[s], currentSample); plateauAdditionOfSamples(goodChannel[s], currentSample);
if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) { if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {