shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera: support reinit sensor and set right format to sensor, if sensor havn't send video stream after set format

Browse Source
This commit is contained in:
ddl
2011-01-27 23:17:49 +08:00
parent 3220121d4d
commit 15df79b4bf
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/video/rk29_camera_oneframe.c
View File

@@ -146,7 +146,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
#define RK29_CAM_W_MAX 3856 /* ddl@rock-chips.com : 10M Pixel */
#define RK29_CAM_H_MAX 2764
#define RK29_CAM_FRAME_INVAL_INIT 3
#define RK29_CAM_FRAME_INVAL_DC 1 /* ddl@rock-chips.com : */
#define RK29_CAM_FRAME_INVAL_DC 3 /* ddl@rock-chips.com : */
#define RK29_CAM_AXI 0
#define RK29_CAM_AHB 1
@@ -1278,12 +1278,25 @@ static void rk29_camera_reinit_work(struct work_struct *work)
{
struct device *control;
struct v4l2_subdev *sd;
struct i2c_client *client;
struct soc_camera_device *icd;
struct v4l2_format cam_f;
const struct soc_camera_format_xlate *xlate;
int ret;
rk29_camera_s_stream(rk29_camdev_info_ptr->icd, 0);
control = to_soc_camera_control(rk29_camdev_info_ptr->icd);
sd = dev_get_drvdata(control);
ret = v4l2_subdev_call(sd,core, init, 1);
RK29CAMERA_DG("Camera host haven't recevie data from sensor,Reinit sensor now! ret:0x%x\n",ret);
cam_f.fmt.pix.width = rk29_camdev_info_ptr->icd->user_width;
cam_f.fmt.pix.height = rk29_camdev_info_ptr->icd->user_height;
xlate = soc_camera_xlate_by_fourcc(rk29_camdev_info_ptr->icd, rk29_camdev_info_ptr->icd->current_fmt->fourcc);
cam_f.fmt.pix.pixelformat = xlate->cam_fmt->fourcc;
ret |= v4l2_subdev_call(sd, video, s_fmt, &cam_f);
rk29_camera_s_stream(rk29_camdev_info_ptr->icd, 1);
RK29CAMERA_TR("Camera host haven't recevie data from sensor,Reinit sensor now! ret:0x%x\n",ret);
}
static enum hrtimer_restart rk29_camera_fps_func(struct hrtimer *timer)
{