Merge pull request #232 from birarda/master

variable fixes for audio mixer loopback
This commit is contained in:
birarda 2013-05-07 14:32:44 -07:00
commit e69b0c17a3

View file

@ -123,6 +123,8 @@ void *sendBuffer(void *args) {
float bearingRelativeAngleToSource = 0.f; float bearingRelativeAngleToSource = 0.f;
float attenuationCoefficient = 1.f; float attenuationCoefficient = 1.f;
int numSamplesDelay = 0;
float weakChannelAmplitudeRatio = 1.f;
if (otherAgent != agent) { if (otherAgent != agent) {
float *agentPosition = agentRingBuffer->getPosition(); float *agentPosition = agentRingBuffer->getPosition();
@ -189,8 +191,8 @@ void *sendBuffer(void *args) {
* offAxisCoefficient; * offAxisCoefficient;
float sinRatio = fabsf(sinf(bearingRelativeAngleToSource)); float sinRatio = fabsf(sinf(bearingRelativeAngleToSource));
int numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio; numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
float weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio); weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio);
} }
int16_t* goodChannel = bearingRelativeAngleToSource > 0 ? clientMix + BUFFER_LENGTH_SAMPLES_PER_CHANNEL : clientMix; int16_t* goodChannel = bearingRelativeAngleToSource > 0 ? clientMix + BUFFER_LENGTH_SAMPLES_PER_CHANNEL : clientMix;