Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed non-functional low pass filter

Browse source
This commit is contained in:
ZappoMan 2014-04-15 12:54:59 -07:00
parent 9d49a53434
commit 74828a3215
4 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
interface/src/Audio.cpp
View file

@ -819,14 +819,6 @@ void Audio::processReceivedAudio(AudioRingBuffer& ringBuffer) {
}
// add the next numNetworkOutputSamples from each QByteArray
// in our _localInjectionByteArrays QVector to the localInjectedSamples
if (Menu::getInstance()->isOptionChecked(MenuOption::LowPassFilter)) {
int channels = _desiredOutputFormat.channelCount();
int filterSamples = numNetworkOutputSamples / channels;
lowPassFilter(ringBufferSamples, filterSamples, channels);
}
// copy the packet from the RB to the output
linearResampling(ringBufferSamples,
(int16_t*) outputBuffer.data(),
@ -956,37 +948,6 @@ void Audio::addProceduralSounds(int16_t* monoInput, int numSamples) {
}
}
// simple 3 pole low pass filter
void Audio::lowPassFilter(int16_t* inputBuffer, int samples, int channels) {
//qDebug() << "lowPassFilter() samples=" << samples << " channels=" << channels;
//const int POLE_COUNT = 3;
for (int c = 0; c < channels; c++) {
const float C1 = 0.25f; // 0.0f; //
const float C2 = 0.5f; // 1.0f; //
const float C3 = 0.25f; // 0.0f; //
int16_t S1,S2,S3;
S1 = inputBuffer[c]; // start with the Nth sample, based on the current channel, this is the fist sample for the channel
for (int i = 0; i < samples; i++) {
int sampleAt = (i * channels) + c;
int nextSampleAt = sampleAt + channels;
S2 = inputBuffer[sampleAt];
if (i == samples - 1) {
S3 = inputBuffer[sampleAt];
} else {
S3 = inputBuffer[nextSampleAt];
}
// save our S1 for next time before we mod this
S1 = inputBuffer[sampleAt];
inputBuffer[sampleAt] = (C1 * S1) + (C2 * S2) + (C3 * S3);
//qDebug() << "channel=" << c << " sampleAt=" << sampleAt;
}
}
}
// Starts a collision sound. magnitude is 0-1, with 1 the loudest possible sound.
void Audio::startCollisionSound(float magnitude, float frequency, float noise, float duration, bool flashScreen) {
_collisionSoundMagnitude = magnitude;

2
interface/src/Audio.h
View file

@ -55,8 +55,6 @@ public:
void setJitterBufferSamples(int samples) { _jitterBufferSamples = samples; }
int getJitterBufferSamples() { return _jitterBufferSamples; }
void lowPassFilter(int16_t* inputBuffer, int samples, int channels);
virtual void startCollisionSound(float magnitude, float frequency, float noise, float duration, bool flashScreen);
virtual void startDrumSound(float volume, float frequency, float duration, float decay);

4
interface/src/Menu.cpp
View file

@ -383,10 +383,6 @@ Menu::Menu() :
appInstance->getAudio(),
SLOT(toggleToneInjection()));
addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::LowPassFilter,
Qt::CTRL | Qt::SHIFT | Qt::Key_F,
false);
QMenu* spatialAudioMenu = audioDebugMenu->addMenu("Spatial Audio");
addCheckableActionToQMenuAndActionHash(spatialAudioMenu, MenuOption::AudioSpatialProcessing,

1
interface/src/Menu.h
View file

@ -293,7 +293,6 @@ namespace MenuOption {
const QString Login = "Login";
const QString Logout = "Logout";
const QString LookAtVectors = "Look-at Vectors";
const QString LowPassFilter = "Low Pass Filter";
const QString MetavoxelEditor = "Metavoxel Editor...";
const QString Metavoxels = "Metavoxels";
const QString Mirror = "Mirror";