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

Merge branch 'master' of github.com:worklist/interface

Browse source
This commit is contained in:
Philip Rosedale 2013-01-31 17:28:48 -08:00
commit eba62cf136
3 changed files with 129 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
Source/Audio.cpp
View file

@ -21,11 +21,15 @@ const int BUFFER_LENGTH_SAMPLES = BUFFER_LENGTH_BYTES / sizeof(int16_t);
const int PHASE_DELAY_AT_90 = 20; const int PHASE_DELAY_AT_90 = 20;
const int AMPLITUDE_RATIO_AT_90 = 0.5; const int AMPLITUDE_RATIO_AT_90 = 0.5;
const int JITTER_BUFFER_MSECS = 5;
const int NUM_AUDIO_SOURCES = 1; const int NUM_AUDIO_SOURCES = 1;
const int ECHO_SERVER_TEST = 1; const int ECHO_SERVER_TEST = 1;
const int AUDIO_UDP_LISTEN_PORT = 55444; const int AUDIO_UDP_LISTEN_PORT = 55444;
pthread_mutex_t jitterMutex;
#define LOG_SAMPLE_DELAY 1 #define LOG_SAMPLE_DELAY 1
bool Audio::initialized; bool Audio::initialized;
@ -81,56 +85,84 @@ int audioCallback (const void *inputBuffer,
AudioSource *source = data->sources[s]; AudioSource *source = data->sources[s];
if (ECHO_SERVER_TEST) { if (ECHO_SERVER_TEST) {
// copy whatever is source->sourceData to the left and right output channels AudioSource::JitterBuffer *bufferToCopy = NULL;
memcpy(outputLeft, source->sourceData, BUFFER_LENGTH_BYTES);
memcpy(outputRight, source->sourceData, BUFFER_LENGTH_BYTES);
} else {
glm::vec3 headPos = data->linkedHead->getPos();
glm::vec3 sourcePos = source->position;
int startPointer = source->samplePointer; timeval sendTime;
int wrapAroundSamples = (BUFFER_LENGTH_SAMPLES) - (source->lengthInSamples - source->samplePointer); gettimeofday(&sendTime, NULL);
if (wrapAroundSamples <= 0) { pthread_mutex_lock(&jitterMutex);
memcpy(data->samplesToQueue, source->sourceData + source->samplePointer, BUFFER_LENGTH_BYTES);
source->samplePointer += (BUFFER_LENGTH_SAMPLES); // copy whatever the oldest data to the left and right output channels
} else { // as long as it came in at least JITTER_BUFFER_MSECS ago
memcpy(data->samplesToQueue, source->sourceData + source->samplePointer, (source->lengthInSamples - source->samplePointer) * sizeof(int16_t)); if (source->oldestData != NULL) {
memcpy(data->samplesToQueue + (source->lengthInSamples - source->samplePointer), source->sourceData, wrapAroundSamples * sizeof(int16_t)); bufferToCopy = source->oldestData;
source->samplePointer = wrapAroundSamples; } else if (source->newestData != NULL) {
bufferToCopy = source->newestData;
} }
float distance = sqrtf(powf(-headPos[0] - sourcePos[0], 2) + powf(-headPos[2] - sourcePos[2], 2)); if (bufferToCopy != NULL && diffclock(bufferToCopy->receiveTime, sendTime) > JITTER_BUFFER_MSECS) {
float distanceAmpRatio = powf(0.5, cbrtf(distance * 10)); memcpy(outputLeft, bufferToCopy->audioData, BUFFER_LENGTH_BYTES);
memcpy(outputRight, bufferToCopy->audioData, BUFFER_LENGTH_BYTES);
float angleToSource = angle_to(headPos * -1.f, sourcePos, data->linkedHead->getRenderYaw(), data->linkedHead->getYaw()) * M_PI/180;
float sinRatio = sqrt(fabsf(sinf(angleToSource)));
int numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
float phaseAmpRatio = 1.f - (AMPLITUDE_RATIO_AT_90 * sinRatio);
// std::cout << "S: " << numSamplesDelay << " A: " << angleToSource << " S: " << sinRatio << " AR: " << phaseAmpRatio << "\n";
int16_t *leadingOutput = angleToSource > 0 ? outputLeft : outputRight;
int16_t *trailingOutput = angleToSource > 0 ? outputRight : outputLeft;
for (int i = 0; i < BUFFER_LENGTH_SAMPLES; i++) {
data->samplesToQueue[i] *= distanceAmpRatio / NUM_AUDIO_SOURCES;
leadingOutput[i] += data->samplesToQueue[i];
if (i >= numSamplesDelay) { delete bufferToCopy;
trailingOutput[i] += data->samplesToQueue[i - numSamplesDelay];
if (bufferToCopy == source->oldestData) {
source->oldestData = NULL;
} else { } else {
int sampleIndex = startPointer - numSamplesDelay + i; source->newestData = NULL;
if (sampleIndex < 0) {
sampleIndex += source->lengthInSamples;
}
trailingOutput[i] += source->sourceData[sampleIndex] * (distanceAmpRatio * phaseAmpRatio / NUM_AUDIO_SOURCES);
} }
} }
pthread_mutex_unlock(&jitterMutex);
} }
// } else {
// glm::vec3 headPos = data->linkedHead->getPos();
// glm::vec3 sourcePos = source->position;
//
// int startPointer = source->samplePointer;
// int wrapAroundSamples = (BUFFER_LENGTH_SAMPLES) - (source->lengthInSamples - source->samplePointer);
//
// if (wrapAroundSamples <= 0) {
// memcpy(data->samplesToQueue, source->sourceData + source->samplePointer, BUFFER_LENGTH_BYTES);
// source->samplePointer += (BUFFER_LENGTH_SAMPLES);
// } else {
// memcpy(data->samplesToQueue, source->sourceData + source->samplePointer, (source->lengthInSamples - source->samplePointer) * sizeof(int16_t));
// memcpy(data->samplesToQueue + (source->lengthInSamples - source->samplePointer), source->sourceData, wrapAroundSamples * sizeof(int16_t));
// source->samplePointer = wrapAroundSamples;
// }
//
// float distance = sqrtf(powf(-headPos[0] - sourcePos[0], 2) + powf(-headPos[2] - sourcePos[2], 2));
// float distanceAmpRatio = powf(0.5, cbrtf(distance * 10));
//
// float angleToSource = angle_to(headPos * -1.f, sourcePos, data->linkedHead->getRenderYaw(), data->linkedHead->getYaw()) * M_PI/180;
// float sinRatio = sqrt(fabsf(sinf(angleToSource)));
// int numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
//
// float phaseAmpRatio = 1.f - (AMPLITUDE_RATIO_AT_90 * sinRatio);
//
// // std::cout << "S: " << numSamplesDelay << " A: " << angleToSource << " S: " << sinRatio << " AR: " << phaseAmpRatio << "\n";
//
// int16_t *leadingOutput = angleToSource > 0 ? outputLeft : outputRight;
// int16_t *trailingOutput = angleToSource > 0 ? outputRight : outputLeft;
//
// for (int i = 0; i < BUFFER_LENGTH_SAMPLES; i++) {
// data->samplesToQueue[i] *= distanceAmpRatio / NUM_AUDIO_SOURCES;
// leadingOutput[i] += data->samplesToQueue[i];
//
// if (i >= numSamplesDelay) {
// trailingOutput[i] += data->samplesToQueue[i - numSamplesDelay];
// } else {
// int sampleIndex = startPointer - numSamplesDelay + i;
//
// if (sampleIndex < 0) {
// sampleIndex += source->lengthInSamples;
// }
//
// trailingOutput[i] += source->sourceData[sampleIndex] * (distanceAmpRatio * phaseAmpRatio / NUM_AUDIO_SOURCES);
// }
// }
// }
// }
} }
return paContinue; return paContinue;
@ -162,17 +194,34 @@ void *receiveAudioViaUDP(void *args) {
while (true) { while (true) {
if (sharedAudioData->audioSocket->receive((void *)receivedData, receivedBytes)) { if (sharedAudioData->audioSocket->receive((void *)receivedData, receivedBytes)) {
gettimeofday(&currentReceiveTime, NULL);
if (LOG_SAMPLE_DELAY) { if (LOG_SAMPLE_DELAY) {
// write time difference (in microseconds) between packet receipts to file // write time difference (in microseconds) between packet receipts to file
gettimeofday(&currentReceiveTime, NULL);
double timeDiff = diffclock(previousReceiveTime, currentReceiveTime); double timeDiff = diffclock(previousReceiveTime, currentReceiveTime);
logFile << timeDiff << std::endl; logFile << timeDiff << std::endl;
} }
// add the received data to the shared memory
memcpy(sharedAudioData->sources[0]->sourceData, receivedData, *receivedBytes);
AudioSource *inputSource = sharedAudioData->sources[0];
pthread_mutex_lock(&jitterMutex);
if (inputSource->newestData != NULL) {
if (inputSource->oldestData != NULL) {
delete inputSource->oldestData;
}
inputSource->oldestData = inputSource->newestData;
inputSource->newestData = NULL;
}
inputSource->newestData = new AudioSource::JitterBuffer();
inputSource->newestData->audioData = new int16_t[BUFFER_LENGTH_SAMPLES];
memcpy(inputSource->newestData->audioData, receivedData, BUFFER_LENGTH_BYTES);
inputSource->newestData->receiveTime = currentReceiveTime;
pthread_mutex_unlock(&jitterMutex);
if (LOG_SAMPLE_DELAY) { if (LOG_SAMPLE_DELAY) {
gettimeofday(&previousReceiveTime, NULL); gettimeofday(&previousReceiveTime, NULL);
} }
@ -204,15 +253,13 @@ bool Audio::init(Head *mainHead)
// setup a UDPSocket // setup a UDPSocket
data->audioSocket = new UDPSocket(AUDIO_UDP_LISTEN_PORT); data->audioSocket = new UDPSocket(AUDIO_UDP_LISTEN_PORT);
// setup the ring buffer source for the streamed audio
data->sources[0]->sourceData = new int16_t[BUFFER_LENGTH_SAMPLES];
memset(data->sources[0]->sourceData, 0, BUFFER_LENGTH_SAMPLES * sizeof(int16_t));
pthread_t audioReceiveThread; pthread_t audioReceiveThread;
AudioRecThreadStruct threadArgs; AudioRecThreadStruct threadArgs;
threadArgs.sharedAudioData = data; threadArgs.sharedAudioData = data;
pthread_mutex_init(&jitterMutex, NULL);
pthread_create(&audioReceiveThread, NULL, receiveAudioViaUDP, (void *) &threadArgs); pthread_create(&audioReceiveThread, NULL, receiveAudioViaUDP, (void *) &threadArgs);
} else { } else {
data = new AudioData(NUM_AUDIO_SOURCES, BUFFER_LENGTH_BYTES); data = new AudioData(NUM_AUDIO_SOURCES, BUFFER_LENGTH_BYTES);
@ -276,9 +323,7 @@ void Audio::render()
*/ */
bool Audio::terminate () bool Audio::terminate ()
{ {
if (!initialized) { if (initialized) {
return true;
} else {
initialized = false; initialized = false;
err = Pa_CloseStream(stream); err = Pa_CloseStream(stream);
@ -290,10 +335,12 @@ bool Audio::terminate ()
if (err != paNoError) goto error; if (err != paNoError) goto error;
logFile.close(); logFile.close();
return true;
} }
pthread_mutex_destroy(&jitterMutex);
return true;
error: error:
fprintf(stderr, "-- portaudio termination error --\n"); fprintf(stderr, "-- portaudio termination error --\n");
fprintf(stderr, "PortAudio error (%d): %s\n", err, Pa_GetErrorText(err)); fprintf(stderr, "PortAudio error (%d): %s\n", err, Pa_GetErrorText(err));

29
Source/AudioSource.cpp
View file

@ -10,22 +10,23 @@
AudioSource::~AudioSource() AudioSource::~AudioSource()
{ {
delete[] sourceData; delete oldestData;
delete newestData;
} }
int AudioSource::loadDataFromFile(const char *filename) { int AudioSource::loadDataFromFile(const char *filename) {
FILE *soundFile = fopen(filename, "r"); // FILE *soundFile = fopen(filename, "r");
//
// get length of file: // // get length of file:
std::fseek(soundFile, 0, SEEK_END); // std::fseek(soundFile, 0, SEEK_END);
lengthInSamples = std::ftell(soundFile) / sizeof(int16_t); // lengthInSamples = std::ftell(soundFile) / sizeof(int16_t);
std::rewind(soundFile); // std::rewind(soundFile);
//
sourceData = new int16_t[lengthInSamples]; // sourceData = new int16_t[lengthInSamples];
std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile); // std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
//
std::fclose(soundFile); // std::fclose(soundFile);
//
return lengthInSamples; return 0;
} }

18
Source/AudioSource.h
View file

@ -15,11 +15,19 @@
class AudioSource { class AudioSource {
public: public:
glm::vec3 position; glm::vec3 position;
int16_t *sourceData;
int lengthInSamples; struct JitterBuffer {
int samplePointer; int16_t *audioData;
timeval receiveTime;
AudioSource() { samplePointer = 0; sourceData = NULL; lengthInSamples = 0; }
~JitterBuffer() { delete[] audioData; }
} *oldestData, *newestData;
// int lengthInSamples;
// int samplePointer;
// AudioSource() { samplePointer = 0; lengthInSamples = 0; }
AudioSource() { oldestData = NULL; newestData = NULL; }
~AudioSource(); ~AudioSource();
int loadDataFromFile(const char *filename); int loadDataFromFile(const char *filename);