ardour/livetrax
13
0
Fork 0
Code

Fix ALSA slave-device half-duplex mode

Browse Source
This commit is contained in:
Robin Gareus 2020-04-10 05:01:19 +02:00
parent 78b29c55d3
commit e8efd45c05
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/backends/alsa/alsa_slave.cc
View File

@ -61,19 +61,25 @@ AlsaAudioSlave::AlsaAudioSlave (
_ratio = (double) master_rate / (double) _pcmi.fsamp(); _ratio = (double) master_rate / (double) _pcmi.fsamp();
#ifndef NDEBUG #ifndef NDEBUG
fprintf (stdout, " --[[ ALSA Slave %s/%s ratio: %.4f\n", play_name, capt_name, _ratio); fprintf (stdout, " --[[ ALSA Slave %s/%s ratio: %.4f\n",
capt_name ? capt_name : "-",
play_name ? play_name : "-",
_ratio);
_pcmi.printinfo (); _pcmi.printinfo ();
fprintf (stdout, " --]]\n"); fprintf (stdout, " --]]\n");
#endif #endif
_src_capt.setup (_ratio, _pcmi.ncapt (), /*quality*/ 32); // save capture to master if (_pcmi.ncapt () > 0) {
_src_play.setup (1.0 / _ratio, _pcmi.nplay (), /*quality*/ 32); // master to slave play _src_capt.setup (_ratio, _pcmi.ncapt (), /*quality*/ 32); // save capture to master
_src_capt.set_rrfilt (100);
_capt_buff = (float*) malloc (sizeof(float) * _pcmi.ncapt () * _samples_per_period);
}
if (_pcmi.nplay () > 0) {
_src_play.setup (1.0 / _ratio, _pcmi.nplay (), /*quality*/ 32); // master to slave play
_src_play.set_rrfilt (100);
_play_buff = (float*) malloc (sizeof(float) * _pcmi.nplay () * _samples_per_period);
}
_src_capt.set_rrfilt (100);
_src_play.set_rrfilt (100);
_capt_buff = (float*) malloc (sizeof(float) * _pcmi.ncapt () * _samples_per_period);
_play_buff = (float*) malloc (sizeof(float) * _pcmi.nplay () * _samples_per_period);
_src_buff = (float*) malloc (sizeof(float) * std::max (_pcmi.nplay (), _pcmi.ncapt ())); _src_buff = (float*) malloc (sizeof(float) * std::max (_pcmi.nplay (), _pcmi.ncapt ()));
} }
@ -357,7 +363,9 @@ AlsaAudioSlave::cycle_start (double tme, double mst_speed, bool drain)
_src_capt.set_rratio (mst_speed / slave_speed); _src_capt.set_rratio (mst_speed / slave_speed);
_src_play.set_rratio (slave_speed / mst_speed); _src_play.set_rratio (slave_speed / mst_speed);
memset (_capt_buff, 0, sizeof(float) * _pcmi.ncapt () * _samples_per_period); if (_capt_buff) {
memset (_capt_buff, 0, sizeof(float) * _pcmi.ncapt () * _samples_per_period);
}
if (drain) { if (drain) {
g_atomic_int_set(&_draining, 1); g_atomic_int_set(&_draining, 1);
@ -384,7 +392,7 @@ AlsaAudioSlave::cycle_start (double tme, double mst_speed, bool drain)
} }
bool underflow = false; bool underflow = false;
while (_src_capt.out_count && _active) { while (_src_capt.out_count && _active && nchn > 0) {
if (_rb_capture.read_space() < nchn) { if (_rb_capture.read_space() < nchn) {
underflow = true; underflow = true;
break; break;
@ -411,11 +419,13 @@ AlsaAudioSlave::cycle_start (double tme, double mst_speed, bool drain)
g_atomic_int_set(&_draining, 1); g_atomic_int_set(&_draining, 1);
} }
if (!_active || underflow) { if ((!_active || underflow) && _capt_buff) {
memset (_capt_buff, 0, sizeof(float) * _pcmi.ncapt () * _samples_per_period); memset (_capt_buff, 0, sizeof(float) * _pcmi.ncapt () * _samples_per_period);
} }
memset (_play_buff, 0, sizeof(float) * _pcmi.nplay () * _samples_per_period); if (_play_buff) {
memset (_play_buff, 0, sizeof(float) * _pcmi.nplay () * _samples_per_period);
}
} }
void void