Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-28 17:40:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up stdout audio reporting

Browse source
This commit is contained in:
Philip Rosedale 2013-06-20 10:59:50 -07:00
parent c740400224
commit 56b8a5880d
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
interface/src/Audio.cpp
View file

@ -357,17 +357,14 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
inputParameters.channelCount = 2; // Stereo input inputParameters.channelCount = 2; // Stereo input
inputParameters.sampleFormat = (paInt16 | paNonInterleaved); inputParameters.sampleFormat = (paInt16 | paNonInterleaved);
inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency; inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
//inputParameters.suggestedLatency = 0.0116;
inputParameters.hostApiSpecificStreamInfo = NULL; inputParameters.hostApiSpecificStreamInfo = NULL;
outputParameters.device = Pa_GetDefaultOutputDevice(); outputParameters.device = Pa_GetDefaultOutputDevice();
outputParameters.channelCount = 2; // Stereo output outputParameters.channelCount = 2; // Stereo output
outputParameters.sampleFormat = (paInt16 | paNonInterleaved); outputParameters.sampleFormat = (paInt16 | paNonInterleaved);
outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency; outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency;
//outputParameters.suggestedLatency = 0.0116;
outputParameters.hostApiSpecificStreamInfo = NULL; outputParameters.hostApiSpecificStreamInfo = NULL;
outputPortAudioError(Pa_OpenStream(&_stream, outputPortAudioError(Pa_OpenStream(&_stream,
&inputParameters, &inputParameters,
&outputParameters, &outputParameters,
@ -376,18 +373,7 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
paNoFlag, paNoFlag,
audioCallback, audioCallback,
(void*) this)); (void*) this));
/*
outputPortAudioError(Pa_OpenDefaultStream(&_stream,
2,
2,
(paInt16 | paNonInterleaved),
SAMPLE_RATE,
FRAMES_PER_BUFFER,
audioCallback,
(void*) this));
*/
if (! _stream) { if (! _stream) {
return; return;
} }
@ -428,15 +414,16 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples) :
// start the stream now that sources are good to go // start the stream now that sources are good to go
outputPortAudioError(Pa_StartStream(_stream)); outputPortAudioError(Pa_StartStream(_stream));
printLog("Default low input, output latency (secs): %0.4f, %0.4f\n",
Pa_GetDeviceInfo(Pa_GetDefaultInputDevice())->defaultLowInputLatency, // Uncomment these lines to see the system-reported latency
Pa_GetDeviceInfo(Pa_GetDefaultOutputDevice())->defaultLowOutputLatency); //printLog("Default low input, output latency (secs): %0.4f, %0.4f\n",
// Pa_GetDeviceInfo(Pa_GetDefaultInputDevice())->defaultLowInputLatency,
// Pa_GetDeviceInfo(Pa_GetDefaultOutputDevice())->defaultLowOutputLatency);
const PaStreamInfo* streamInfo = Pa_GetStreamInfo(_stream); const PaStreamInfo* streamInfo = Pa_GetStreamInfo(_stream);
printLog("Audio started, msecs latency In: %.0f, Out: %.0f\n", streamInfo->inputLatency * 1000.f, printLog("Started audio with reported latency msecs In/Out: %.0f, %.0f\n", streamInfo->inputLatency * 1000.f,
streamInfo->outputLatency * 1000.f); streamInfo->outputLatency * 1000.f);
gettimeofday(&_lastReceiveTime, NULL); gettimeofday(&_lastReceiveTime, NULL);
} }