4 files changed, 16 insertions, 4 deletions
diff --git a/libc/include/sys/_system_properties.h b/libc/include/sys/_system_properties.h
index 42a7f6c..a21a561 100644
--- a/libc/include/sys/_system_properties.h
+++ b/libc/include/sys/_system_properties.h
@@ -42,8 +42,8 @@ typedef struct prop_msg prop_msg;
 
 #define PROP_SERVICE_NAME "property_service"
 
-/* #define PROP_MAX_ENTRIES 247 */
-/* 247 -> 32620 bytes (<32768) */
+/* #define PROP_MAX_ENTRIES 226 */
+/* 226 -> 32664 bytes (<32768) */
 
 #define TOC_NAME_LEN(toc)       ((toc) >> 24)
 #define TOC_TO_INFO(area, toc)  ((prop_info*) (((char*) area) + ((toc) & 0xFFFFFF)))
diff --git a/libc/include/sys/system_properties.h b/libc/include/sys/system_properties.h
index 2eb00cd..1b14570 100644
--- a/libc/include/sys/system_properties.h
+++ b/libc/include/sys/system_properties.h
@@ -32,7 +32,7 @@
 typedef struct prop_info prop_info;
 
 #define PROP_NAME_MAX   32
-#define PROP_VALUE_MAX  92
+#define PROP_VALUE_MAX  104
 
 /* Look up a system property by name, copying its value and a
 ** \0 terminator to the provided pointer.  The total bytes
diff --git a/libc/kernel/common/linux/msm_vidc_dec.h b/libc/kernel/common/linux/msm_vidc_dec.h
index e7d46b7..5242065 100644
--- a/libc/kernel/common/linux/msm_vidc_dec.h
+++ b/libc/kernel/common/linux/msm_vidc_dec.h
@@ -131,6 +131,9 @@ struct vdec_ioctl_msg {
 #define VDEC_IOCTL_GET_NEXT_MSG   _IOR(VDEC_IOCTL_MAGIC, 25, struct vdec_ioctl_msg)
 #define VDEC_IOCTL_STOP_NEXT_MSG  _IO(VDEC_IOCTL_MAGIC, 26)
 
+#define VDEC_IOCTL_GET_NUMBER_INSTANCES _IOR(VDEC_IOCTL_MAGIC, 27, struct vdec_ioctl_msg)
+
+
 enum vdec_picture {
  PICTURE_TYPE_I,
  PICTURE_TYPE_P,
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index 1ed7a50..0ee7a1a 100755
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -12,9 +12,13 @@
 #ifndef __LINUX_MSM_CAMERA_H
 #define __LINUX_MSM_CAMERA_H
 
+#ifdef MSM_CAMERA_BIONIC
+#include <sys/types.h>
+#endif
 #include <linux/types.h>
 #include <asm/sizes.h>
 #include <linux/ioctl.h>
+#include <linux/time.h>
 
 #define MSM_CAM_IOCTL_MAGIC 'm'
 
@@ -167,6 +171,10 @@ struct msm_camera_cfg_cmd {
 #define CMD_AXI_CFG_PREVIEW 36
 #define CMD_AXI_CFG_VIDEO 37
 
+#define CMD_STATS_IHIST_ENABLE 38
+#define CMD_STATS_RS_ENABLE 39
+#define CMD_STATS_CS_ENABLE 40
+
 struct msm_vfe_cfg_cmd {
  int cmd_type;
  uint16_t length;
@@ -244,12 +252,14 @@ struct outputCfg {
 #define MSM_FRAME_PREV_1 0
 #define MSM_FRAME_PREV_2 1
 #define MSM_FRAME_ENC 2
+
 #define OUTPUT_TYPE_P 1
 #define OUTPUT_TYPE_T 2
 #define OUTPUT_TYPE_S 3
 #define OUTPUT_TYPE_V 4
 
 struct msm_frame {
+ struct timespec ts;
  int path;
  unsigned long buffer;
  uint32_t y_off;
@@ -368,7 +378,6 @@ struct fps_cfg {
  uint16_t fps_div;
  uint32_t pict_fps_div;
 };
-
 struct wb_info_cfg {
  uint16_t red_gain;
  uint16_t green_gain;