A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "kernel: sound: remove decoder structure definition"

Browse source
This commit is contained in:
qctecmdr 2020-07-25 10:33:06 -07:00 • committed by Gerrit - the friendly Code Review server
commit dcf461e106
1 changed files with 13 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

113
include/uapi/sound/compress_params.h
View file

@ -80,22 +80,19 @@
#define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C)
#define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D)
#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)
#define SND_AUDIOCODEC_WMA_PRO ((__u32) 0x0000000F)
#define SND_AUDIOCODEC_ALAC ((__u32) 0x00000010)
#define SND_AUDIOCODEC_APE ((__u32) 0x00000011)
#define SND_AUDIOCODEC_DSD ((__u32) 0x00000012)
#define SND_AUDIOCODEC_APTX ((__u32) 0x00000013)
#define SND_AUDIOCODEC_TRUEHD ((__u32) 0x00000014)
#define SND_AUDIOCODEC_DTS_PASS_THROUGH ((__u32) 0x00000015)
#define SND_AUDIOCODEC_DTS_LBR ((__u32) 0x00000016)
#define SND_AUDIOCODEC_DTS_TRANSCODE_LOOPBACK ((__u32) 0x00000017)
#define SND_AUDIOCODEC_PASS_THROUGH ((__u32) 0x00000018)
#define SND_AUDIOCODEC_MP2 ((__u32) 0x00000019)
#define SND_AUDIOCODEC_DTS_LBR_PASS_THROUGH ((__u32) 0x0000001A)
#define SND_AUDIOCODEC_AC3 ((__u32) 0x0000001B)
#define SND_AUDIOCODEC_AC3_PASS_THROUGH ((__u32) 0x0000001C)
#define SND_AUDIOCODEC_DTS ((__u32) 0x0000001D)
#define SND_AUDIOCODEC_EAC3 ((__u32) 0x0000001F)
#define SND_AUDIOCODEC_ALAC ((__u32) 0x0000000F)
#define SND_AUDIOCODEC_APE ((__u32) 0x00000010)
#define SND_AUDIOCODEC_TRUEHD ((__u32) 0x00001001)
#define SND_AUDIOCODEC_DTS_PASS_THROUGH ((__u32) 0x00001002)
#define SND_AUDIOCODEC_DTS_LBR ((__u32) 0x00001003)
#define SND_AUDIOCODEC_DTS_TRANSCODE_LOOPBACK ((__u32) 0x00001004)
#define SND_AUDIOCODEC_PASS_THROUGH ((__u32) 0x00001005)
#define SND_AUDIOCODEC_MP2 ((__u32) 0x00001006)
#define SND_AUDIOCODEC_DTS_LBR_PASS_THROUGH ((__u32) 0x00001007)
#define SND_AUDIOCODEC_AC3 ((__u32) 0x00001008)
#define SND_AUDIOCODEC_AC3_PASS_THROUGH ((__u32) 0x00001009)
#define SND_AUDIOCODEC_DTS ((__u32) 0x0000100A)
#define SND_AUDIOCODEC_EAC3 ((__u32) 0x0000100B)
#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_EAC3
/*
@ -337,96 +334,12 @@ struct snd_enc_generic {
__s32 reserved[15]; /* Can be used for SND_AUDIOCODEC_BESPOKE */
} __attribute__((packed, aligned(4)));
#define SND_COMPRESS_DEC_HDR
struct snd_dec_aac {
__u16 audio_obj_type;
__u16 pce_bits_size;
} __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)));
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_frame_bytes;
__u32 avg_bit_rate;
__u32 sample_rate;
__u32 channel_layout_tag;
} __attribute__((packed, aligned(4)));
struct snd_dec_ape {
__u16 compatible_version;
__u16 compression_level;
__u32 format_flags;
__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;
} __attribute__((packed, aligned(4)));
struct snd_dec_wma {
__u32 super_block_align;
__u32 bits_per_sample;
__u32 channelmask;
__u32 encodeopt;
__u32 encodeopt1;
__u32 encodeopt2;
__u32 avg_bit_rate;
} __attribute__((packed, aligned(4)));
#define SND_DEC_WMA_EXTENTED_SUPPORT
struct snd_dec_aptx {
__u32 lap;
__u32 uap;
__u32 nap;
};
struct snd_dec_vorbis {
__u32 bit_stream_fmt;
};
/** struct snd_dec_dsd - codec for DSD format
* @blk_size - dsd channel block size
*/
struct snd_dec_dsd {
__u32 blk_size;
};
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_aac aac_dec;
struct snd_dec_flac flac_dec;
struct snd_dec_alac alac;
struct snd_dec_ape ape;
struct snd_dec_wma wma_dec;
struct snd_dec_aptx aptx_dec;
struct snd_dec_vorbis vorbis_dec;
struct snd_dec_amrwb_plus amrwbplus;
struct snd_dec_dsd dsd_dec;
} __attribute__((packed, aligned(4)));
/** struct snd_codec_desc - description of codec capabilities