From 0d06400c7b75931be0081ca89db7c6d0d9fea37f Mon Sep 17 00:00:00 2001 From: Xiaoyu Ye Date: Wed, 15 Jan 2020 14:31:50 -0800 Subject: [PATCH 1/2] uapi: sound: remove redundant QGKI config checks Userspace does not have access to QGKI configs, so remove redundant QGKI config checks. Change-Id: Ifa4792d581d916b71bb25c9ba5119d1d18a7e4b2 Signed-off-by: Xiaoyu Ye --- include/uapi/sound/compress_params.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h index 7df42df36f2a..6aac4c66b70d 100644 --- a/include/uapi/sound/compress_params.h +++ b/include/uapi/sound/compress_params.h @@ -60,12 +60,10 @@ #define MAX_NUM_BITRATES 32 #define MAX_NUM_SAMPLE_RATES 32 -#ifdef CONFIG_AUDIO_QGKI /* Timestamp flag */ /* Bit-0 - 1 : Enable Timestamp mode */ /* Bit-0 - 0 : Disable Timestamp mode */ #define COMPRESSED_TIMESTAMP_FLAG 0x0001 -#endif /* Codecs are listed linearly to allow for extensibility */ #define SND_AUDIOCODEC_PCM ((__u32) 0x00000001) @@ -409,7 +407,6 @@ struct snd_dec_aptx { __u32 nap; }; -#ifdef CONFIG_AUDIO_QGKI struct snd_dec_vorbis { __u32 bit_stream_fmt; }; @@ -417,7 +414,6 @@ struct snd_dec_vorbis { struct snd_dec_amrwb_plus { __u32 bit_stream_fmt; }; -#endif union snd_codec_options { struct snd_enc_wma wma; @@ -522,7 +518,6 @@ struct snd_codec { #endif } __attribute__((packed, aligned(4))); -#ifdef CONFIG_AUDIO_QGKI /** struct snd_codec_metadata * @length: Length of the encoded buffer. * @offset: Offset from the buffer address to the first byte of the first @@ -539,7 +534,6 @@ struct snd_codec_metadata { }; #define SND_CODEC_COMPRESS_PASSTHROUGH -#endif #endif From 0c8284511948e3d0f1ac7044787f1aeddee520bf Mon Sep 17 00:00:00 2001 From: Xiaoyu Ye Date: Wed, 15 Jan 2020 14:38:28 -0800 Subject: [PATCH 2/2] uapi: sound: remove redundant QGKI config checks Userspace does not have access to QGKI configs, so remove redundant QGKI config checks. Change-Id: Iedb5c3d37cd5d59cc5bf6177a7e6448628350fbf Signed-off-by: Xiaoyu Ye --- include/uapi/sound/compress_params.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h index 6aac4c66b70d..60840a787570 100644 --- a/include/uapi/sound/compress_params.h +++ b/include/uapi/sound/compress_params.h @@ -427,10 +427,8 @@ union snd_codec_options { struct snd_dec_ape ape; struct snd_dec_wma wma_dec; struct snd_dec_aptx aptx_dec; -#ifdef CONFIG_AUDIO_QGKI struct snd_dec_vorbis vorbis_dec; struct snd_dec_amrwb_plus amrwbplus; -#endif } __attribute__((packed, aligned(4))); /** struct snd_codec_desc - description of codec capabilities