projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f0e706
)
camera:query max camera resolution failed ,fix it
author
zyc
<zyc@rock-chips.com>
Mon, 24 Dec 2012 05:03:21 +0000
(13:03 +0800)
committer
zyc
<zyc@rock-chips.com>
Mon, 24 Dec 2012 05:04:22 +0000
(13:04 +0800)
drivers/media/video/rk30_camera_oneframe.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/rk30_camera_oneframe.c
b/drivers/media/video/rk30_camera_oneframe.c
index eed218f6bbb7d1503236d60c29fe5de522a71668..912dc7fe9b15b64728628bea284612b3f7c6f999 100755
(executable)
--- a/
drivers/media/video/rk30_camera_oneframe.c
+++ b/
drivers/media/video/rk30_camera_oneframe.c
@@
-2219,6
+2219,12
@@
static int rk_camera_try_fmt(struct soc_camera_device *icd,
if (ret < 0)
goto RK_CAMERA_TRY_FMT_END;
RKCAMERA_DG("%s mf.width:%d mf.height:%d\n",__FUNCTION__,mf.width,mf.height);
+ //query resolution.
+ if((usr_w == 10000) && (usr_h == 10000)) {
+ pix->width = mf.width;
+ pix->height = mf.height;
+ goto RK_CAMERA_TRY_FMT_END;
+ }
#ifdef CONFIG_VIDEO_RK29_WORK_IPP
if ((mf.width != usr_w) || (mf.height != usr_h)) {
bytes_per_line_host = soc_mbus_bytes_per_line(mf.width,icd->current_fmt->host_fmt);