Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use QByteArray for processSpatialAudio() signal

Browse source
This commit is contained in:
ZappoMan 2014-04-02 18:48:28 -07:00
parent 42efb0db65
commit 7717a09f91
4 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Audio.cpp
View file

@ -734,14 +734,15 @@ void Audio::processReceivedAudio(unsigned int sampleTime, AudioRingBuffer& ringB
// Accumulate direct transmission of audio from sender to receiver
addSpatialAudioToBuffer(sampleTime, ringBuffer);
// Send audio off for spatial processing
emit processSpatialAudio(sampleTime, ringBuffer, _desiredOutputFormat);
// copy the samples we'll resample from the spatial audio ring buffer - this also
// pushes the read pointer of the spatial audio ring buffer forwards
_spatialAudioRingBuffer.readSamples(ringBufferSamples, numNetworkOutputSamples);
_spatialAudioStart += ringBuffer.samplesAvailable() / _desiredOutputFormat.channelCount();
// Send audio off for spatial processing
emit processSpatialAudio(sampleTime, QByteArray((char*)ringBufferSamples, numNetworkOutputSamples), _desiredOutputFormat);
} else {
// copy the samples we'll resample from the ring buffer - this also

2
interface/src/Audio.h
View file

@ -100,7 +100,7 @@ public slots:
signals:
bool muteToggled();
void processSpatialAudio(unsigned int sampleTime, AudioRingBuffer& ringBuffer, const QAudioFormat& format);
void processSpatialAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format);
private:

51
interface/src/AudioReflector.cpp
View file

@ -101,7 +101,7 @@ void AudioReflector::drawReflections(const glm::vec3& origin, const glm::vec3& o
void AudioReflector::calculateReflections(const glm::vec3& origin, const glm::vec3& originalDirection,
int bounces, const AudioRingBuffer& samplesRingBuffer,
int bounces, const QByteArray& originalSamples,
unsigned int sampleTime, int sampleRate) {
int samplesTouched = 0;
@ -117,10 +117,13 @@ void AudioReflector::calculateReflections(const glm::vec3& origin, const glm::ve
// set up our buffers for our attenuated and delayed samples
const int NUMBER_OF_CHANNELS = 2;
AudioRingBuffer attenuatedLeftSamples(samplesRingBuffer.samplesAvailable());
AudioRingBuffer attenuatedRightSamples(samplesRingBuffer.samplesAvailable());
int totalNumberOfSamples = originalSamples.size() / (sizeof(int16_t) * NUMBER_OF_CHANNELS);
const int16_t* originalSamplesData = (const int16_t*)originalSamples.constData();
AudioRingBuffer attenuatedLeftSamples(totalNumberOfSamples);
AudioRingBuffer attenuatedRightSamples(totalNumberOfSamples);
int totalNumberOfSamples = samplesRingBuffer.samplesAvailable();
for (int bounceNumber = 1; bounceNumber <= bounces; bounceNumber++) {
if (_voxels->findRayIntersection(start, direction, elementHit, distance, face)) {
@ -145,14 +148,18 @@ void AudioReflector::calculateReflections(const glm::vec3& origin, const glm::ve
// run through the samples, and attenuate them
for (int sample = 0; sample < totalNumberOfSamples; sample++) {
int16_t leftSample = samplesRingBuffer[sample * NUMBER_OF_CHANNELS];
int16_t rightSample = samplesRingBuffer[(sample * NUMBER_OF_CHANNELS) + 1];
int16_t leftSample = originalSamplesData[sample * NUMBER_OF_CHANNELS];
int16_t rightSample = originalSamplesData[(sample * NUMBER_OF_CHANNELS) + 1];
//qDebug() << "leftSample=" << leftSample << "rightSample=" << rightSample;
attenuatedLeftSamples[sample * NUMBER_OF_CHANNELS] = leftSample * leftEarAttenuation;
attenuatedLeftSamples[sample * NUMBER_OF_CHANNELS + 1] = 0;
attenuatedRightSamples[sample * NUMBER_OF_CHANNELS] = 0;
attenuatedRightSamples[sample * NUMBER_OF_CHANNELS + 1] = rightSample * rightEarAttenuation;
//qDebug() << "attenuated... leftSample=" << (leftSample * leftEarAttenuation) << "rightSample=" << (rightSample * rightEarAttenuation);
samplesTouched++;
}
@ -162,13 +169,15 @@ void AudioReflector::calculateReflections(const glm::vec3& origin, const glm::ve
unsigned int sampleTimeLeft = sampleTime + leftEarDelay;
unsigned int sampleTimeRight = sampleTime + rightEarDelay;
qDebug() << "sampleTimeLeft=" << sampleTimeLeft << "sampleTimeRight=" << sampleTimeRight;
_audio->addSpatialAudioToBuffer(sampleTimeLeft, attenuatedLeftSamples);
_audio->addSpatialAudioToBuffer(sampleTimeRight, attenuatedRightSamples);
}
}
}
void AudioReflector::processSpatialAudio(unsigned int sampleTime, AudioRingBuffer& ringBuffer, const QAudioFormat& format) {
void AudioReflector::processSpatialAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format) {
quint64 start = usecTimestampNow();
glm::vec3 origin = _myAvatar->getHead()->getPosition();
@ -191,21 +200,21 @@ void AudioReflector::processSpatialAudio(unsigned int sampleTime, AudioRingBuffe
const int BOUNCE_COUNT = 5;
calculateReflections(origin, frontRightUp, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, frontLeftUp, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, backRightUp, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, backLeftUp, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, frontRightDown, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, frontLeftDown, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, backRightDown, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, backLeftDown, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, frontRightUp, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, frontLeftUp, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, backRightUp, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, backLeftUp, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, frontRightDown, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, frontLeftDown, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, backRightDown, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, backLeftDown, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, front, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, back, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, left, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, right, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, up, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, down, BOUNCE_COUNT, ringBuffer, sampleTime, format.sampleRate());
calculateReflections(origin, front, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, back, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, left, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, right, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, up, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
calculateReflections(origin, down, BOUNCE_COUNT, samples, sampleTime, format.sampleRate());
quint64 end = usecTimestampNow();
//qDebug() << "AudioReflector::addSamples()... samples.size()=" << samples.size() << " elapsed=" << (end - start);

4
interface/src/AudioReflector.h
View file

@ -26,7 +26,7 @@ public:
void render();
public slots:
void processSpatialAudio(unsigned int sampleTime, AudioRingBuffer& ringBuffer, const QAudioFormat& format);
void processSpatialAudio(unsigned int sampleTime, const QByteArray& samples, const QAudioFormat& format);
signals:
@ -40,7 +40,7 @@ private:
void drawReflections(const glm::vec3& origin, const glm::vec3& direction, int bounces, const glm::vec3& color);
void calculateReflections(const glm::vec3& origin, const glm::vec3& originalDirection,
int bounces, const AudioRingBuffer& samplesRingBuffer,
int bounces, const QByteArray& samples,
unsigned int sampleTime, int sampleRate);
};