Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:49:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more mixer cleanup, UDPSocket hook up

Browse source
This commit is contained in:
Stephen Birarda 2013-02-12 17:59:23 -08:00
parent fab10ada3e
commit b92d8daa1d
2 changed files with 38 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mixer/CMakeLists.txt
View file

@ -4,4 +4,6 @@ project(mixer)
file(GLOB MIXER_SRCS src/*.cpp src/*.h) file(GLOB MIXER_SRCS src/*.cpp src/*.h)
add_executable(mixer ${MIXER_SRCS}) add_executable(mixer ${MIXER_SRCS} ${HIFI_SHARED_SRCS})
include_directories(${HIFI_SHARED_DIR})

108
mixer/src/main.cpp
View file

@ -13,11 +13,12 @@
#include <fstream> #include <fstream>
#include <limits> #include <limits>
#include "AudioRingBuffer.h" #include "AudioRingBuffer.h"
#include "UDPSocket.h"
const int MAX_AGENTS = 1000; const int MAX_AGENTS = 1000;
const int LOGOFF_CHECK_INTERVAL = 1000; const int LOGOFF_CHECK_INTERVAL = 1000;
const int UDP_PORT = 55443; const int MIXER_LISTEN_PORT = 55443;
const int BUFFER_LENGTH_BYTES = 1024; const int BUFFER_LENGTH_BYTES = 1024;
const int BUFFER_LENGTH_SAMPLES = BUFFER_LENGTH_BYTES / sizeof(int16_t); const int BUFFER_LENGTH_SAMPLES = BUFFER_LENGTH_BYTES / sizeof(int16_t);
@ -39,7 +40,8 @@ sockaddr_in address, destAddress;
socklen_t destLength = sizeof(destAddress); socklen_t destLength = sizeof(destAddress);
struct AgentList { struct AgentList {
sockaddr_in agentAddr; char *address;
unsigned short port;
bool active; bool active;
timeval time; timeval time;
} agents[MAX_AGENTS]; } agents[MAX_AGENTS];
@ -59,44 +61,14 @@ double usecTimestamp(timeval *time, double addedUsecs = 0) {
return (time->tv_sec * 1000000.0) + time->tv_usec + addedUsecs; return (time->tv_sec * 1000000.0) + time->tv_usec + addedUsecs;
} }
int create_socket() int addAgent(sockaddr_in agentAddress, void *audioData) {
{
// Create socket
int handle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (handle <= 0) {
printf("Failed to create socket: %d\n", handle);
return false;
}
return handle;
}
int network_init()
{
int handle = create_socket();
// Bind socket to port
address.sin_family = AF_INET;
address.sin_addr.s_addr = INADDR_ANY;
address.sin_port = htons( (unsigned short) UDP_PORT );
if (bind(handle, (const sockaddr*) &address, sizeof(sockaddr_in)) < 0) {
printf( "failed to bind socket\n" );
return false;
}
return handle;
}
int addAgent(sockaddr_in dest_address, void *audioData) {
// Search for agent in list and add if needed // Search for agent in list and add if needed
int is_new = 0; int is_new = 0;
int i = 0; int i = 0;
for (i = 0; i < numAgents; i++) { for (i = 0; i < numAgents; i++) {
if (dest_address.sin_addr.s_addr == agents[i].agentAddr.sin_addr.s_addr if (strcmp(inet_ntoa(agentAddress.sin_addr), agents[i].address) == 0
&& dest_address.sin_port == agents[i].agentAddr.sin_port) { && agentAddress.sin_port == agents[i].port) {
break; break;
} }
} }
@ -105,7 +77,8 @@ int addAgent(sockaddr_in dest_address, void *audioData) {
is_new = 1; is_new = 1;
} }
agents[i].agentAddr = dest_address; agents[i].address = inet_ntoa(agentAddress.sin_addr);
agents[i].port = ntohs(agentAddress.sin_port);
agents[i].active = true; agents[i].active = true;
gettimeofday(&agents[i].time, NULL); gettimeofday(&agents[i].time, NULL);
@ -133,14 +106,14 @@ int addAgent(sockaddr_in dest_address, void *audioData) {
return is_new; return is_new;
} }
struct send_buffer_struct { struct sendBufferStruct {
int socket_handle; UDPSocket *audioSocket;
}; };
void *send_buffer_thread(void *args) void *sendBufferThread(void *args)
{ {
struct send_buffer_struct *buffer_args = (struct send_buffer_struct *) args; struct sendBufferStruct *bufferArgs = (struct sendBufferStruct *)args;
int handle = buffer_args->socket_handle; UDPSocket *audioSocket = bufferArgs->audioSocket;
int sentBytes; int sentBytes;
int currentFrame = 1; int currentFrame = 1;
@ -221,10 +194,7 @@ void *send_buffer_thread(void *args)
} }
sockaddr_in destAddress = agents[a].agentAddr; audioSocket->send(agents[a].address, agents[a].port, clientMix, BUFFER_LENGTH_BYTES);
sentBytes = sendto(handle, clientMix, BUFFER_LENGTH_BYTES,
0, (sockaddr *) &destAddress, sizeof(destAddress));
if (sentBytes < BUFFER_LENGTH_BYTES) { if (sentBytes < BUFFER_LENGTH_BYTES) {
std::cout << "Error sending mix packet! " << sentBytes << strerror(errno) << "\n"; std::cout << "Error sending mix packet! " << sentBytes << strerror(errno) << "\n";
@ -248,21 +218,21 @@ void *send_buffer_thread(void *args)
pthread_exit(0); pthread_exit(0);
} }
struct process_arg_struct { struct processArgStruct {
int16_t *packetData; int16_t *packetData;
sockaddr_in destAddress; sockaddr_in destAddress;
}; };
void *process_client_packet(void *args) void *processClientPacket(void *args)
{ {
struct process_arg_struct *processArgs = (struct process_arg_struct *) args; struct processArgStruct *processArgs = (struct processArgStruct *) args;
sockaddr_in destAddress = processArgs->destAddress; sockaddr_in destAddress = processArgs->destAddress;
if (addAgent(destAddress, processArgs->packetData)) { if (addAgent(destAddress, processArgs->packetData)) {
std::cout << "Added agent: " << std::cout << "Added agent: " <<
inet_ntoa(destAddress.sin_addr) << " on " << inet_ntoa(destAddress.sin_addr) << " on " <<
destAddress.sin_port << "\n"; ntohs(destAddress.sin_port) << "\n";
} }
pthread_exit(0); pthread_exit(0);
@ -272,16 +242,9 @@ int main(int argc, const char * argv[])
{ {
timeval lastAgentUpdate; timeval lastAgentUpdate;
int receivedBytes = 0; int receivedBytes = 0;
int handle = network_init(); // setup our socket
UDPSocket audioSocket = UDPSocket(MIXER_LISTEN_PORT);
if (!handle) {
std::cout << "Failed to create listening socket.\n";
return 0;
} else {
std::cout << "Network Started. Waiting for packets.\n";
}
gettimeofday(&lastAgentUpdate, NULL); gettimeofday(&lastAgentUpdate, NULL);
@ -291,26 +254,25 @@ int main(int argc, const char * argv[])
sourceBuffers[b] = new AudioRingBuffer(10 * BUFFER_LENGTH_SAMPLES); sourceBuffers[b] = new AudioRingBuffer(10 * BUFFER_LENGTH_SAMPLES);
} }
struct send_buffer_struct send_buffer_args; struct sendBufferStruct sendBufferArgs;
send_buffer_args.socket_handle = handle; sendBufferArgs.audioSocket = &audioSocket;
pthread_t buffer_send_thread; pthread_t bufferSendThread;
pthread_create(&buffer_send_thread, NULL, send_buffer_thread, (void *)&send_buffer_args); pthread_create(&bufferSendThread, NULL, sendBufferThread, (void *)&sendBufferArgs);
while (true) { while (true) {
receivedBytes = recvfrom(handle, (int16_t*)packetData, BUFFER_LENGTH_BYTES, if(audioSocket.receive(packetData, &receivedBytes)) {
0, (sockaddr*)&destAddress, &destLength); struct processArgStruct args;
args.packetData = packetData;
struct process_arg_struct args; args.destAddress = destAddress;
args.packetData = packetData;
args.destAddress = destAddress; pthread_t clientProcessThread;
pthread_create(&clientProcessThread, NULL, processClientPacket, (void *)&args);
pthread_t client_process_thread; pthread_join(clientProcessThread, NULL);
pthread_create(&client_process_thread, NULL, process_client_packet, (void *)&args); }
pthread_join(client_process_thread, NULL);
} }
pthread_join(buffer_send_thread, NULL); pthread_join(bufferSendThread, NULL);
return 0; return 0;
} }