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

Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot

Browse source 
Conflicts:
	interface/src/AudioReflector.cpp
This commit is contained in:
ZappoMan 2014-04-03 16:22:29 -07:00
commit ed55700c27
3 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
interface/src/Audio.cpp
View file

@ -624,9 +624,9 @@ unsigned int Audio::timeValToSampleTick(const quint64 time, int sampleRate) {
return sample;
}
void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const AudioRingBuffer& spatialAudio) {
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.
unsigned int remaining = _spatialAudioRingBuffer.getSampleCapacity() - _spatialAudioRingBuffer.samplesAvailable();
@ -636,9 +636,9 @@ void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const AudioRingBuff
// Nothing in the spatial audio ring buffer yet
// Just do a straight copy, clipping if necessary
unsigned int sampleCt = (remaining < spatialAudio.samplesAvailable()) ? remaining : spatialAudio.samplesAvailable();
unsigned int sampleCt = (remaining < numSamples) ? remaining : numSamples;
if (sampleCt) {
_spatialAudioRingBuffer.writeSamples(spatialAudio.getNextOutput(), sampleCt);
_spatialAudioRingBuffer.writeSamples((int16_t*)spatialAudio.data(), sampleCt);
}
_spatialAudioFinish = _spatialAudioStart + sampleCt / _desiredOutputFormat.channelCount();
@ -655,35 +655,40 @@ void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const AudioRingBuff
// Recalculate the number of remaining samples
remaining -= silentCt;
unsigned int sampleCt = (remaining < spatialAudio.samplesAvailable()) ? remaining : spatialAudio.samplesAvailable();
unsigned int sampleCt = (remaining < numSamples) ? remaining : numSamples;
// Copy the new spatial audio to the accumulation ring buffer
if (sampleCt) {
_spatialAudioRingBuffer.writeSamples(spatialAudio.getNextOutput(), sampleCt);
_spatialAudioRingBuffer.writeSamples((int16_t*)spatialAudio.data(), sampleCt);
}
_spatialAudioFinish += (sampleCt + silentCt) / _desiredOutputFormat.channelCount();
}
} else {
// There is overlap between the spatial audio buffer and the new sample,
// acumulate the overlap
// Calculate the offset from the buffer's current read position, which should be located at _spatialAudioStart
unsigned int offset = (sampleTime - _spatialAudioStart) * _desiredOutputFormat.channelCount();
unsigned int accumulationCt = (_spatialAudioFinish - sampleTime) * _desiredOutputFormat.channelCount();
accumulationCt = (accumulationCt < spatialAudio.samplesAvailable()) ? accumulationCt : spatialAudio.samplesAvailable();
accumulationCt = (accumulationCt < numSamples) ? accumulationCt : numSamples;
const int16_t* spatial = reinterpret_cast<const int16_t*>(spatialAudio.data());
int j = 0;
for (int i = accumulationCt; --i >= 0; j++) {
int tmp = _spatialAudioRingBuffer[j + offset] + spatialAudio[j];
int t1 = _spatialAudioRingBuffer[j + offset];
int t2 = spatial[j];
int tmp = t1 + t2;
_spatialAudioRingBuffer[j + offset] =
static_cast<int16_t>(glm::clamp<int>(tmp, std::numeric_limits<short>::min(), std::numeric_limits<short>::max()));
}
// Copy the remaining unoverlapped spatial audio to the accumulation buffer, if any
unsigned int sampleCt = spatialAudio.samplesAvailable() - accumulationCt;
unsigned int sampleCt = numSamples - accumulationCt;
sampleCt = (remaining < sampleCt) ? remaining : sampleCt;
if (sampleCt) {
_spatialAudioRingBuffer.writeSamples(spatialAudio.getNextOutput() + accumulationCt, sampleCt);
_spatialAudioRingBuffer.writeSamples((int16_t*)spatialAudio.data() + accumulationCt, sampleCt);
// Extend the finish time by the amount of unoverlapped samples
_spatialAudioFinish += sampleCt / _desiredOutputFormat.channelCount();
}
}
@ -738,23 +743,29 @@ void Audio::processReceivedAudio(unsigned int sampleTime, AudioRingBuffer& ringB
//qDebug() << "pushing " << numNetworkOutputSamples;
ringBuffer.setIsStarved(false);
int16_t* ringBufferSamples= new int16_t[numNetworkOutputSamples];
int16_t* ringBufferSamples = new int16_t[numNetworkOutputSamples];
if (_processSpatialAudio) {
unsigned int sampleTime = _spatialAudioStart;
QByteArray buffer;
buffer.resize(numNetworkOutputSamples * sizeof(int16_t));
ringBuffer.readSamples((int16_t*)buffer.data(), numNetworkOutputSamples);
// Accumulate direct transmission of audio from sender to receiver
addSpatialAudioToBuffer(sampleTime, ringBuffer);
//addSpatialAudioToBuffer(sampleTime + 48000, ringBuffer);
addSpatialAudioToBuffer(sampleTime, buffer, numNetworkOutputSamples);
//addSpatialAudioToBuffer(sampleTime + 48000, buffer, numNetworkOutputSamples);
// Send audio off for spatial processing
emit processSpatialAudio(sampleTime, QByteArray((char*)ringBuffer.getBuffer(), numNetworkOutputSamples), _desiredOutputFormat);
emit processSpatialAudio(sampleTime, buffer, _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);
int samples = ringBuffer.samplesAvailable();
_spatialAudioStart += samples / _desiredOutputFormat.channelCount();
// Advance the start point for the next packet of audio to arrive
_spatialAudioStart += numNetworkOutputSamples / _desiredOutputFormat.channelCount();
ringBuffer.reset();
// Advance the read position by the same amount
//ringBuffer.shiftReadPosition(numNetworkOutputSamples);
} else {
@ -830,6 +841,11 @@ void Audio::toggleToneInjection() {
void Audio::toggleAudioSpatialProcessing() {
_processSpatialAudio = !_processSpatialAudio;
if (_processSpatialAudio) {
_spatialAudioStart = 0;
_spatialAudioFinish = 0;
_spatialAudioRingBuffer.reset();
}
}
// 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 stop();
void addReceivedAudioToBuffer(const QByteArray& audioByteArray);
void addSpatialAudioToBuffer(unsigned int sampleTime, const AudioRingBuffer& spatialAudio);
void addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& spatialAudio, unsigned int numSamples);
void handleAudioInput();
void reset();
void toggleMute();

17
interface/src/AudioReflector.cpp
View file

@ -163,10 +163,6 @@ void AudioReflector::echoReflections(const glm::vec3& origin, const glm::vec3& o
int16_t* attenuatedLeftSamplesData = (int16_t*)attenuatedLeftSamples.data();
int16_t* attenuatedRightSamplesData = (int16_t*)attenuatedRightSamples.data();
AudioRingBuffer attenuatedLeftBuffer(totalNumberOfSamples);
AudioRingBuffer attenuatedRightBuffer(totalNumberOfSamples);
for (int bounceNumber = 1; bounceNumber <= bounces; bounceNumber++) {
if (_voxels->findRayIntersection(start, direction, elementHit, distance, face)) {
glm::vec3 end = start + (direction * (distance * SLIGHTLY_SHORT));
@ -212,13 +208,8 @@ void AudioReflector::echoReflections(const glm::vec3& origin, const glm::vec3& o
//qDebug() << "sampleTimeLeft=" << sampleTimeLeft << "sampleTimeRight=" << sampleTimeRight;
attenuatedLeftBuffer.writeSamples(attenuatedLeftSamplesData, totalNumberOfSamples);
attenuatedRightBuffer.writeSamples(attenuatedRightSamplesData, totalNumberOfSamples);
_audio->addSpatialAudioToBuffer(sampleTimeLeft, attenuatedLeftBuffer);
_audio->addSpatialAudioToBuffer(sampleTimeRight, attenuatedRightBuffer);
attenuatedLeftBuffer.reset();
attenuatedRightBuffer.reset();
_audio->addSpatialAudioToBuffer(sampleTimeLeft, attenuatedLeftSamples, totalNumberOfSamples);
_audio->addSpatialAudioToBuffer(sampleTimeRight, attenuatedRightSamples, totalNumberOfSamples);
}
}
}
@ -231,9 +222,7 @@ void AudioReflector::processSpatialAudio(unsigned int sampleTime, const QByteArr
return;
} else if (doSimpleEcho) {
int totalNumberOfSamples = samples.size() / (sizeof(int16_t));
AudioRingBuffer samplesRingBuffer(totalNumberOfSamples);
samplesRingBuffer.writeData(samples.constData(),samples.size());
_audio->addSpatialAudioToBuffer(sampleTime + 12000, samplesRingBuffer);
_audio->addSpatialAudioToBuffer(sampleTime + 12000, samples, totalNumberOfSamples);
return;
} else {
quint64 start = usecTimestampNow();