diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-01-11 04:24:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-14 15:42:34 -0500 |
commit | e3a9269f874067fcefc5eb8037466161fb0fe3f4 (patch) | |
tree | 5d5d71d96c19cd786fd14e2ccfe50d22ab962c3a | |
parent | bf103eb4af73596edbab5faab67e29ea1e87c769 (diff) |
ALSA: Add helper function for intersecting two rate masks
A bit of special care is necessary when creating the intersection of two rate
masks. This comes from the special meaning of the SNDRV_PCM_RATE_CONTINUOUS and
SNDRV_PCM_RATE_KNOT bits, which needs special handling when intersecting two
rate masks. SNDRV_PCM_RATE_CONTINUOUS means the hardware supports all rates in a
specific interval. SNDRV_PCM_RATE_KNOT means the hardware supports a set of
discrete rates specified by a list constraint. For all other cases the supported
rates are specified directly in the rate mask.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | include/sound/pcm.h | 2 | ||||
-rw-r--r-- | sound/core/pcm_misc.c | 39 |
2 files changed, 41 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 84b10f9a2832..d0170913374d 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
@@ -901,6 +901,8 @@ extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates; | |||
901 | int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime); | 901 | int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime); |
902 | unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate); | 902 | unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate); |
903 | unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit); | 903 | unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit); |
904 | unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a, | ||
905 | unsigned int rates_b); | ||
904 | 906 | ||
905 | static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream, | 907 | static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream, |
906 | struct snd_dma_buffer *bufp) | 908 | struct snd_dma_buffer *bufp) |
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c index 43f24cce3dec..4560ca0e5651 100644 --- a/sound/core/pcm_misc.c +++ b/sound/core/pcm_misc.c | |||
@@ -514,3 +514,42 @@ unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit) | |||
514 | return 0; | 514 | return 0; |
515 | } | 515 | } |
516 | EXPORT_SYMBOL(snd_pcm_rate_bit_to_rate); | 516 | EXPORT_SYMBOL(snd_pcm_rate_bit_to_rate); |
517 | |||
518 | static unsigned int snd_pcm_rate_mask_sanitize(unsigned int rates) | ||
519 | { | ||
520 | if (rates & SNDRV_PCM_RATE_CONTINUOUS) | ||
521 | return SNDRV_PCM_RATE_CONTINUOUS; | ||
522 | else if (rates & SNDRV_PCM_RATE_KNOT) | ||
523 | return SNDRV_PCM_RATE_KNOT; | ||
524 | return rates; | ||
525 | } | ||
526 | |||
527 | /** | ||
528 | * snd_pcm_rate_mask_intersect - computes the intersection between two rate masks | ||
529 | * @rates_a: The first rate mask | ||
530 | * @rates_b: The second rate mask | ||
531 | * | ||
532 | * This function computes the rates that are supported by both rate masks passed | ||
533 | * to the function. It will take care of the special handling of | ||
534 | * SNDRV_PCM_RATE_CONTINUOUS and SNDRV_PCM_RATE_KNOT. | ||
535 | * | ||
536 | * Return: A rate mask containing the rates that are supported by both rates_a | ||
537 | * and rates_b. | ||
538 | */ | ||
539 | unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a, | ||
540 | unsigned int rates_b) | ||
541 | { | ||
542 | rates_a = snd_pcm_rate_mask_sanitize(rates_a); | ||
543 | rates_b = snd_pcm_rate_mask_sanitize(rates_b); | ||
544 | |||
545 | if (rates_a & SNDRV_PCM_RATE_CONTINUOUS) | ||
546 | return rates_b; | ||
547 | else if (rates_b & SNDRV_PCM_RATE_CONTINUOUS) | ||
548 | return rates_a; | ||
549 | else if (rates_a & SNDRV_PCM_RATE_KNOT) | ||
550 | return rates_b; | ||
551 | else if (rates_b & SNDRV_PCM_RATE_KNOT) | ||
552 | return rates_a; | ||
553 | return rates_a & rates_b; | ||
554 | } | ||
555 | EXPORT_SYMBOL_GPL(snd_pcm_rate_mask_intersect); | ||