summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNagesh Subba Reddy <c_nsubba@quicinc.com>2010-04-30 16:55:14 -0700
committerNagesh Subba Reddy <c_nsubba@quicinc.com>2010-04-30 16:57:17 -0700
commit7fa46725abe98cfe7f4b7ba0c284ab043d3194f8 (patch)
tree4f27f9d8ea006a79a3df5aa7306e3479cab52966
parent649dfe3bfcb1dc2d06069607f145f40becb3591d (diff)
downloadbionic-7fa46725abe98cfe7f4b7ba0c284ab043d3194f8.zip
bionic-7fa46725abe98cfe7f4b7ba0c284ab043d3194f8.tar.gz
bionic-7fa46725abe98cfe7f4b7ba0c284ab043d3194f8.tar.bz2
bionic:Time stamp support for video
Added a time spec variable to msm_frame, to carry the timestamp of the video frames Change-Id: Ie1c49aeb3d90491822a7b166dc547be8057479b5
-rwxr-xr-xlibc/kernel/common/media/msm_camera.h11
1 files changed, 10 insertions, 1 deletions
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;