Takashi Iwai
4f970fe93d
- Remove hackish modprobe install scripts for auto-loading OSS and sequencer modules (bsc#1136562); it's invoked from systemd unit file included in alsa-utils now - Backport upstream fixes: 0001-pcm-direct-Add-generic-hw_ptr_alignment-function-for.patch 0002-pcm-dshare-Added-hw_ptr_alignment-option-in-configur.patch 0003-pcm-dsnoop-Added-hw_ptr_alignment-option-in-configur.patch 0004-pcm-file-add-support-for-infile-reading-in-non-inter.patch 0005-pcm-file-use-snd_pcm_file_areas_read_infile-for-read.patch 0006-pcm-file-add-missing-unlock-on-early-return.patch 0007-ucm-Add-UCM-profile-for-CX2072X-codec-on-Baytrail-Ch.patch 0008-pcm-add-mmap_begin-callback-to-snd_pcm_fast_ops_t-ap.patch 0009-pcm-file-add-infile-read-support-for-mmap-mode.patch 0010-aserver-fix-resource-leak-coverity.patch 0011-src-conf.c-add-missing-va_end-call-coverity.patch 0012-config-parse_string-fix-the-dynamic-buffer-allocatio.patch 0013-control_shm-remove-duplicate-code-coverity.patch 0014-control_shm-add-missing-socket-close-to-the-error-pa.patch 0015-pcm-fix-memory-leak-in-_snd_pcm_parse_config_chmaps-.patch 0016-pcm_file-call-pclose-correctly-for-popen-coverity.patch 0017-pcm_hw-close-file-descriptor-in-the-error-path-in-sn.patch 0018-rawmidi-use-snd_dlobj_cache_get2-in-rawmidi-open-cov.patch 0019-rawmidi_hw-add-sanity-check-for-the-invalid-stream-a.patch 0020-topology-various-coverity-fixes.patch 0021-ucm-coverity-fixes.patch 0022-pcm_file-coverity-fixes-including-double-locking.patch 0023-topology-next-round-of-coverity-fixes.patch 0024-pcm_file-another-locking-fix-coverity.patch 0025-ucm-another-coverity-fix-in-uc_mgr_config_load.patch - Drop the downstream CX2072X UCM profile, which is replaced with OBS-URL: https://build.opensuse.org/request/show/706089 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=253
65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From 349b42f5477c904fa3e10bac2fa2429fad2cbc65 Mon Sep 17 00:00:00 2001
|
|
From: Adam Miartus <amiartus@de.adit-jv.com>
|
|
Date: Tue, 21 May 2019 15:33:08 +0200
|
|
Subject: [PATCH 05/25] pcm: file: use snd_pcm_file_areas_read_infile for readi
|
|
|
|
use previously introduced helper function, this commit unifies behavior
|
|
of readi and readn
|
|
|
|
corner case behavior of readi is changed by this commit, previously,
|
|
in case 0 bytes were red from file (EOF), frames = 0 was returned,
|
|
signaling api user as if no data was red from slave, after the patch,
|
|
amount of frames red from slave with data red from slave stored in buffer
|
|
is returned when EOF is reached
|
|
|
|
Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
|
|
Reviewed-by: Timo Wischer <twischer@de.adit-jv.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_file.c | 27 +++++++++++++--------------
|
|
1 file changed, 13 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
|
|
index 3c682659d5ec..dcaa41d10e35 100644
|
|
--- a/src/pcm/pcm_file.c
|
|
+++ b/src/pcm/pcm_file.c
|
|
@@ -579,22 +579,21 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc
|
|
{
|
|
snd_pcm_file_t *file = pcm->private_data;
|
|
snd_pcm_channel_area_t areas[pcm->channels];
|
|
- snd_pcm_sframes_t n;
|
|
+ snd_pcm_sframes_t frames;
|
|
+
|
|
+ __snd_pcm_lock(pcm);
|
|
+
|
|
+ frames = _snd_pcm_readi(file->gen.slave, buffer, size);
|
|
+ if (frames <= 0)
|
|
+ return frames;
|
|
|
|
- n = _snd_pcm_readi(file->gen.slave, buffer, size);
|
|
- if (n <= 0)
|
|
- return n;
|
|
- if (file->ifd >= 0) {
|
|
- __snd_pcm_lock(pcm);
|
|
- n = read(file->ifd, buffer, n * pcm->frame_bits / 8);
|
|
- __snd_pcm_unlock(pcm);
|
|
- if (n < 0)
|
|
- return n;
|
|
- n = n * 8 / pcm->frame_bits;
|
|
- }
|
|
snd_pcm_areas_from_buf(pcm, areas, buffer);
|
|
- snd_pcm_file_add_frames(pcm, areas, 0, n);
|
|
- return n;
|
|
+ snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);
|
|
+ snd_pcm_file_add_frames(pcm, areas, 0, frames);
|
|
+
|
|
+ __snd_pcm_unlock(pcm);
|
|
+
|
|
+ return frames;
|
|
}
|
|
|
|
/* locking */
|
|
--
|
|
2.16.4
|
|
|