mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-01 01:40:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: hw: add drain_silence configuration keyword

Browse source 
# Add silence in drain (-1 = auto /default/, 0 = off, > 0 milliseconds)
  [drain_silence INT]

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2023-04-25 14:33:46 +02:00
parent 2115cdb4dc
commit dd9cb31a90
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/pcm/pcm_hw.c
View file

@ -111,6 +111,7 @@ typedef struct {
int max; int max;
} rates; } rates;
int channels; int channels;
int drain_silence;
/* for chmap */ /* for chmap */
unsigned int chmap_caps; unsigned int chmap_caps;
snd_pcm_chmap_query_t **chmap_override; snd_pcm_chmap_query_t **chmap_override;
@ -738,8 +739,16 @@ static int snd_pcm_hw_drain(snd_pcm_t *pcm)
if (pcm->stream != SND_PCM_STREAM_PLAYBACK) if (pcm->stream != SND_PCM_STREAM_PLAYBACK)
goto __skip_silence; goto __skip_silence;
/* compute end silence size, align to period size + extra time */ if (hw->drain_silence == 0)
goto __skip_silence;
snd_pcm_sw_params_current_no_lock(pcm, &sw_params); snd_pcm_sw_params_current_no_lock(pcm, &sw_params);
if (hw->drain_silence > 0) {
silence_size = (pcm->rate * hw->drain_silence) / 1000;
if (silence_size > pcm->buffer_size)
silence_size = pcm->buffer_size;
goto __manual_silence;
}
/* compute end silence size, align to period size + extra time */
if ((pcm->boundary % pcm->period_size) == 0) { if ((pcm->boundary % pcm->period_size) == 0) {
silence_size = pcm->period_size - (*pcm->appl.ptr % pcm->period_size); silence_size = pcm->period_size - (*pcm->appl.ptr % pcm->period_size);
if (silence_size == pcm->period_size) if (silence_size == pcm->period_size)
@ -752,6 +761,7 @@ static int snd_pcm_hw_drain(snd_pcm_t *pcm)
silence_size = pcm->period_size; silence_size = pcm->period_size;
} }
silence_size += pcm->rate / 10; /* 1/10th of second */ silence_size += pcm->rate / 10; /* 1/10th of second */
__manual_silence:
if (sw_params.silence_size < silence_size) { if (sw_params.silence_size < silence_size) {
/* fill the silence soon as possible (in the bellow ioctl /* fill the silence soon as possible (in the bellow ioctl
* or the next period wake up) * or the next period wake up)
@ -1818,6 +1828,7 @@ pcm.name {
[rate INT] # Restrict only to the given rate [rate INT] # Restrict only to the given rate
or [rate [INT INT]] # Restrict only to the given rate range (min max) or [rate [INT INT]] # Restrict only to the given rate range (min max)
[chmap MAP] # Override channel maps; MAP is a string array [chmap MAP] # Override channel maps; MAP is a string array
[drain_silence INT] # Add silence in drain (-1 = auto /default/, 0 = off, > 0 milliseconds)
} }
\endcode \endcode
@ -1850,7 +1861,7 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name,
long card = -1, device = 0, subdevice = -1; long card = -1, device = 0, subdevice = -1;
const char *str; const char *str;
int err, sync_ptr_ioctl = 0; int err, sync_ptr_ioctl = 0;
int min_rate = 0, max_rate = 0, channels = 0; int min_rate = 0, max_rate = 0, channels = 0, drain_silence = -1;
snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN; snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN;
snd_config_t *n; snd_config_t *n;
int nonblock = 1; /* non-block per default */ int nonblock = 1; /* non-block per default */
@ -1991,6 +2002,16 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name,
} }
continue; continue;
} }
if (strcmp(id, "drain_silence") == 0) {
long val;
err = snd_config_get_integer(n, &val);
if (err < 0) {
SNDERR("Invalid type for %s", id);
goto fail;
}
drain_silence = val;
continue;
}
SNDERR("Unknown field %s", id); SNDERR("Unknown field %s", id);
err = -EINVAL; err = -EINVAL;
goto fail; goto fail;
@ -2033,6 +2054,7 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name,
} }
if (chmap) if (chmap)
hw->chmap_override = chmap; hw->chmap_override = chmap;
hw->drain_silence = drain_silence;
return 0; return 0;