musicdsp/audio-orchestra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct ALSA timestamp

Browse Source
This commit is contained in:
Edouard DUPIN 2015-02-16 23:01:26 +01:00
parent d9453e6e7a
commit b72d6f31df
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
airtaudio/api/Alsa.cpp
View File

@ -600,21 +600,22 @@ foundDevice:
return false; return false;
} }
// Set the software configuration to fill buffers with zeros and prevent device stopping on xruns. // Set the software configuration to fill buffers with zeros and prevent device stopping on xruns.
snd_pcm_sw_params_t *sw_params = nullptr; snd_pcm_sw_params_t *swParams = nullptr;
snd_pcm_sw_params_alloca(&sw_params); snd_pcm_sw_params_alloca(&swParams);
snd_pcm_sw_params_current(phandle, sw_params); snd_pcm_sw_params_current(phandle, swParams);
snd_pcm_sw_params_set_start_threshold(phandle, sw_params, *_bufferSize); snd_pcm_sw_params_set_start_threshold(phandle, swParams, *_bufferSize);
snd_pcm_sw_params_set_stop_threshold(phandle, sw_params, ULONG_MAX); snd_pcm_sw_params_set_stop_threshold(phandle, swParams, ULONG_MAX);
snd_pcm_sw_params_set_silence_threshold(phandle, sw_params, 0); snd_pcm_sw_params_set_silence_threshold(phandle, swParams, 0);
// The following two settings were suggested by Theo Veenker // The following two settings were suggested by Theo Veenker
//snd_pcm_sw_params_set_avail_min(phandle, sw_params, *_bufferSize); //snd_pcm_sw_params_set_avail_min(phandle, swParams, *_bufferSize);
//snd_pcm_sw_params_set_xfer_align(phandle, sw_params, 1); //snd_pcm_sw_params_set_xfer_align(phandle, swParams, 1);
// here are two options for a fix // here are two options for a fix
//snd_pcm_sw_params_set_silence_size(phandle, sw_params, ULONG_MAX); //snd_pcm_sw_params_set_silence_size(phandle, swParams, ULONG_MAX);
snd_pcm_sw_params_set_tstamp_mode(phandle, swParams, SND_PCM_TSTAMP_ENABLE);
snd_pcm_uframes_t val; snd_pcm_uframes_t val;
snd_pcm_sw_params_get_boundary(sw_params, &val); snd_pcm_sw_params_get_boundary(swParams, &val);
snd_pcm_sw_params_set_silence_size(phandle, sw_params, val); snd_pcm_sw_params_set_silence_size(phandle, swParams, val);
result = snd_pcm_sw_params(phandle, sw_params); result = snd_pcm_sw_params(phandle, swParams);
if (result < 0) { if (result < 0) {
snd_pcm_close(phandle); snd_pcm_close(phandle);
ATA_ERROR("error installing software configuration on device (" << name << "), " << snd_strerror(result) << "."); ATA_ERROR("error installing software configuration on device (" << name << "), " << snd_strerror(result) << ".");
@ -919,6 +920,19 @@ void airtaudio::api::Alsa::callbackEvent() {
} }
} }
std::chrono::time_point<std::chrono::system_clock> airtaudio::api::Alsa::getStreamTime() {
snd_pcm_uframes_t avail;
snd_htimestamp_t tstamp;
if (m_private->handles[0] != nullptr) {
int plop = snd_pcm_htimestamp(m_private->handles[0], &avail, &tstamp);
} else if (m_private->handles[1] != nullptr) {
int plop = snd_pcm_htimestamp(m_private->handles[1], &avail, &tstamp);
}
//ATA_WARNING("plop : " << tstamp.tv_sec << " sec " << tstamp.tv_nsec);
return std::chrono::system_clock::from_time_t(tstamp.tv_sec) + std::chrono::nanoseconds(tstamp.tv_nsec);
}
void airtaudio::api::Alsa::callbackEventOneCycle() { void airtaudio::api::Alsa::callbackEventOneCycle() {
if (m_state == airtaudio::state_stopped) { if (m_state == airtaudio::state_stopped) {
std::unique_lock<std::mutex> lck(m_mutex); std::unique_lock<std::mutex> lck(m_mutex);
@ -939,11 +953,13 @@ void airtaudio::api::Alsa::callbackEventOneCycle() {
int32_t doStopStream = 0; int32_t doStopStream = 0;
std::chrono::system_clock::time_point streamTime = getStreamTime(); std::chrono::system_clock::time_point streamTime = getStreamTime();
enum airtaudio::status status = airtaudio::status_ok; enum airtaudio::status status = airtaudio::status_ok;
if (m_mode != airtaudio::mode_input && m_private->xrun[0] == true) { if ( m_mode != airtaudio::mode_input
&& m_private->xrun[0] == true) {
status = airtaudio::status_underflow; status = airtaudio::status_underflow;
m_private->xrun[0] = false; m_private->xrun[0] = false;
} }
if (m_mode != airtaudio::mode_output && m_private->xrun[1] == true) { if ( m_mode != airtaudio::mode_output
&& m_private->xrun[1] == true) {
status = airtaudio::status_overflow; status = airtaudio::status_overflow;
m_private->xrun[1] = false; m_private->xrun[1] = false;
} }

1
airtaudio/api/Alsa.h
View File

@ -46,6 +46,7 @@ namespace airtaudio {
enum audio::format _format, enum audio::format _format,
uint32_t *_bufferSize, uint32_t *_bufferSize,
airtaudio::StreamOptions *_options); airtaudio::StreamOptions *_options);
virtual std::chrono::time_point<std::chrono::system_clock> getStreamTime();
}; };
}; };
}; };