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 11:37:08 -08:00
commit 413f858564
1 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Source/Audio.cpp
View file

@ -9,6 +9,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <pthread.h> #include <pthread.h>
#include <sys/time.h>
#include "Audio.h" #include "Audio.h"
#include "Util.h" #include "Util.h"
#include "AudioSource.h" #include "AudioSource.h"
@ -26,10 +27,13 @@ const int ECHO_SERVER_TEST = 1;
const int AUDIO_UDP_LISTEN_PORT = 55444; const int AUDIO_UDP_LISTEN_PORT = 55444;
#define LOG_SAMPLE_DELAY 1
bool Audio::initialized; bool Audio::initialized;
PaError Audio::err; PaError Audio::err;
PaStream *Audio::stream; PaStream *Audio::stream;
AudioData *Audio::data; AudioData *Audio::data;
std::ofstream logFile;
/** /**
* Audio callback used by portaudio. * Audio callback used by portaudio.
@ -64,7 +68,7 @@ int audioCallback (const void *inputBuffer,
// int16_t *inputRight = ((int16_t **) inputBuffer)[1]; // int16_t *inputRight = ((int16_t **) inputBuffer)[1];
if (inputLeft != NULL) { if (inputLeft != NULL) {
data->audioSocket->send((char *) "192.168.1.57", 55443, (void *)inputLeft, BUFFER_LENGTH_BYTES); data->audioSocket->send((char *) "192.168.1.19", 55443, (void *)inputLeft, BUFFER_LENGTH_BYTES);
} }
int16_t *outputLeft = ((int16_t **) outputBuffer)[0]; int16_t *outputLeft = ((int16_t **) outputBuffer)[0];
@ -154,8 +158,32 @@ void *receiveAudioViaUDP(void *args) {
int *receivedBytes = new int; int *receivedBytes = new int;
int streamSamplePointer = 0; int streamSamplePointer = 0;
timeval previousReceiveTime, currentReceiveTime;
if (LOG_SAMPLE_DELAY) {
gettimeofday(&previousReceiveTime, NULL);
char *filename = new char[50];
sprintf(filename, "%s/Desktop/%ld.csv", getenv("HOME"), previousReceiveTime.tv_sec);
logFile.open(filename, std::ios::out);
delete[] filename;
}
while (true) { while (true) {
if (sharedAudioData->audioSocket->receive((void *)receivedData, receivedBytes)) { if (sharedAudioData->audioSocket->receive((void *)receivedData, receivedBytes)) {
if (LOG_SAMPLE_DELAY) {
// write time difference (in microseconds) between packet receipts to file
gettimeofday(&currentReceiveTime, NULL);
double timeDiff = diffclock(previousReceiveTime, currentReceiveTime);
logFile << timeDiff << std::endl;
}
// add the received data to the shared memory // add the received data to the shared memory
memcpy(sharedAudioData->sources[0]->sourceData + streamSamplePointer, receivedData, *receivedBytes); memcpy(sharedAudioData->sources[0]->sourceData + streamSamplePointer, receivedData, *receivedBytes);
@ -164,7 +192,11 @@ void *receiveAudioViaUDP(void *args) {
} else { } else {
streamSamplePointer = 0; streamSamplePointer = 0;
} }
}
if (LOG_SAMPLE_DELAY) {
gettimeofday(&previousReceiveTime, NULL);
}
}
} }
} }
@ -277,6 +309,8 @@ bool Audio::terminate ()
err = Pa_Terminate(); err = Pa_Terminate();
if (err != paNoError) goto error; if (err != paNoError) goto error;
logFile.close();
return true; return true;
} }