5da7a20162
- Remove superfluous Loopback.conf from the source, as it was already included in 1.0.28 tarball - Backport upstream fixes: UCM dummy PCM definition, ICE1712 surround definitions, USB-audio secondary PCM definition, PCM rate plugin boundary overwrap fix, MONOTONIC_RAW timestamp support, PCM route plugin 3-byte format fixes, etc: 0001-ucm-Document-PlaybackPCMIsDummy-and-CapturePCMIsDumm.patch 0002-ICE1712-add-surround71-pcm-definition.patch 0003-USB-Audio-Add-second-S-PDIF-device-on-Phiree-U2.patch 0004-pcm-rate-fix-hw_ptr-exceed-the-boundary.patch 0005-pcm-Provide-a-CLOCK_MONOTONIC_RAW-timestamp-type.patch 0006-Add-timestamp-type-to-sw_params-internal-only.patch 0007-pcm-Add-sw_params-API-functions-to-get-set-timestamp.patch 0008-pcm-Implement-timestamp-type-setup-in-hw-plugin.patch 0009-pcm-Implement-timestamp-type-handling-in-all-plugins.patch 0010-test-audio_time-Set-timestamp-type-explicitly.patch 0011-pcm-route-Use-get-put-labels-for-all-3-byte-formats.patch 0012-pcm-Fill-sw_params-proto-field.patch 0013-pcm-route-Use-get32-for-multi-source-route-calculati.patch 0014-pcm-Drop-snd_pcm_linear_-get-put-32_index.patch OBS-URL: https://build.opensuse.org/request/show/241986 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=162
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From de63b942acf520a25ff469cf338a99eb3da65570 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Mon, 21 Jul 2014 16:30:54 +0200
|
|
Subject: [PATCH 11/14] pcm: route: Use get/put labels for all 3 byte formats
|
|
|
|
So far, use_getput flag is set only when the src or dest format is
|
|
24bit physical width. But, also 18 and 20 bit physical width formats
|
|
should set the flag, too. This patch makes the check broader to cover
|
|
all 3 bytes formats.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_route.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
|
|
index 2f0be38b1906..72c198cb25d2 100644
|
|
--- a/src/pcm/pcm_route.c
|
|
+++ b/src/pcm/pcm_route.c
|
|
@@ -644,8 +644,10 @@ static int snd_pcm_route_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
|
|
}
|
|
if (err < 0)
|
|
return err;
|
|
- route->params.use_getput = snd_pcm_format_physical_width(src_format) == 24 ||
|
|
- snd_pcm_format_physical_width(dst_format) == 24;
|
|
+ /* 3 bytes formats? */
|
|
+ route->params.use_getput =
|
|
+ (snd_pcm_format_physical_width(src_format) + 7) / 3 == 3 ||
|
|
+ (snd_pcm_format_physical_width(dst_format) + 7) / 3 == 3;
|
|
route->params.get_idx = snd_pcm_linear_get_index(src_format, SND_PCM_FORMAT_S16);
|
|
route->params.put_idx = snd_pcm_linear_put32_index(SND_PCM_FORMAT_S32, dst_format);
|
|
route->params.conv_idx = snd_pcm_linear_convert_index(src_format, dst_format);
|
|
--
|
|
2.0.1
|
|
|