sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tunes the implementation of the blocking PortAudio stream interface op top of the non-blocking one, and the echo canellation.

Browse Source
cusax-fix
Lyubomir Marinov 15 years ago
parent fcedf7507b
commit 2cb59920fb
5 changed files with 105 additions and 95 deletions
Show Stats Download Patch File Download Diff File

BIN
lib/native/mac/libjportaudio.jnilib
View File

Binary file not shown.

BIN
lib/native/windows-64/jportaudio.dll
View File

Binary file not shown.

BIN
lib/native/windows/jportaudio.dll
View File

Binary file not shown.

7
src/native/portaudio/AudioQualityImprovement.c
Unescape View File

@ -561,7 +561,7 @@ AudioQualityImprovement_unload()
if (AudioQualityImprovement_sharedInstancesMutex)
{
Mutex_free(AudioQualityImprovement_sharedInstancesMutex);
AudioQualityImprovement_sharedInstances = NULL;
AudioQualityImprovement_sharedInstancesMutex = NULL;
}
}
@ -580,9 +580,8 @@ AudioQualityImprovement_updatePlayDelay(AudioQualityImprovement *aqi)
else
{
playDelay
= (aqi->inputLatency + aqi->outputLatency)
/ ((aqi->frameSize / sizeof(spx_int16_t))
/ (aqi->sampleRate / 1000));
= (aqi->outputLatency * aqi->sampleRate)
/ ((aqi->frameSize / sizeof(spx_int16_t)) * 1000);
if (playDelay < MIN_PLAY_DELAY_IN_FRAMES)
playDelay = MIN_PLAY_DELAY_IN_FRAMES;
}

193
src/native/portaudio/net_java_sip_communicator_impl_neomedia_portaudio_PortAudio.c
Unescape View File

@ -125,6 +125,7 @@ static void PortAudioStream_retain(PortAudioStream *stream);
static const char *AUDIO_QUALITY_IMPROVEMENT_STRING_ID = "portaudio";
#define LATENCY_HIGH net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_HIGH
#define LATENCY_LOW net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_LOW
#define LATENCY_UNSPECIFIED net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_UNSPECIFIED
JNIEXPORT void JNICALL
Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_free
@ -397,17 +398,20 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1OpenStream
if (stream->audioQualityImprovement)
{
const PaStreamInfo *streamInfo;
AudioQualityImprovement_setSampleRate(
stream->audioQualityImprovement,
(int) sampleRate);
streamInfo = Pa_GetStreamInfo(stream->stream);
if (streamInfo)
if (stream->pseudoBlocking)
{
stream->inputLatency
= (jlong) (streamInfo->inputLatency * 1000);
const PaStreamInfo *streamInfo;
streamInfo = Pa_GetStreamInfo(stream->stream);
if (streamInfo)
{
stream->inputLatency
= (jlong) (streamInfo->inputLatency * 1000);
}
}
}
}
@ -472,20 +476,18 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1ReadStream
{
PortAudioStream *portAudioStream = (PortAudioStream *) stream;
PaError errorCode;
jlong framesInBytes = frames * portAudioStream->inputFrameSize;
if (portAudioStream->pseudoBlocking)
{
PortAudioStream_retain(portAudioStream);
if (Mutex_lock(portAudioStream->inputMutex))
errorCode = paInternalError;
else
{
jlong bytesRead = 0;
jlong totalBytesToRead
= frames * portAudioStream->inputFrameSize;
errorCode = paNoError;
while (bytesRead < totalBytesToRead)
while (bytesRead < framesInBytes)
{
jlong bytesToRead;
@ -502,7 +504,7 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1ReadStream
continue;
}
bytesToRead = totalBytesToRead - bytesRead;
bytesToRead = framesInBytes - bytesRead;
if (bytesToRead > portAudioStream->inputLength)
bytesToRead = portAudioStream->inputLength;
memcpy(
@ -517,7 +519,20 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1ReadStream
}
Mutex_unlock(portAudioStream->inputMutex);
}
PortAudioStream_release(portAudioStream);
/* Improve the audio quality of the input if possible. */
if ((paNoError == errorCode)
&& portAudioStream->audioQualityImprovement)
{
AudioQualityImprovement_process(
portAudioStream->audioQualityImprovement,
AUDIO_QUALITY_IMPROVEMENT_SAMPLE_ORIGIN_INPUT,
portAudioStream->sampleRate,
portAudioStream->sampleSizeInBits,
portAudioStream->channels,
portAudioStream->inputLatency,
data, framesInBytes);
}
}
else
{
@ -535,7 +550,7 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1ReadStream
portAudioStream->sampleSizeInBits,
portAudioStream->channels,
portAudioStream->inputLatency,
data, frames * portAudioStream->inputFrameSize);
data, framesInBytes);
}
}
}
@ -599,7 +614,14 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1WriteStream
jbyte *bufferBytes;
jbyte* data;
PortAudioStream *portAudioStream;
jint i;
PaError errorCode = paNoError;
jlong framesInBytes;
AudioQualityImprovement *audioQualityImprovement;
double sampleRate;
unsigned long sampleSizeInBits;
int channels;
jlong outputLatency;
bufferBytes = (*env)->GetByteArrayElements(env, buffer, NULL);
if (!bufferBytes)
@ -607,72 +629,78 @@ Java_net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_Pa_1WriteStream
data = bufferBytes + offset;
portAudioStream = (PortAudioStream *) stream;
framesInBytes = frames * portAudioStream->outputFrameSize;
audioQualityImprovement = portAudioStream->audioQualityImprovement;
sampleRate = portAudioStream->sampleRate;
sampleSizeInBits = portAudioStream->sampleSizeInBits;
channels = portAudioStream->channels;
outputLatency = portAudioStream->outputLatency;
if (portAudioStream->pseudoBlocking)
{
PortAudioStream_retain(portAudioStream);
if (Mutex_lock(portAudioStream->outputMutex))
errorCode = paInternalError;
else
for (i = 0; i < numberOfWrites; i++)
{
jlong bytesWritten = 0;
jlong totalBytesToWrite
= numberOfWrites * frames * portAudioStream->outputFrameSize;
errorCode = paNoError;
while (bytesWritten < totalBytesToWrite)
if (Mutex_lock(portAudioStream->outputMutex))
errorCode = paInternalError;
else
{
size_t outputCapacity
= portAudioStream->outputCapacity
- portAudioStream->outputLength;
jlong bytesToWrite;
jlong bytesWritten = 0;
if (JNI_TRUE == portAudioStream->finished)
errorCode = paNoError;
while (bytesWritten < framesInBytes)
{
errorCode = paStreamIsStopped;
break;
size_t outputCapacity
= portAudioStream->outputCapacity
- portAudioStream->outputLength;
jlong bytesToWrite;
if (JNI_TRUE == portAudioStream->finished)
{
errorCode = paStreamIsStopped;
break;
}
if (outputCapacity < 1)
{
ConditionVariable_wait(
portAudioStream->outputCondVar,
portAudioStream->outputMutex);
continue;
}
bytesToWrite = framesInBytes - bytesWritten;
if (bytesToWrite > outputCapacity)
bytesToWrite = outputCapacity;
memcpy(
((jbyte *) portAudioStream->output)
+ portAudioStream->outputLength,
data + bytesWritten,
bytesToWrite);
portAudioStream->outputLength += bytesToWrite;
bytesWritten += bytesToWrite;
}
if (outputCapacity < 1)
Mutex_unlock(portAudioStream->outputMutex);
}
if (paNoError == errorCode)
{
if (audioQualityImprovement)
{
ConditionVariable_wait(
portAudioStream->outputCondVar,
portAudioStream->outputMutex);
continue;
AudioQualityImprovement_process(
audioQualityImprovement,
AUDIO_QUALITY_IMPROVEMENT_SAMPLE_ORIGIN_OUTPUT,
sampleRate, sampleSizeInBits, channels,
outputLatency,
data, framesInBytes);
}
bytesToWrite = totalBytesToWrite - bytesWritten;
if (bytesToWrite > outputCapacity)
bytesToWrite = outputCapacity;
memcpy(
((jbyte *) portAudioStream->output)
+ portAudioStream->outputLength,
data + bytesWritten,
bytesToWrite);
portAudioStream->outputLength += bytesToWrite;
bytesWritten += bytesToWrite;
data += framesInBytes;
}
Mutex_unlock(portAudioStream->outputMutex);
}
PortAudioStream_release(portAudioStream);
}
else
{
PaStream *paStream;
AudioQualityImprovement *audioQualityImprovement;
double sampleRate;
unsigned long sampleSizeInBits;
int channels;
jlong outputLatency;
long framesInBytes;
jint i;
paStream = portAudioStream->stream;
audioQualityImprovement = portAudioStream->audioQualityImprovement;
sampleRate = portAudioStream->sampleRate;
sampleSizeInBits = portAudioStream->sampleSizeInBits;
channels = portAudioStream->channels;
outputLatency = portAudioStream->outputLatency;
framesInBytes = frames * portAudioStream->outputFrameSize;
PaStream *paStream = portAudioStream->stream;
for (i = 0; i < numberOfWrites; i++)
{
@ -893,13 +921,15 @@ PortAudio_fixInputParametersSuggestedLatency
if (deviceInfo)
{
if (inputParameters->suggestedLatency == LATENCY_LOW)
PaTime suggestedLatency = inputParameters->suggestedLatency;
if ((suggestedLatency == LATENCY_LOW)
|| (suggestedLatency == LATENCY_UNSPECIFIED))
{
inputParameters->suggestedLatency
= deviceInfo->defaultLowInputLatency;
}
else if ((inputParameters->suggestedLatency == LATENCY_HIGH)
|| (inputParameters->suggestedLatency == 0))
else if (suggestedLatency == LATENCY_HIGH)
{
inputParameters->suggestedLatency
= deviceInfo->defaultHighInputLatency;
@ -920,13 +950,15 @@ PortAudio_fixOutputParametersSuggestedLatency(
if (deviceInfo)
{
if (outputParameters->suggestedLatency == LATENCY_LOW)
PaTime suggestedLatency = outputParameters->suggestedLatency;
if ((suggestedLatency == LATENCY_LOW)
|| (suggestedLatency == LATENCY_UNSPECIFIED))
{
outputParameters->suggestedLatency
= deviceInfo->defaultLowOutputLatency;
}
else if ((outputParameters->suggestedLatency == LATENCY_HIGH)
|| (outputParameters->suggestedLatency == 0))
else if (suggestedLatency == LATENCY_HIGH)
{
outputParameters->suggestedLatency
= deviceInfo->defaultHighOutputLatency;
@ -1256,17 +1288,6 @@ PortAudioStream_pseudoBlockingCallback
memcpy(inputInStream, input, inputLength);
stream->inputLength += inputLength;
/* Improve the audio quality of the specified input if possible. */
if (stream->audioQualityImprovement)
{
AudioQualityImprovement_process(
stream->audioQualityImprovement,
AUDIO_QUALITY_IMPROVEMENT_SAMPLE_ORIGIN_INPUT,
stream->sampleRate, stream->sampleSizeInBits, stream->channels,
stream->inputLatency,
inputInStream, inputLength);
}
ConditionVariable_notify(stream->inputCondVar);
Mutex_unlock(stream->inputMutex);
}
@ -1285,21 +1306,11 @@ PortAudioStream_pseudoBlockingCallback
if (availableOutputLength < outputLength)
{
memset(
((jbyte *) stream->output) + availableOutputLength,
((jbyte *) output) + availableOutputLength,
0,
outputLength - availableOutputLength);
}
if (stream->audioQualityImprovement)
{
AudioQualityImprovement_process(
stream->audioQualityImprovement,
AUDIO_QUALITY_IMPROVEMENT_SAMPLE_ORIGIN_OUTPUT,
stream->sampleRate, stream->sampleSizeInBits, stream->channels,
stream->outputLatency,
output, outputLength);
}
ConditionVariable_notify(stream->outputCondVar);
Mutex_unlock(stream->outputMutex);
}

Write Preview
Loading…
Cancel
Save