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

Commit 4ae66ebe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I818ace83,Ie61170c6,Iacb46cdf,Ieeb9d302,I9abeb9cd into msm-next 

* changes:
  ASoC: msm: qdsp6v2: Add FLAC in compress offload path
  ALSA: compress: add timestamp support for compress audio
  ASoC: msm: Add support for AC3 and EC3 playback in tunnel mode
  ASoC: msm: Update the encode option and sample rate
  Asoc: Add audio backend to hwdep interface
parents 117a215a c77ff8f2

include/uapi/sound/asound.h

+6 −1
Original line number Diff line number Diff line
@@ -110,11 +110,16 @@ enum { 
	SNDRV_HWDEP_IFACE_LINE6,	/* Line6 USB processors */

	SNDRV_HWDEP_IFACE_FW_MOTU,	/* MOTU FireWire series */

	SNDRV_HWDEP_IFACE_FW_FIREFACE,	/* RME Fireface series */

	SNDRV_HWDEP_IFACE_AUDIO_BE,	/* Backend Audio Control */

	SNDRV_HWDEP_IFACE_AUDIO_CODEC,  /* codec Audio Control */



	/* Don't forget to change the following: */

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_FIREFACE

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_AUDIO_CODEC

};



#define SNDRV_HWDEP_IFACE_AUDIO_BE SNDRV_HWDEP_IFACE_AUDIO_BE

#define SNDRV_HWDEP_IFACE_AUDIO_CODEC SNDRV_HWDEP_IFACE_AUDIO_CODEC



struct snd_hwdep_info {

	unsigned int device;		/* WR: device number */

	int card;			/* R: card number */

include/uapi/sound/compress_offload.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct snd_compr_params { 
 * @pcm_io_frames: Frames rendered or received by DSP into a mixer or an audio

 * output/input. This field should be used for A/V sync or time estimates.

 * @sampling_rate: sampling rate of audio

 * @timestamp: timestamp of audio clips

 */

struct snd_compr_tstamp {

	__u32 byte_offset;
@@ -71,6 +72,7 @@ struct snd_compr_tstamp { 
	__u32 pcm_frames;

	__u32 pcm_io_frames;

	__u32 sampling_rate;

	__u64 timestamp;

} __attribute__((packed, aligned(4)));



/**

include/uapi/sound/compress_params.h

+22 −0
Original line number Diff line number Diff line
@@ -261,6 +261,12 @@ 


struct snd_enc_wma {

	__u32 super_block_align; /* WMA Type-specific data */

	__u32 bits_per_sample;

	__u32 channelmask;

	__u32 encodeopt;

	__u32 encodeopt1;

	__u32 encodeopt2;

	__u32 avg_bit_rate;

};
@@ -337,12 +343,28 @@ struct snd_enc_generic { 
	__s32 reserved[15];	/* Can be used for SND_AUDIOCODEC_BESPOKE */

} __attribute__((packed, aligned(4)));



struct snd_dec_ddp {

	__u32 params_length;

	__u32 params_id[18];

	__u32 params_value[18];

} __attribute__((packed, aligned(4)));



struct snd_dec_flac {

	__u16 sample_size;

	__u16 min_blk_size;

	__u16 max_blk_size;

	__u16 min_frame_size;

	__u16 max_frame_size;

} __attribute__((packed, aligned(4)));



union snd_codec_options {

	struct snd_enc_wma wma;

	struct snd_enc_vorbis vorbis;

	struct snd_enc_real real;

	struct snd_enc_flac flac;

	struct snd_enc_generic generic;

	struct snd_dec_ddp ddp;

	struct snd_dec_flac flac_dec;

} __attribute__((packed, aligned(4)));



/** struct snd_codec_desc - description of codec capabilities