mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 17:23:29 +02:00
perform send of audio buffer on main thread
This commit is contained in:
Stephen Birarda
parent
42a50e9bab
commit
9ef409b2ef
1 changed files with 177 additions and 193 deletions
|
|
@ -72,193 +72,6 @@ void plateauAdditionOfSamples(int16_t &mixSample, int16_t sampleToAdd) {
|
||||||
mixSample = normalizedSample;
|
mixSample = normalizedSample;
|
||||||
}
|
}
|
||||||
|
|
||||||
void *sendBuffer(void *args) {
|
|
||||||
int sentBytes;
|
|
||||||
int nextFrame = 0;
|
|
||||||
timeval startTime;
|
|
||||||
|
|
||||||
AgentList* agentList = AgentList::getInstance();
|
|
||||||
|
|
||||||
gettimeofday(&startTime, NULL);
|
|
||||||
|
|
||||||
while (true) {
|
|
||||||
sentBytes = 0;
|
|
||||||
|
|
||||||
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
|
|
||||||
AudioRingBuffer* agentBuffer = (AudioRingBuffer*) agent->getLinkedData();
|
|
||||||
|
|
||||||
if (agentBuffer && agentBuffer->getEndOfLastWrite() != NULL) {
|
|
||||||
|
|
||||||
if (!agentBuffer->isStarted()
|
|
||||||
&& agentBuffer->diffLastWriteNextOutput() <= BUFFER_LENGTH_SAMPLES_PER_CHANNEL + JITTER_BUFFER_SAMPLES) {
|
|
||||||
printf("Held back buffer for agent with ID %d.\n", agent->getAgentId());
|
|
||||||
agentBuffer->setShouldBeAddedToMix(false);
|
|
||||||
} else if (agentBuffer->diffLastWriteNextOutput() < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {
|
|
||||||
printf("Buffer from agent with ID %d starved.\n", agent->getAgentId());
|
|
||||||
agentBuffer->setStarted(false);
|
|
||||||
agentBuffer->setShouldBeAddedToMix(false);
|
|
||||||
} else {
|
|
||||||
// good buffer, add this to the mix
|
|
||||||
agentBuffer->setStarted(true);
|
|
||||||
agentBuffer->setShouldBeAddedToMix(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int numAgents = agentList->size();
|
|
||||||
float distanceCoefficients[numAgents][numAgents];
|
|
||||||
memset(distanceCoefficients, 0, sizeof(distanceCoefficients));
|
|
||||||
|
|
||||||
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
|
|
||||||
AudioRingBuffer* agentRingBuffer = (AudioRingBuffer*) agent->getLinkedData();
|
|
||||||
|
|
||||||
if (agentRingBuffer) {
|
|
||||||
int16_t clientMix[BUFFER_LENGTH_SAMPLES_PER_CHANNEL * 2] = {};
|
|
||||||
|
|
||||||
for (AgentList::iterator otherAgent = agentList->begin(); otherAgent != agentList->end(); otherAgent++) {
|
|
||||||
if (otherAgent != agent || (otherAgent == agent && agentRingBuffer->shouldLoopbackForAgent())) {
|
|
||||||
AudioRingBuffer* otherAgentBuffer = (AudioRingBuffer*) otherAgent->getLinkedData();
|
|
||||||
|
|
||||||
if (otherAgentBuffer->shouldBeAddedToMix()) {
|
|
||||||
|
|
||||||
float bearingRelativeAngleToSource = 0.f;
|
|
||||||
float attenuationCoefficient = 1.f;
|
|
||||||
int numSamplesDelay = 0;
|
|
||||||
float weakChannelAmplitudeRatio = 1.f;
|
|
||||||
|
|
||||||
if (otherAgent != agent) {
|
|
||||||
float *agentPosition = agentRingBuffer->getPosition();
|
|
||||||
float *otherAgentPosition = otherAgentBuffer->getPosition();
|
|
||||||
|
|
||||||
// calculate the distance to the other agent
|
|
||||||
|
|
||||||
// use the distance to the other agent to calculate the change in volume for this frame
|
|
||||||
int lowAgentIndex = std::min(agent.getAgentIndex(), otherAgent.getAgentIndex());
|
|
||||||
int highAgentIndex = std::max(agent.getAgentIndex(), otherAgent.getAgentIndex());
|
|
||||||
|
|
||||||
if (distanceCoefficients[lowAgentIndex][highAgentIndex] == 0) {
|
|
||||||
float distanceToAgent = sqrtf(powf(agentPosition[0] - otherAgentPosition[0], 2) +
|
|
||||||
powf(agentPosition[1] - otherAgentPosition[1], 2) +
|
|
||||||
powf(agentPosition[2] - otherAgentPosition[2], 2));
|
|
||||||
|
|
||||||
float minCoefficient = std::min(1.0f,
|
|
||||||
powf(0.5,
|
|
||||||
(logf(DISTANCE_RATIO * distanceToAgent) / logf(3)) - 1));
|
|
||||||
distanceCoefficients[lowAgentIndex][highAgentIndex] = minCoefficient;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// get the angle from the right-angle triangle
|
|
||||||
float triangleAngle = atan2f(fabsf(agentPosition[2] - otherAgentPosition[2]),
|
|
||||||
fabsf(agentPosition[0] - otherAgentPosition[0])) * (180 / M_PI);
|
|
||||||
float absoluteAngleToSource = 0;
|
|
||||||
bearingRelativeAngleToSource = 0;
|
|
||||||
|
|
||||||
// find the angle we need for calculation based on the orientation of the triangle
|
|
||||||
if (otherAgentPosition[0] > agentPosition[0]) {
|
|
||||||
if (otherAgentPosition[2] > agentPosition[2]) {
|
|
||||||
absoluteAngleToSource = -90 + triangleAngle;
|
|
||||||
} else {
|
|
||||||
absoluteAngleToSource = -90 - triangleAngle;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (otherAgentPosition[2] > agentPosition[2]) {
|
|
||||||
absoluteAngleToSource = 90 - triangleAngle;
|
|
||||||
} else {
|
|
||||||
absoluteAngleToSource = 90 + triangleAngle;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bearingRelativeAngleToSource = absoluteAngleToSource - agentRingBuffer->getBearing();
|
|
||||||
|
|
||||||
if (bearingRelativeAngleToSource > 180) {
|
|
||||||
bearingRelativeAngleToSource -= 360;
|
|
||||||
} else if (bearingRelativeAngleToSource < -180) {
|
|
||||||
bearingRelativeAngleToSource += 360;
|
|
||||||
}
|
|
||||||
|
|
||||||
float angleOfDelivery = absoluteAngleToSource - otherAgentBuffer->getBearing();
|
|
||||||
|
|
||||||
if (angleOfDelivery > 180) {
|
|
||||||
angleOfDelivery -= 360;
|
|
||||||
} else if (angleOfDelivery < -180) {
|
|
||||||
angleOfDelivery += 360;
|
|
||||||
}
|
|
||||||
|
|
||||||
float offAxisCoefficient = MAX_OFF_AXIS_ATTENUATION +
|
|
||||||
(OFF_AXIS_ATTENUATION_FORMULA_STEP * (fabsf(angleOfDelivery) / 90.0f));
|
|
||||||
|
|
||||||
attenuationCoefficient = distanceCoefficients[lowAgentIndex][highAgentIndex]
|
|
||||||
* otherAgentBuffer->getAttenuationRatio()
|
|
||||||
* offAxisCoefficient;
|
|
||||||
|
|
||||||
bearingRelativeAngleToSource *= (M_PI / 180);
|
|
||||||
|
|
||||||
float sinRatio = fabsf(sinf(bearingRelativeAngleToSource));
|
|
||||||
numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
|
|
||||||
weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio);
|
|
||||||
}
|
|
||||||
|
|
||||||
int16_t* goodChannel = bearingRelativeAngleToSource > 0.0f
|
|
||||||
? clientMix + BUFFER_LENGTH_SAMPLES_PER_CHANNEL
|
|
||||||
: clientMix;
|
|
||||||
int16_t* delayedChannel = bearingRelativeAngleToSource > 0.0f
|
|
||||||
? clientMix
|
|
||||||
: clientMix + BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
|
|
||||||
|
|
||||||
int16_t* delaySamplePointer = otherAgentBuffer->getNextOutput() == otherAgentBuffer->getBuffer()
|
|
||||||
? otherAgentBuffer->getBuffer() + RING_BUFFER_SAMPLES - numSamplesDelay
|
|
||||||
: otherAgentBuffer->getNextOutput() - numSamplesDelay;
|
|
||||||
|
|
||||||
for (int s = 0; s < BUFFER_LENGTH_SAMPLES_PER_CHANNEL; s++) {
|
|
||||||
|
|
||||||
if (s < numSamplesDelay) {
|
|
||||||
// pull the earlier sample for the delayed channel
|
|
||||||
int earlierSample = delaySamplePointer[s] * attenuationCoefficient;
|
|
||||||
plateauAdditionOfSamples(delayedChannel[s], earlierSample * weakChannelAmplitudeRatio);
|
|
||||||
}
|
|
||||||
|
|
||||||
int16_t currentSample = (otherAgentBuffer->getNextOutput()[s] * attenuationCoefficient);
|
|
||||||
plateauAdditionOfSamples(goodChannel[s], currentSample);
|
|
||||||
|
|
||||||
if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {
|
|
||||||
plateauAdditionOfSamples(delayedChannel[s + numSamplesDelay],
|
|
||||||
currentSample * weakChannelAmplitudeRatio);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
agentList->getAgentSocket().send(agent->getPublicSocket(), clientMix, BUFFER_LENGTH_BYTES);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
|
|
||||||
AudioRingBuffer* agentBuffer = (AudioRingBuffer*) agent->getLinkedData();
|
|
||||||
if (agentBuffer && agentBuffer->shouldBeAddedToMix()) {
|
|
||||||
agentBuffer->setNextOutput(agentBuffer->getNextOutput() + BUFFER_LENGTH_SAMPLES_PER_CHANNEL);
|
|
||||||
|
|
||||||
if (agentBuffer->getNextOutput() >= agentBuffer->getBuffer() + RING_BUFFER_SAMPLES) {
|
|
||||||
agentBuffer->setNextOutput(agentBuffer->getBuffer());
|
|
||||||
}
|
|
||||||
|
|
||||||
agentBuffer->setShouldBeAddedToMix(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
double usecToSleep = usecTimestamp(&startTime) + (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - usecTimestampNow();
|
|
||||||
|
|
||||||
if (usecToSleep > 0) {
|
|
||||||
usleep(usecToSleep);
|
|
||||||
} else {
|
|
||||||
std::cout << "Took too much time, not sleeping!\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pthread_exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void attachNewBufferToAgent(Agent *newAgent) {
|
void attachNewBufferToAgent(Agent *newAgent) {
|
||||||
if (newAgent->getLinkedData() == NULL) {
|
if (newAgent->getLinkedData() == NULL) {
|
||||||
newAgent->setLinkedData(new AudioRingBuffer(RING_BUFFER_SAMPLES, BUFFER_LENGTH_SAMPLES_PER_CHANNEL));
|
newAgent->setLinkedData(new AudioRingBuffer(RING_BUFFER_SAMPLES, BUFFER_LENGTH_SAMPLES_PER_CHANNEL));
|
||||||
|
|
@ -280,13 +93,178 @@ int main(int argc, const char* argv[]) {
|
||||||
|
|
||||||
unsigned char *packetData = new unsigned char[MAX_PACKET_SIZE];
|
unsigned char *packetData = new unsigned char[MAX_PACKET_SIZE];
|
||||||
|
|
||||||
pthread_t sendBufferThread;
|
|
||||||
pthread_create(&sendBufferThread, NULL, sendBuffer, NULL);
|
|
||||||
|
|
||||||
sockaddr *agentAddress = new sockaddr;
|
sockaddr *agentAddress = new sockaddr;
|
||||||
|
|
||||||
|
int nextFrame = 0;
|
||||||
|
timeval startTime;
|
||||||
|
|
||||||
|
gettimeofday(&startTime, NULL);
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if(agentList->getAgentSocket().receive(agentAddress, packetData, &receivedBytes)) {
|
// enumerate the agents, check if we can add audio from the agent to current mix
|
||||||
|
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
|
||||||
|
AudioRingBuffer* agentBuffer = (AudioRingBuffer*) agent->getLinkedData();
|
||||||
|
|
||||||
|
if (agentBuffer->getEndOfLastWrite() != NULL) {
|
||||||
|
if (!agentBuffer->isStarted()
|
||||||
|
&& agentBuffer->diffLastWriteNextOutput() <= BUFFER_LENGTH_SAMPLES_PER_CHANNEL + JITTER_BUFFER_SAMPLES) {
|
||||||
|
printf("Held back buffer for agent with ID %d.\n", agent->getAgentId());
|
||||||
|
agentBuffer->setShouldBeAddedToMix(false);
|
||||||
|
} else if (agentBuffer->diffLastWriteNextOutput() < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {
|
||||||
|
printf("Buffer from agent with ID %d starved.\n", agent->getAgentId());
|
||||||
|
agentBuffer->setStarted(false);
|
||||||
|
agentBuffer->setShouldBeAddedToMix(false);
|
||||||
|
} else {
|
||||||
|
// good buffer, add this to the mix
|
||||||
|
agentBuffer->setStarted(true);
|
||||||
|
agentBuffer->setShouldBeAddedToMix(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int numAgents = agentList->size();
|
||||||
|
float distanceCoefficients[numAgents][numAgents];
|
||||||
|
memset(distanceCoefficients, 0, sizeof(distanceCoefficients));
|
||||||
|
|
||||||
|
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
|
||||||
|
AudioRingBuffer* agentRingBuffer = (AudioRingBuffer*) agent->getLinkedData();
|
||||||
|
|
||||||
|
int16_t clientMix[BUFFER_LENGTH_SAMPLES_PER_CHANNEL * 2] = {};
|
||||||
|
|
||||||
|
for (AgentList::iterator otherAgent = agentList->begin(); otherAgent != agentList->end(); otherAgent++) {
|
||||||
|
if (otherAgent != agent || (otherAgent == agent && agentRingBuffer->shouldLoopbackForAgent())) {
|
||||||
|
AudioRingBuffer* otherAgentBuffer = (AudioRingBuffer*) otherAgent->getLinkedData();
|
||||||
|
|
||||||
|
if (otherAgentBuffer->shouldBeAddedToMix()) {
|
||||||
|
|
||||||
|
float bearingRelativeAngleToSource = 0.f;
|
||||||
|
float attenuationCoefficient = 1.f;
|
||||||
|
int numSamplesDelay = 0;
|
||||||
|
float weakChannelAmplitudeRatio = 1.f;
|
||||||
|
|
||||||
|
if (otherAgent != agent) {
|
||||||
|
float *agentPosition = agentRingBuffer->getPosition();
|
||||||
|
float *otherAgentPosition = otherAgentBuffer->getPosition();
|
||||||
|
|
||||||
|
// calculate the distance to the other agent
|
||||||
|
|
||||||
|
// use the distance to the other agent to calculate the change in volume for this frame
|
||||||
|
int lowAgentIndex = std::min(agent.getAgentIndex(), otherAgent.getAgentIndex());
|
||||||
|
int highAgentIndex = std::max(agent.getAgentIndex(), otherAgent.getAgentIndex());
|
||||||
|
|
||||||
|
if (distanceCoefficients[lowAgentIndex][highAgentIndex] == 0) {
|
||||||
|
float distanceToAgent = sqrtf(powf(agentPosition[0] - otherAgentPosition[0], 2) +
|
||||||
|
powf(agentPosition[1] - otherAgentPosition[1], 2) +
|
||||||
|
powf(agentPosition[2] - otherAgentPosition[2], 2));
|
||||||
|
|
||||||
|
float minCoefficient = std::min(1.0f,
|
||||||
|
powf(0.5,
|
||||||
|
(logf(DISTANCE_RATIO * distanceToAgent) / logf(3)) - 1));
|
||||||
|
distanceCoefficients[lowAgentIndex][highAgentIndex] = minCoefficient;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// get the angle from the right-angle triangle
|
||||||
|
float triangleAngle = atan2f(fabsf(agentPosition[2] - otherAgentPosition[2]),
|
||||||
|
fabsf(agentPosition[0] - otherAgentPosition[0])) * (180 / M_PI);
|
||||||
|
float absoluteAngleToSource = 0;
|
||||||
|
bearingRelativeAngleToSource = 0;
|
||||||
|
|
||||||
|
// find the angle we need for calculation based on the orientation of the triangle
|
||||||
|
if (otherAgentPosition[0] > agentPosition[0]) {
|
||||||
|
if (otherAgentPosition[2] > agentPosition[2]) {
|
||||||
|
absoluteAngleToSource = -90 + triangleAngle;
|
||||||
|
} else {
|
||||||
|
absoluteAngleToSource = -90 - triangleAngle;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (otherAgentPosition[2] > agentPosition[2]) {
|
||||||
|
absoluteAngleToSource = 90 - triangleAngle;
|
||||||
|
} else {
|
||||||
|
absoluteAngleToSource = 90 + triangleAngle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bearingRelativeAngleToSource = absoluteAngleToSource - agentRingBuffer->getBearing();
|
||||||
|
|
||||||
|
if (bearingRelativeAngleToSource > 180) {
|
||||||
|
bearingRelativeAngleToSource -= 360;
|
||||||
|
} else if (bearingRelativeAngleToSource < -180) {
|
||||||
|
bearingRelativeAngleToSource += 360;
|
||||||
|
}
|
||||||
|
|
||||||
|
float angleOfDelivery = absoluteAngleToSource - otherAgentBuffer->getBearing();
|
||||||
|
|
||||||
|
if (angleOfDelivery > 180) {
|
||||||
|
angleOfDelivery -= 360;
|
||||||
|
} else if (angleOfDelivery < -180) {
|
||||||
|
angleOfDelivery += 360;
|
||||||
|
}
|
||||||
|
|
||||||
|
float offAxisCoefficient = MAX_OFF_AXIS_ATTENUATION +
|
||||||
|
(OFF_AXIS_ATTENUATION_FORMULA_STEP * (fabsf(angleOfDelivery) / 90.0f));
|
||||||
|
|
||||||
|
attenuationCoefficient = distanceCoefficients[lowAgentIndex][highAgentIndex]
|
||||||
|
* otherAgentBuffer->getAttenuationRatio()
|
||||||
|
* offAxisCoefficient;
|
||||||
|
|
||||||
|
bearingRelativeAngleToSource *= (M_PI / 180);
|
||||||
|
|
||||||
|
float sinRatio = fabsf(sinf(bearingRelativeAngleToSource));
|
||||||
|
numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
|
||||||
|
weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio);
|
||||||
|
}
|
||||||
|
|
||||||
|
int16_t* goodChannel = bearingRelativeAngleToSource > 0.0f
|
||||||
|
? clientMix + BUFFER_LENGTH_SAMPLES_PER_CHANNEL
|
||||||
|
: clientMix;
|
||||||
|
int16_t* delayedChannel = bearingRelativeAngleToSource > 0.0f
|
||||||
|
? clientMix
|
||||||
|
: clientMix + BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
|
||||||
|
|
||||||
|
int16_t* delaySamplePointer = otherAgentBuffer->getNextOutput() == otherAgentBuffer->getBuffer()
|
||||||
|
? otherAgentBuffer->getBuffer() + RING_BUFFER_SAMPLES - numSamplesDelay
|
||||||
|
: otherAgentBuffer->getNextOutput() - numSamplesDelay;
|
||||||
|
|
||||||
|
for (int s = 0; s < BUFFER_LENGTH_SAMPLES_PER_CHANNEL; s++) {
|
||||||
|
|
||||||
|
if (s < numSamplesDelay) {
|
||||||
|
// pull the earlier sample for the delayed channel
|
||||||
|
int earlierSample = delaySamplePointer[s] * attenuationCoefficient;
|
||||||
|
plateauAdditionOfSamples(delayedChannel[s], earlierSample * weakChannelAmplitudeRatio);
|
||||||
|
}
|
||||||
|
|
||||||
|
int16_t currentSample = (otherAgentBuffer->getNextOutput()[s] * attenuationCoefficient);
|
||||||
|
plateauAdditionOfSamples(goodChannel[s], currentSample);
|
||||||
|
|
||||||
|
if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {
|
||||||
|
plateauAdditionOfSamples(delayedChannel[s + numSamplesDelay],
|
||||||
|
currentSample * weakChannelAmplitudeRatio);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
agentList->getAgentSocket().send(agent->getPublicSocket(), clientMix, BUFFER_LENGTH_BYTES);
|
||||||
|
}
|
||||||
|
|
||||||
|
// push forward the next output pointers for any audio buffers we used
|
||||||
|
for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
|
||||||
|
AudioRingBuffer* agentBuffer = (AudioRingBuffer*) agent->getLinkedData();
|
||||||
|
if (agentBuffer && agentBuffer->shouldBeAddedToMix()) {
|
||||||
|
agentBuffer->setNextOutput(agentBuffer->getNextOutput() + BUFFER_LENGTH_SAMPLES_PER_CHANNEL);
|
||||||
|
|
||||||
|
if (agentBuffer->getNextOutput() >= agentBuffer->getBuffer() + RING_BUFFER_SAMPLES) {
|
||||||
|
agentBuffer->setNextOutput(agentBuffer->getBuffer());
|
||||||
|
}
|
||||||
|
|
||||||
|
agentBuffer->setShouldBeAddedToMix(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// pull any new audio data from agents off of the network stack
|
||||||
|
while (agentList->getAgentSocket().receive(agentAddress, packetData, &receivedBytes)) {
|
||||||
if (packetData[0] == PACKET_HEADER_INJECT_AUDIO) {
|
if (packetData[0] == PACKET_HEADER_INJECT_AUDIO) {
|
||||||
|
|
||||||
if (agentList->addOrUpdateAgent(agentAddress, agentAddress, packetData[0], agentList->getLastAgentID())) {
|
if (agentList->addOrUpdateAgent(agentAddress, agentAddress, packetData[0], agentList->getLastAgentID())) {
|
||||||
|
|
@ -296,9 +274,15 @@ int main(int argc, const char* argv[]) {
|
||||||
agentList->updateAgentWithData(agentAddress, packetData, receivedBytes);
|
agentList->updateAgentWithData(agentAddress, packetData, receivedBytes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double usecToSleep = usecTimestamp(&startTime) + (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - usecTimestampNow();
|
||||||
|
|
||||||
|
if (usecToSleep > 0) {
|
||||||
|
usleep(usecToSleep);
|
||||||
|
} else {
|
||||||
|
std::cout << "Took too much time, not sleeping!\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pthread_join(sendBufferThread, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue