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

undo solo test for mixer, add localhost mixer const to Audio.cpp

Browse source
This commit is contained in:
Stephen Birarda 2013-02-13 16:19:31 -08:00
parent 4270cfe2b4
commit ff83335123
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Audio.cpp
View file

@ -38,8 +38,9 @@ const short JITTER_BUFFER_SAMPLES = JITTER_BUFFER_LENGTH_MSECS * (SAMPLE_RATE /
const short NUM_AUDIO_SOURCES = 2;
const short ECHO_SERVER_TEST = 1;
char WORKCLUB_AUDIO_SERVER[] = "192.168.1.19";
char EC2_WEST_AUDIO_SERVER[] = "54.241.92.53";
char LOCALHOST_MIXER[] = "0.0.0.0";
char WORKCLUB_MIXER[] = "192.168.1.19";
char EC2_WEST_MIXER[] = "54.241.92.53";
const int AUDIO_UDP_LISTEN_PORT = 55444;
@ -88,7 +89,7 @@ int audioCallback (const void *inputBuffer,
// int16_t *inputRight = ((int16_t **) inputBuffer)[1];
if (inputLeft != NULL) {
data->audioSocket->send((char *) EC2_WEST_AUDIO_SERVER, 55443, (void *)inputLeft, BUFFER_LENGTH_BYTES);
data->audioSocket->send((char *) EC2_WEST_MIXER, 55443, (void *)inputLeft, BUFFER_LENGTH_BYTES);
//
// Measure the loudness of the signal from the microphone and store in audio object
//

8
mixer/src/main.cpp
View file

@ -171,12 +171,10 @@ void *sendBuffer(void *args)
}
for(int as = 0; as < BUFFER_LENGTH_SAMPLES; as++) {
// long longSample = previousOutput != NULL
// ? masterMix[as] - previousOutput[as]
// : masterMix[as];
long longSample = previousOutput != NULL
? masterMix[as] - previousOutput[as]
: masterMix[as];
long longSample = masterMix[as];
int16_t shortSample;
if (longSample < 0) {