Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 22:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11530 from kencooke/audio-mac-bugfix

Browse source 
Fix microphone audio on the Mac
This commit is contained in:
Chris Collins 2017-10-05 15:57:56 -07:00 committed by GitHub
commit c8301890e6
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libraries/audio/src/AudioDynamics.h
View file

@ -31,6 +31,9 @@
#define MULQ31(a,b) ((int32_t)(MUL64(a, b) >> 31))
#define MULDIV64(a,b,c) (int32_t)(MUL64(a, b) / (c))
#define ADDMOD32(a,b) (int32_t)((uint32_t)(a) + (uint32_t)(b))
#define SUBMOD32(a,b) (int32_t)((uint32_t)(a) - (uint32_t)(b))
//
// on x86 architecture, assume that SSE2 is present
//
@ -394,19 +397,21 @@ public:
// Fast FIR attack/lowpass filter using a 2-stage CIC filter.
// The step response reaches final value after N-1 samples.
// NOTE: CIC integrators intentionally overflow, using modulo arithmetic.
// See E. B. Hogenauer, "An economical class of digital filters for decimation and interpolation"
const int32_t CICGAIN = 0xffffffff / (CIC1 * CIC2); // Q32
x = MULHI(x, CICGAIN);
_buffer[i] = _acc1;
_acc1 += x; // integrator
_acc1 = ADDMOD32(_acc1, x); // integrator
i = (i + CIC1 - 1) & MASK;
x = _acc1 - _buffer[i]; // comb
x = SUBMOD32(_acc1, _buffer[i]); // comb
_buffer[i] = _acc2;
_acc2 += x; // integrator
_acc2 = ADDMOD32(_acc2, x); // integrator
i = (i + CIC2 - 1) & MASK;
x = _acc2 - _buffer[i]; // comb
x = SUBMOD32(_acc2, _buffer[i]); // comb
_index = (i + 1) & MASK; // skip unused tap
return x;
@ -459,19 +464,21 @@ public:
// Fast FIR attack/lowpass filter using a 2-stage CIC filter.
// The step response reaches final value after N-1 samples.
// NOTE: CIC integrators intentionally overflow, using modulo arithmetic.
// See E. B. Hogenauer, "An economical class of digital filters for decimation and interpolation"
const int32_t CICGAIN = 0xffffffff / (CIC1 * CIC2); // Q32
x = MULHI(x, CICGAIN);
_buffer[i] = _acc1;
_acc1 += x; // integrator
_acc1 = ADDMOD32(_acc1, x); // integrator
i = (i + CIC1 - 1) & MASK;
x = _acc1 - _buffer[i]; // comb
x = SUBMOD32(_acc1, _buffer[i]); // comb
_buffer[i] = _acc2;
_acc2 += x; // integrator
_acc2 = ADDMOD32(_acc2, x); // integrator
i = (i + CIC2 - 1) & MASK;
x = _acc2 - _buffer[i]; // comb
x = SUBMOD32(_acc2, _buffer[i]); // comb
_index = (i + 1) & MASK; // skip unused tap
return x;

8
libraries/audio/src/AudioGate.cpp
View file

@ -6,12 +6,12 @@
// Copyright 2017 High Fidelity, Inc.
//
#include "AudioGate.h"
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <cstdlib>
#include "AudioDynamics.h"
#include "AudioGate.h"
// log2 domain headroom bits above 0dB (int32_t)
static const int LOG2_HEADROOM_Q30 = 1;
@ -418,7 +418,7 @@ void GateMono<N>::process(int16_t* input, int16_t* output, int numFrames) {
_dc.process(x);
// peak detect
int32_t peak = std::abs(x);
int32_t peak = abs(x);
// convert to log2 domain
peak = fixlog2(peak);