Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc07f55 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: pcm: add a helper function to apply parameter rules 



Application of rules to parameters of PCM substream is done in a call of
snd_pcm_hw_refine(), while the function includes much codes and is not
enough friendly to readers.

This commit splits the codes to a separated function so that readers can
get it easily. I leave desicion into compilers to merge the function into
its callee.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3432fa04

sound/core/pcm_native.c

+45 −32
Original line number Original line Diff line number Diff line
@@ -319,39 +319,19 @@ static int constrain_interval_params(struct snd_pcm_substream *substream, 
	return 0;

	return 0;

}

}





int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 

static int constrain_params_by_rules(struct snd_pcm_substream *substream,

				     struct snd_pcm_hw_params *params)

				     struct snd_pcm_hw_params *params)

{

{

	struct snd_pcm_hw_constraints *constrs =

					&substream->runtime->hw_constraints;

	unsigned int k;

	unsigned int k;

	struct snd_pcm_hardware *hw;

	struct snd_interval *i = NULL;

	struct snd_mask *m = NULL;

	struct snd_pcm_hw_constraints *constrs = &substream->runtime->hw_constraints;

	unsigned int rstamps[constrs->rules_num];

	unsigned int rstamps[constrs->rules_num];

	unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];

	unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];

	unsigned int stamp = 2;

	unsigned int stamp = 2;

	int changed, again;

	struct snd_mask old_mask;

	int err;

	struct snd_interval old_interval;



	int again;

	struct snd_mask __maybe_unused old_mask;

	int changed;

	struct snd_interval __maybe_unused old_interval;



	params->info = 0;

	params->fifo_size = 0;

	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_SAMPLE_BITS))

		params->msbits = 0;

	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_RATE)) {

		params->rate_num = 0;

		params->rate_den = 0;

	}



	err = constrain_mask_params(substream, params);

	if (err < 0)

		return err;



	err = constrain_interval_params(substream, params);

	if (err < 0)

		return err;





	for (k = 0; k < constrs->rules_num; k++)

	for (k = 0; k < constrs->rules_num; k++)

		rstamps[k] = 0;

		rstamps[k] = 0;
@@ -405,6 +385,39 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
			stamp++;

			stamp++;

		}

		}

	} while (again);

	} while (again);



	return 0;

}



int snd_pcm_hw_refine(struct snd_pcm_substream *substream,

		      struct snd_pcm_hw_params *params)

{

	struct snd_pcm_hardware *hw;

	struct snd_interval *i = NULL;

	struct snd_mask *m = NULL;

	int err;



	params->info = 0;

	params->fifo_size = 0;

	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_SAMPLE_BITS))

		params->msbits = 0;

	if (params->rmask & (1 << SNDRV_PCM_HW_PARAM_RATE)) {

		params->rate_num = 0;

		params->rate_den = 0;

	}



	err = constrain_mask_params(substream, params);

	if (err < 0)

		return err;



	err = constrain_interval_params(substream, params);

	if (err < 0)

		return err;



	err = constrain_params_by_rules(substream, params);

	if (err < 0)

		return err;



	if (!params->msbits) {

	if (!params->msbits) {

		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);

		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);

		if (snd_interval_single(i))

		if (snd_interval_single(i))
@@ -432,10 +445,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);

		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);

		if (snd_mask_min(m) == snd_mask_max(m) &&

		if (snd_mask_min(m) == snd_mask_max(m) &&

                    snd_interval_min(i) == snd_interval_max(i)) {

                    snd_interval_min(i) == snd_interval_max(i)) {

			changed = substream->ops->ioctl(substream,

			err = substream->ops->ioctl(substream,

					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);

					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);

			if (changed < 0)

			if (err < 0)

				return changed;

				return err;

		}

		}

	}

	}

	params->rmask = 0;

	params->rmask = 0;