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

Commit 4a443657 authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ALSA: pcm: add IEC958 channel status helper for hw_params 



Add IEC958 channel status helper that gets the audio properties from
snd_pcm_hw_params instead of snd_pcm_runtime. This is needed to
produce the channel status bits already in audio stream configuration
phase.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f55532a0

include/sound/pcm_iec958.h

+2 −0
Original line number Diff line number Diff line
@@ -6,4 +6,6 @@ 
int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs,

	size_t len);



int snd_pcm_create_iec958_consumer_hw_params(struct snd_pcm_hw_params *params,

					     u8 *cs, size_t len);

#endif

sound/core/pcm_iec958.c

+47 −17
Original line number Diff line number Diff line
@@ -9,30 +9,18 @@ 
#include <linux/types.h>

#include <sound/asoundef.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/pcm_iec958.h>



/**

 * snd_pcm_create_iec958_consumer - create consumer format IEC958 channel status

 * @runtime: pcm runtime structure with ->rate filled in

 * @cs: channel status buffer, at least four bytes

 * @len: length of channel status buffer

 *

 * Create the consumer format channel status data in @cs of maximum size

 * @len corresponding to the parameters of the PCM runtime @runtime.

 *

 * Drivers may wish to tweak the contents of the buffer after creation.

 *

 * Returns: length of buffer, or negative error code if something failed.

 */

int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs,

	size_t len)

static int create_iec958_consumer(uint rate, uint sample_width,

				  u8 *cs, size_t len)

{

	unsigned int fs, ws;



	if (len < 4)

		return -EINVAL;



	switch (runtime->rate) {

	switch (rate) {

	case 32000:

		fs = IEC958_AES3_CON_FS_32000;

		break;
@@ -59,7 +47,7 @@ int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs, 
	}



	if (len > 4) {

		switch (snd_pcm_format_width(runtime->format)) {

		switch (sample_width) {

		case 16:

			ws = IEC958_AES4_CON_WORDLEN_20_16;

			break;
@@ -92,4 +80,46 @@ int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs, 


	return len;

}



/**

 * snd_pcm_create_iec958_consumer - create consumer format IEC958 channel status

 * @runtime: pcm runtime structure with ->rate filled in

 * @cs: channel status buffer, at least four bytes

 * @len: length of channel status buffer

 *

 * Create the consumer format channel status data in @cs of maximum size

 * @len corresponding to the parameters of the PCM runtime @runtime.

 *

 * Drivers may wish to tweak the contents of the buffer after creation.

 *

 * Returns: length of buffer, or negative error code if something failed.

 */

int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs,

	size_t len)

{

	return create_iec958_consumer(runtime->rate,

				      snd_pcm_format_width(runtime->format),

				      cs, len);

}

EXPORT_SYMBOL(snd_pcm_create_iec958_consumer);



/**

 * snd_pcm_create_iec958_consumer_hw_params - create IEC958 channel status

 * @hw_params: the hw_params instance for extracting rate and sample format

 * @cs: channel status buffer, at least four bytes

 * @len: length of channel status buffer

 *

 * Create the consumer format channel status data in @cs of maximum size

 * @len corresponding to the parameters of the PCM runtime @runtime.

 *

 * Drivers may wish to tweak the contents of the buffer after creation.

 *

 * Returns: length of buffer, or negative error code if something failed.

 */

int snd_pcm_create_iec958_consumer_hw_params(struct snd_pcm_hw_params *params,

					     u8 *cs, size_t len)

{

	return create_iec958_consumer(params_rate(params), params_width(params),

				      cs, len);

}

EXPORT_SYMBOL(snd_pcm_create_iec958_consumer_hw_params);