From 04dd17822334871b23ea2862f7798fb0e0007777 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Sat, 11 May 2024 08:53:19 +0000 Subject: [PATCH] change otg to host mode --- kernel/include/uapi/sound/compress_params.h | 147 +++++++------------------------------------------ 1 files changed, 21 insertions(+), 126 deletions(-) diff --git a/kernel/include/uapi/sound/compress_params.h b/kernel/include/uapi/sound/compress_params.h index 7e503c9..79b1438 100644 --- a/kernel/include/uapi/sound/compress_params.h +++ b/kernel/include/uapi/sound/compress_params.h @@ -54,33 +54,11 @@ #include <linux/types.h> -/* Maximum PCM channels */ -#define MAX_PCM_DECODE_CHANNELS 32 - /* AUDIO CODECS SUPPORTED */ #define MAX_NUM_CODECS 32 #define MAX_NUM_CODEC_DESCRIPTORS 32 #define MAX_NUM_BITRATES 32 #define MAX_NUM_SAMPLE_RATES 32 - -/* compressed TX */ -#define MAX_NUM_FRAMES_PER_BUFFER 1 -#define COMPRESSED_META_DATA_MODE 0x10 -#define META_DATA_LEN_BYTES 36 -#define Q6_AC3_DECODER 0x00010BF6 -#define Q6_EAC3_DECODER 0x00010C3C -#define Q6_DTS 0x00010D88 -#define Q6_DTS_LBR 0x00010DBB - -/* Timestamp flsg */ -/* Bit-0 - 1 : Enable Timestamp mode */ -/* Bit-0 - 0 : Disable Timestamp mode */ -#define COMPRESSED_TIMESTAMP_FLAG 0x0001 - -/* Perf mode flag */ -/* Bit-1 - 1 : Enable perf mode */ -/* Bit-1 - 0 : Disable perf mode */ -#define COMPRESSED_PERF_MODE_FLAG 0x0002 /* Codecs are listed linearly to allow for extensibility */ #define SND_AUDIOCODEC_PCM ((__u32) 0x00000001) @@ -97,25 +75,9 @@ #define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C) #define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D) #define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E) -#define SND_AUDIOCODEC_DTS_PASS_THROUGH ((__u32) 0x0000000F) -#define SND_AUDIOCODEC_DTS_LBR ((__u32) 0x00000010) -#define SND_AUDIOCODEC_DTS_TRANSCODE_LOOPBACK ((__u32) 0x00000011) -#define SND_AUDIOCODEC_PASS_THROUGH ((__u32) 0x00000012) -#define SND_AUDIOCODEC_MP2 ((__u32) 0x00000013) -#define SND_AUDIOCODEC_DTS_LBR_PASS_THROUGH ((__u32) 0x00000014) -#define SND_AUDIOCODEC_AC3 ((__u32) 0x00000015) -#define SND_AUDIOCODEC_AC3_PASS_THROUGH ((__u32) 0x00000016) -#define SND_AUDIOCODEC_WMA_PRO ((__u32) 0x00000017) -#define SND_AUDIOCODEC_DTS ((__u32) 0x00000018) -#define SND_AUDIOCODEC_EAC3 ((__u32) 0x00000019) -#define SND_AUDIOCODEC_ALAC ((__u32) 0x00000020) -#define SND_AUDIOCODEC_APE ((__u32) 0x00000021) -#define SND_AUDIOCODEC_DSD ((__u32) 0x00000022) -#define SND_AUDIOCODEC_APTX ((__u32) 0x00000023) -#define SND_AUDIOCODEC_TRUEHD ((__u32) 0x00000024) -#define SND_AUDIOCODEC_MAT ((__u32) 0x00000025) -#define SND_AUDIOCODEC_THD ((__u32) 0x00000026) -#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_THD +#define SND_AUDIOCODEC_ALAC ((__u32) 0x0000000F) +#define SND_AUDIOCODEC_APE ((__u32) 0x00000010) +#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_APE /* * Profile and modes are listed with bit masks. This allows for a @@ -182,6 +144,9 @@ #define SND_AUDIOPROFILE_WMA8 ((__u32) 0x00000002) #define SND_AUDIOPROFILE_WMA9 ((__u32) 0x00000004) #define SND_AUDIOPROFILE_WMA10 ((__u32) 0x00000008) +#define SND_AUDIOPROFILE_WMA9_PRO ((__u32) 0x00000010) +#define SND_AUDIOPROFILE_WMA9_LOSSLESS ((__u32) 0x00000020) +#define SND_AUDIOPROFILE_WMA10_LOSSLESS ((__u32) 0x00000040) #define SND_AUDIOMODE_WMA_LEVEL1 ((__u32) 0x00000001) #define SND_AUDIOMODE_WMA_LEVEL2 ((__u32) 0x00000002) @@ -281,15 +246,8 @@ 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; }; -#define SND_ENC_WMA_EXTENTED_SUPPORT /** * struct snd_enc_vorbis @@ -364,41 +322,31 @@ __s32 reserved[15]; /* Can be used for SND_AUDIOCODEC_BESPOKE */ } __attribute__((packed, aligned(4))); -#define SND_DEC_THD_MAX_PARAMS 8 -struct snd_dec_thd { - __u32 params_length; - __u32 params_id[SND_DEC_THD_MAX_PARAMS]; - __u32 params_value[SND_DEC_THD_MAX_PARAMS]; -} __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; + __u16 reserved; } __attribute__((packed, aligned(4))); -#define SND_DEC_FLAC_SUPPORTED - -struct snd_dec_vorbis { - __u32 bit_stream_fmt; -}; +struct snd_dec_wma { + __u32 encoder_option; + __u32 adv_encoder_option; + __u32 adv_encoder_option2; + __u32 reserved; +} __attribute__((packed, aligned(4))); struct snd_dec_alac { __u32 frame_length; __u8 compatible_version; - __u8 bit_depth; __u8 pb; __u8 mb; __u8 kb; - __u8 num_channels; - __u16 max_run; + __u32 max_run; __u32 max_frame_bytes; - __u32 avg_bit_rate; - __u32 sample_rate; - __u32 channel_layout_tag; -}; +} __attribute__((packed, aligned(4))); struct snd_dec_ape { __u16 compatible_version; @@ -407,53 +355,20 @@ __u32 blocks_per_frame; __u32 final_frame_blocks; __u32 total_frames; - __u16 bits_per_sample; - __u16 num_channels; - __u32 sample_rate; __u32 seek_table_present; -}; - -struct snd_dec_aptx { - __u32 lap; - __u32 uap; - __u32 nap; -}; - -/** struct snd_dec_dsd - codec for DSD format - * @blk_size - dsd channel block size - */ -struct snd_dec_dsd { - __u32 blk_size; -}; - -/** struct snd_dec_pcm - codec options for PCM format - * @num_channels: Number of channels - * @ch_map: Channel map for the above corresponding channels - */ -struct snd_dec_pcm { - __u32 num_channels; - __u8 ch_map[MAX_PCM_DECODE_CHANNELS]; } __attribute__((packed, aligned(4))); -struct snd_dec_amrwb_plus { - __u32 bit_stream_fmt; -}; 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_flac flac_dec; - struct snd_dec_vorbis vorbis_dec; - struct snd_dec_alac alac; - struct snd_dec_ape ape; - struct snd_dec_aptx aptx_dec; - struct snd_dec_thd truehd; - struct snd_dec_pcm pcm_dec; - struct snd_dec_amrwb_plus amrwbplus; - struct snd_dec_dsd dsd_dec; -}; + struct snd_dec_flac flac_d; + struct snd_dec_wma wma_d; + struct snd_dec_alac alac_d; + struct snd_dec_ape ape_d; +} __attribute__((packed, aligned(4))); /** struct snd_codec_desc - description of codec capabilities * @max_ch: Maximum number of audio channels @@ -514,7 +429,6 @@ * @align: Block alignment in bytes of an audio sample. * Only required for PCM or IEC formats. * @options: encoder-specific settings - * @compr_passthr: compressed bitstream passthrough * @reserved: reserved for future use */ @@ -531,26 +445,7 @@ __u32 format; __u32 align; union snd_codec_options options; - __u32 compr_passthr; - __u32 flags; - __u32 reserved[1]; + __u32 reserved[3]; } __attribute__((packed, aligned(4))); - -#define SND_CODEC_COMPRESS_PASSTHROUGH - -/** struct snd_codec_metadata - * @length: Length of the encoded buffer. - * @offset: Offset from the buffer address to the first byte of the first - * encoded frame. All encoded frames are consecutive starting - * from this offset. - * @timestamp: Session time in microseconds of the first sample in the buffer. - * @reserved: Reserved for future use. - */ -struct snd_codec_metadata { - __u32 length; - __u32 offset; - __u64 timestamp; - __u32 reserved[4]; -}; #endif -- Gitblit v1.6.2