summaryrefslogtreecommitdiff
path: root/original-kernel-headers
diff options
context:
space:
mode:
authorThierry Strudel <tstrudel@google.com>2015-05-05 10:47:37 -0700
committerThierry Strudel <tstrudel@google.com>2015-05-05 10:47:37 -0700
commit0c36824066a3ba79072d067f934c74284cc7a292 (patch)
tree5b496c125484867fa3369d52b0b0398e0cf177e6 /original-kernel-headers
parent32a7220f3e2f51caecf0066590ebc633b930bf94 (diff)
downloadmsm8994-0c36824066a3ba79072d067f934c74284cc7a292.tar.gz
Updating kernel headers to AU_LINUX_ANDROID_LA.BF64.1.2.9.05042015
Change-Id: I4154e456c7cd7db697572e033c9ccfd62f167dd0
Diffstat (limited to 'original-kernel-headers')
-rw-r--r--original-kernel-headers/linux/qseecom.h2
-rw-r--r--original-kernel-headers/media/msmb_pproc.h22
-rw-r--r--original-kernel-headers/sound/compress_params.h10
3 files changed, 28 insertions, 6 deletions
diff --git a/original-kernel-headers/linux/qseecom.h b/original-kernel-headers/linux/qseecom.h
index 3caddce..aac13ee 100644
--- a/original-kernel-headers/linux/qseecom.h
+++ b/original-kernel-headers/linux/qseecom.h
@@ -5,7 +5,7 @@
#include <linux/ioctl.h>
#define MAX_ION_FD 4
-#define MAX_APP_NAME_SIZE 32
+#define MAX_APP_NAME_SIZE 64
#define QSEECOM_HASH_SIZE 32
/*
* struct qseecom_register_listener_req -
diff --git a/original-kernel-headers/media/msmb_pproc.h b/original-kernel-headers/media/msmb_pproc.h
index ac80cb3..0e3cb87 100644
--- a/original-kernel-headers/media/msmb_pproc.h
+++ b/original-kernel-headers/media/msmb_pproc.h
@@ -176,6 +176,20 @@ struct msm_cpp_stream_buff_info_t {
struct msm_cpp_buffer_info_t *buffer_info;
};
+enum msm_cpp_batch_mode_t {
+ BATCH_MODE_NONE,
+ BATCH_MODE_VIDEO,
+ BATCH_MODE_PREVIEW
+};
+
+struct msm_cpp_batch_info_t {
+ enum msm_cpp_batch_mode_t batch_mode;
+ uint32_t batch_size;
+ uint32_t intra_plane_offset[MAX_PLANES];
+ uint32_t pick_preview_idx;
+ uint32_t cont_idx;
+};
+
struct msm_cpp_frame_info_t {
int32_t frame_id;
struct timeval timestamp;
@@ -197,7 +211,8 @@ struct msm_cpp_frame_info_t {
uint32_t feature_mask;
uint8_t we_disable;
struct msm_cpp_buffer_info_t input_buffer_info;
- struct msm_cpp_buffer_info_t output_buffer_info[2];
+ struct msm_cpp_buffer_info_t output_buffer_info[8];
+ struct msm_cpp_buffer_info_t duplicate_buffer_info;
struct msm_cpp_buffer_info_t tnr_scratch_buffer_info[2];
uint32_t reserved;
uint8_t partial_frame_indicator;
@@ -220,6 +235,7 @@ struct msm_cpp_frame_info_t {
uint32_t last_stripe_index;
uint32_t stripe_info_offset;
uint32_t stripe_info;
+ struct msm_cpp_batch_info_t batch_info;
};
struct msm_cpp_pop_stream_info_t {
@@ -391,7 +407,8 @@ struct msm_cpp_frame_info32_t {
uint32_t feature_mask;
uint8_t we_disable;
struct msm_cpp_buffer_info_t input_buffer_info;
- struct msm_cpp_buffer_info_t output_buffer_info[2];
+ struct msm_cpp_buffer_info_t output_buffer_info[8];
+ struct msm_cpp_buffer_info_t duplicate_buffer_info;
struct msm_cpp_buffer_info_t tnr_scratch_buffer_info[2];
uint32_t reserved;
uint8_t partial_frame_indicator;
@@ -414,6 +431,7 @@ struct msm_cpp_frame_info32_t {
uint32_t last_stripe_index;
uint32_t stripe_info_offset;
uint32_t stripe_info;
+ struct msm_cpp_batch_info_t batch_info;
};
struct msm_cpp_clock_settings32_t {
diff --git a/original-kernel-headers/sound/compress_params.h b/original-kernel-headers/sound/compress_params.h
index d249303..fcb7e94 100644
--- a/original-kernel-headers/sound/compress_params.h
+++ b/original-kernel-headers/sound/compress_params.h
@@ -57,6 +57,7 @@
#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
@@ -361,7 +362,8 @@ union snd_codec_options {
/** struct snd_codec_desc - description of codec capabilities
* @max_ch: Maximum number of audio channels
- * @sample_rates: Sampling rates in Hz, use SNDRV_PCM_RATE_xxx for this
+ * @sample_rates: Sampling rates in Hz, use values like 48000 for this
+ * @num_sample_rates: Number of valid values in sample_rates array
* @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,7 +385,8 @@ union snd_codec_options {
struct snd_codec_desc {
__u32 max_ch;
- __u32 sample_rates;
+ __u32 sample_rates[MAX_NUM_SAMPLE_RATES];
+ __u32 num_sample_rates;
__u32 bit_rate[MAX_NUM_BITRATES];
__u32 num_bitrates;
__u32 rate_control;
@@ -401,7 +404,8 @@ 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
+ * @sample_rate: Audio sample rate of input data in Hz, use values like 48000
+ * for this.
* @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.