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

Commit 94e0b574 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "uapi: sound: remove redundant QGKI config checks"

parents e5d3e345 f4948010

include/uapi/sound/compress_params.h

+2 −12
Original line number Diff line number Diff line
@@ -262,20 +262,8 @@ 


struct snd_enc_wma {

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

#ifdef CONFIG_AUDIO_QGKI

	__u32 bits_per_sample;

	__u32 channelmask;

	__u32 encodeopt;

	__u32 encodeopt1;

	__u32 encodeopt2;

	__u32 avg_bit_rate;

#endif

};



#ifdef CONFIG_AUDIO_QGKI

#define SND_ENC_WMA_EXTENTED_SUPPORT

#endif



/**

 * struct snd_enc_vorbis

 * @quality: Sets encoding quality to n, between -1 (low) and 10 (high).
@@ -401,6 +389,8 @@ struct snd_dec_wma { 
	__u32 avg_bit_rate;

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



#define SND_DEC_WMA_EXTENTED_SUPPORT



struct snd_dec_aptx {

	__u32 lap;

	__u32 uap;