smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

ALSA: only read/clear user-requested nperiods before snd_pcm_start

Browse source 
This should fix excessive latency with the RayDay that
has a fixed buffersize of 16384 samples.
This commit is contained in:
Robin Gareus 2020-05-01 23:11:18 +02:00
parent b258ad792e
commit 2326fb1638
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/backends/alsa/zita-alsa-pcmi.cc
View file

@ -53,6 +53,7 @@ Alsa_pcmi::Alsa_pcmi (
: _fsamp (fsamp) : _fsamp (fsamp)
, _fsize (fsize) , _fsize (fsize)
, _play_nfrag (play_nfrag) , _play_nfrag (play_nfrag)
, _real_nfrag (play_nfrag)
, _capt_nfrag (capt_nfrag) , _capt_nfrag (capt_nfrag)
, _debug (debug) , _debug (debug)
, _state (-1) , _state (-1)
@ -367,7 +368,7 @@ void Alsa_pcmi::printinfo (void)
fprintf (stdout, "\n nchan : %d\n", _play_nchan); fprintf (stdout, "\n nchan : %d\n", _play_nchan);
fprintf (stdout, " fsamp : %d\n", _fsamp); fprintf (stdout, " fsamp : %d\n", _fsamp);
fprintf (stdout, " fsize : %ld\n", _fsize); fprintf (stdout, " fsize : %ld\n", _fsize);
fprintf (stdout, " nfrag : %d\n", _play_nfrag); fprintf (stdout, " nfrag : %d\n", _real_nfrag);
fprintf (stdout, " format : %s\n", snd_pcm_format_name (_play_format)); fprintf (stdout, " format : %s\n", snd_pcm_format_name (_play_format));
} }
else fprintf (stdout, " not enabled\n"); else fprintf (stdout, " not enabled\n");
@ -484,10 +485,9 @@ void Alsa_pcmi::initialise (const char *play_name, const char *capt_name, const
_state = -4; _state = -4;
return; return;
} }
if (snd_pcm_hw_params_get_periods (_play_hwpar, &nfrag, &dir) || (nfrag != _play_nfrag) || dir) if (snd_pcm_hw_params_get_periods (_play_hwpar, &_real_nfrag, &dir) || (_real_nfrag != _play_nfrag) || dir)
{ {
if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi warning: requested %u periods for playback, using %u.\n", _play_nfrag, nfrag); if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi warning: requested %u periods for playback, using %u.\n", _play_nfrag, _real_nfrag);
_play_nfrag = nfrag; // this is later used during pcm_start
} }
snd_pcm_hw_params_get_format (_play_hwpar, &_play_format); snd_pcm_hw_params_get_format (_play_hwpar, &_play_format);

1
libs/backends/alsa/zita-alsa-pcmi.h
View file

@ -154,6 +154,7 @@ private:
unsigned int _fsamp; unsigned int _fsamp;
snd_pcm_uframes_t _fsize; snd_pcm_uframes_t _fsize;
unsigned int _play_nfrag; unsigned int _play_nfrag;
unsigned int _real_nfrag;
unsigned int _capt_nfrag; unsigned int _capt_nfrag;
unsigned int _debug; unsigned int _debug;
int _state; int _state;