diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2016-04-06 19:02:12 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-07 16:19:01 +0200 |
| commit | 7c424edd116e76eee6218a1e9a6ff6c4daaf2a4d (patch) | |
| tree | cc82a64586b362347de61e6dbca826db11683526 /src/pcm/pcm_plugin.c | |
| parent | 6a610e56aeef5048136336f7f54db05f061ee4d4 (diff) | |
| download | alsa-lib-7c424edd116e76eee6218a1e9a6ff6c4daaf2a4d.tar.gz | |
pcm_plugin: fix appl pointer not correct when mmap_commit() return error
When snd_pcm_mmap_commit() return error, the appl pointer is also updated.
which cause the avail_update()'s result wrong.
This patch move the snd_pcm_mmap_appl_forward() to the place when
snd_pcm_mmap_commit() is successfully returned.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'src/pcm/pcm_plugin.c')
| -rw-r--r-- | src/pcm/pcm_plugin.c | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index d007e8c8..940491db 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -279,18 +279,22 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm, return -EPIPE; } snd_atomic_write_begin(&plugin->watom); - snd_pcm_mmap_appl_forward(pcm, frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) { snd_pcm_sframes_t res; res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result); - if (res < 0) + if (res < 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? (snd_pcm_sframes_t)xfer : res; + } frames -= res; } - snd_atomic_write_end(&plugin->watom); - if (result <= 0) + if (result <= 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? (snd_pcm_sframes_t)xfer : result; + } + snd_pcm_mmap_appl_forward(pcm, frames); + snd_atomic_write_end(&plugin->watom); offset += frames; xfer += frames; size -= frames; @@ -325,19 +329,23 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm, return -EPIPE; } snd_atomic_write_begin(&plugin->watom); - snd_pcm_mmap_appl_forward(pcm, frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) { snd_pcm_sframes_t res; res = plugin->undo_read(slave, areas, offset, frames, slave_frames - result); - if (res < 0) + if (res < 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? (snd_pcm_sframes_t)xfer : res; + } frames -= res; } - snd_atomic_write_end(&plugin->watom); - if (result <= 0) + if (result <= 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? (snd_pcm_sframes_t)xfer : result; + } + snd_pcm_mmap_appl_forward(pcm, frames); + snd_atomic_write_end(&plugin->watom); offset += frames; xfer += frames; size -= frames; @@ -423,19 +431,23 @@ snd_pcm_plugin_mmap_commit(snd_pcm_t *pcm, frames = plugin->write(pcm, areas, appl_offset, frames, slave_areas, slave_offset, &slave_frames); snd_atomic_write_begin(&plugin->watom); - snd_pcm_mmap_appl_forward(pcm, frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); - snd_atomic_write_end(&plugin->watom); if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) { snd_pcm_sframes_t res; res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result); - if (res < 0) + if (res < 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? xfer : res; + } frames -= res; } - if (result <= 0) + if (result <= 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? xfer : result; + } + snd_pcm_mmap_appl_forward(pcm, frames); + snd_atomic_write_end(&plugin->watom); if (frames == cont) appl_offset = 0; else @@ -490,19 +502,23 @@ static snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm) frames = (plugin->read)(pcm, areas, hw_offset, frames, slave_areas, slave_offset, &slave_frames); snd_atomic_write_begin(&plugin->watom); - snd_pcm_mmap_hw_forward(pcm, frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); - snd_atomic_write_end(&plugin->watom); if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) { snd_pcm_sframes_t res; res = plugin->undo_read(slave, areas, hw_offset, frames, slave_frames - result); - if (res < 0) + if (res < 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? (snd_pcm_sframes_t)xfer : res; + } frames -= res; } - if (result <= 0) + if (result <= 0) { + snd_atomic_write_end(&plugin->watom); return xfer > 0 ? (snd_pcm_sframes_t)xfer : result; + } + snd_pcm_mmap_hw_forward(pcm, frames); + snd_atomic_write_end(&plugin->watom); if (frames == cont) hw_offset = 0; else |