diff options
Diffstat (limited to 'original-kernel-headers/sound/compress_params.h')
| -rw-r--r-- | original-kernel-headers/sound/compress_params.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/original-kernel-headers/sound/compress_params.h b/original-kernel-headers/sound/compress_params.h index e4a10be..6fe4637 100644 --- a/original-kernel-headers/sound/compress_params.h +++ b/original-kernel-headers/sound/compress_params.h @@ -57,7 +57,6 @@ #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 @@ -348,6 +347,13 @@ struct snd_dec_ddp { __u32 params_id[18]; __u32 params_value[18]; }; +struct snd_dec_flac { + __u16 sample_size; + __u16 min_blk_size; + __u16 max_blk_size; + __u16 min_frame_size; + __u16 max_frame_size; +}; union snd_codec_options { struct snd_enc_wma wma; struct snd_enc_vorbis vorbis; @@ -356,12 +362,12 @@ union snd_codec_options { struct snd_enc_generic generic; struct snd_dec_dts dts; struct snd_dec_ddp ddp; + struct snd_dec_flac flac_dec; }; /** struct snd_codec_desc - description of codec capabilities * @max_ch: Maximum number of audio channels - * @sample_rates: Sampling rates in Hz, use values like 48000 for this - * @num_sample_rates: Number of valid values in sample_rates array + * @sample_rates: Sampling rates in Hz, use SNDRV_PCM_RATE_xxx for this * @bit_rate: Indexed array containing supported bit rates * @num_bitrates: Number of valid values in bit_rate array * @rate_control: value is specified by SND_RATECONTROLMODE defines. @@ -383,8 +389,7 @@ union snd_codec_options { struct snd_codec_desc { __u32 max_ch; - __u32 sample_rates[MAX_NUM_SAMPLE_RATES]; - __u32 num_sample_rates; + __u32 sample_rates; __u32 bit_rate[MAX_NUM_BITRATES]; __u32 num_bitrates; __u32 rate_control; @@ -402,8 +407,7 @@ struct snd_codec_desc { * @ch_out: Number of output channels. In case of contradiction between * this field and the channelMode field, the channelMode field * overrides. - * @sample_rate: Audio sample rate of input data in Hz, use values like 48000 - * for this. + * @sample_rate: Audio sample rate of input data * @bit_rate: Bitrate of encoded data. May be ignored by decoders * @rate_control: Encoding rate control. See SND_RATECONTROLMODE defines. * Encoders may rely on profiles for quality levels. @@ -433,7 +437,6 @@ struct snd_codec { __u32 format; __u32 align; __u32 transcode_dts; - __u32 compr_passthr; struct snd_dec_dts dts; union snd_codec_options options; __u32 reserved[3]; |