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

More audio fixes.

Browse source
This commit is contained in:
matsukaze 2014-04-04 16:17:49 -07:00
parent 33d4cb6497
commit 9e157ff1c5
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/Audio.cpp
View file

@ -624,7 +624,7 @@ unsigned int Audio::timeValToSampleTick(const quint64 time, int sampleRate) {
return sample; return sample;
} }
void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, QByteArray& spatialAudio, unsigned int numSamples) { void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& spatialAudio, unsigned int numSamples) {
// Calculate the number of remaining samples available. The source spatial audio buffer will get // Calculate the number of remaining samples available. The source spatial audio buffer will get
// clipped if there are insufficient samples available in the accumulation buffer. // clipped if there are insufficient samples available in the accumulation buffer.
@ -673,10 +673,12 @@ void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, QByteArray& spatial
unsigned int accumulationCt = (_spatialAudioFinish - sampleTime) * _desiredOutputFormat.channelCount(); unsigned int accumulationCt = (_spatialAudioFinish - sampleTime) * _desiredOutputFormat.channelCount();
accumulationCt = (accumulationCt < numSamples) ? accumulationCt : numSamples; accumulationCt = (accumulationCt < numSamples) ? accumulationCt : numSamples;
int16_t* spatial = reinterpret_cast<int16_t*>(spatialAudio.data()); const int16_t* spatial = reinterpret_cast<const int16_t*>(spatialAudio.data());
int j = 0; int j = 0;
for (int i = accumulationCt; --i >= 0; j++) { for (int i = accumulationCt; --i >= 0; j++) {
int tmp = _spatialAudioRingBuffer[j + offset] + spatial[j]; int t1 = _spatialAudioRingBuffer[j + offset];
int t2 = spatial[j];
int tmp = t1 + t2;
_spatialAudioRingBuffer[j + offset] = _spatialAudioRingBuffer[j + offset] =
static_cast<int16_t>(glm::clamp<int>(tmp, std::numeric_limits<short>::min(), std::numeric_limits<short>::max())); static_cast<int16_t>(glm::clamp<int>(tmp, std::numeric_limits<short>::min(), std::numeric_limits<short>::max()));
} }
@ -686,6 +688,7 @@ void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, QByteArray& spatial
sampleCt = (remaining < sampleCt) ? remaining : sampleCt; sampleCt = (remaining < sampleCt) ? remaining : sampleCt;
if (sampleCt) { if (sampleCt) {
_spatialAudioRingBuffer.writeSamples((int16_t*)spatialAudio.data() + accumulationCt, sampleCt); _spatialAudioRingBuffer.writeSamples((int16_t*)spatialAudio.data() + accumulationCt, sampleCt);
// Extend the finish time by the amount of unoverlapped samples
_spatialAudioFinish += sampleCt / _desiredOutputFormat.channelCount(); _spatialAudioFinish += sampleCt / _desiredOutputFormat.channelCount();
} }
} }
@ -744,12 +747,12 @@ void Audio::processReceivedAudio(unsigned int sampleTime, AudioRingBuffer& ringB
if (_processSpatialAudio) { if (_processSpatialAudio) {
unsigned int sampleTime = _spatialAudioStart; unsigned int sampleTime = _spatialAudioStart;
QByteArray buffer; QByteArray buffer;
buffer.resize(numDeviceOutputSamples * sizeof(int16_t)); buffer.resize(numNetworkOutputSamples * sizeof(int16_t));
ringBuffer.readSamples((int16_t*)buffer.data(), numDeviceOutputSamples); ringBuffer.readSamples((int16_t*)buffer.data(), numNetworkOutputSamples);
// Accumulate direct transmission of audio from sender to receiver // Accumulate direct transmission of audio from sender to receiver
addSpatialAudioToBuffer(sampleTime, buffer, numNetworkOutputSamples); addSpatialAudioToBuffer(sampleTime, buffer, numNetworkOutputSamples);
//addSpatialAudioToBuffer(sampleTime + 48000, ringBuffer); //addSpatialAudioToBuffer(sampleTime + 48000, buffer, numNetworkOutputSamples);
// Send audio off for spatial processing // Send audio off for spatial processing
emit processSpatialAudio(sampleTime, buffer, _desiredOutputFormat); emit processSpatialAudio(sampleTime, buffer, _desiredOutputFormat);
@ -759,7 +762,7 @@ void Audio::processReceivedAudio(unsigned int sampleTime, AudioRingBuffer& ringB
_spatialAudioRingBuffer.readSamples(ringBufferSamples, numNetworkOutputSamples); _spatialAudioRingBuffer.readSamples(ringBufferSamples, numNetworkOutputSamples);
// Advance the start point for the next packet of audio to arrive // Advance the start point for the next packet of audio to arrive
_spatialAudioStart += numNetworkOutputSamples; _spatialAudioStart += numNetworkOutputSamples / _desiredOutputFormat.channelCount();
// Advance the read position by the same amount // Advance the read position by the same amount
//ringBuffer.shiftReadPosition(numNetworkOutputSamples); //ringBuffer.shiftReadPosition(numNetworkOutputSamples);
@ -838,6 +841,11 @@ void Audio::toggleToneInjection() {
void Audio::toggleAudioSpatialProcessing() { void Audio::toggleAudioSpatialProcessing() {
_processSpatialAudio = !_processSpatialAudio; _processSpatialAudio = !_processSpatialAudio;
if (_processSpatialAudio) {
_spatialAudioStart = 0;
_spatialAudioFinish = 0;
_spatialAudioRingBuffer.reset();
}
} }
// Take a pointer to the acquired microphone input samples and add procedural sounds // Take a pointer to the acquired microphone input samples and add procedural sounds

2
interface/src/Audio.h
View file

@ -78,7 +78,7 @@ public slots:
void start(); void start();
void stop(); void stop();
void addReceivedAudioToBuffer(const QByteArray& audioByteArray); void addReceivedAudioToBuffer(const QByteArray& audioByteArray);
void addSpatialAudioToBuffer(unsigned int sampleTime, QByteArray& spatialAudio, unsigned int numSamples); void addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& spatialAudio, unsigned int numSamples);
void handleAudioInput(); void handleAudioInput();
void reset(); void reset();
void toggleMute(); void toggleMute();