diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2006-10-23 16:26:57 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@server.perex.cz> | 2006-12-20 08:55:43 +0100 |
| commit | 9a826ddba6e087b1be24dd78cd0eac42f7eb7e97 (patch) | |
| tree | 95740bc34b8face55eb7c989e550986e4136259d /sound/core | |
| parent | 3bc89529594767b0f894589f6c05b2d9821b6791 (diff) | |
| download | lwn-9a826ddba6e087b1be24dd78cd0eac42f7eb7e97.tar.gz lwn-9a826ddba6e087b1be24dd78cd0eac42f7eb7e97.zip | |
[ALSA] pcm core: fix silence_start calculations
The case where silence_size < boundary was broken because different
parts of the snd_pcm_playback_silence() function disagreed about whether
silence_start should point to the start or to the end of the buffer part
to be silenced.
This patch changes the code to always use to the start, which also
simplifies several calculations.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_lib.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 0bb142a28539..b336797be4fc 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -79,19 +79,17 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram runtime->silence_filled -= frames; if ((snd_pcm_sframes_t)runtime->silence_filled < 0) { runtime->silence_filled = 0; - runtime->silence_start = (ofs + frames) - runtime->buffer_size; + runtime->silence_start = new_hw_ptr; } else { - runtime->silence_start = ofs - runtime->silence_filled; + runtime->silence_start = ofs; } - if ((snd_pcm_sframes_t)runtime->silence_start < 0) - runtime->silence_start += runtime->boundary; } frames = runtime->buffer_size - runtime->silence_filled; } snd_assert(frames <= runtime->buffer_size, return); if (frames == 0) return; - ofs = (runtime->silence_start + runtime->silence_filled) % runtime->buffer_size; + ofs = runtime->silence_start % runtime->buffer_size; while (frames > 0) { transfer = ofs + frames > runtime->buffer_size ? runtime->buffer_size - ofs : frames; if (runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED || |