summaryrefslogtreecommitdiff
authorbrian.zhu <brian.zhu@amlogic.com>2012-10-08 07:18:45 (GMT)
committer brian.zhu <brian.zhu@amlogic.com>2012-10-08 07:18:45 (GMT)
commit1c472b1519e72a4dfd5d2c50f1b07dcc62c9c892 (patch)
tree55a9b6ff36388f1cb67b70ff6bde0ea5ecb51e6d
parent021f2833bd6b8c1be0344c3a8ba48327ed00425c (diff)
downloadcamera-1c472b1519e72a4dfd5d2c50f1b07dcc62c9c892.zip
camera-1c472b1519e72a4dfd5d2c50f1b07dcc62c9c892.tar.gz
camera-1c472b1519e72a4dfd5d2c50f1b07dcc62c9c892.tar.bz2
disable avsync when camera start
Diffstat
-rwxr-xr-xCameraHal.cpp30
1 files changed, 14 insertions, 16 deletions
diff --git a/CameraHal.cpp b/CameraHal.cpp
index cee2450..f114544 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -62,6 +62,8 @@ static void write_sys_string(const char *path, const char *s)
}
#define DISABLE_VIDEO "/sys/class/video/disable_video"
+#define ENABLE_AVSYNC "/sys/class/tsync/enable"
+#define TSYNC_EVENT "/sys/class/tsync/event"
#define VIDEO_ZOOM "/sys/class/video/zoom"
#define SCREEN_MODE "/sys/class/video/screen_mode"
@@ -83,36 +85,32 @@ static int SYS_open_video()
return 0;
}
-extern "C" int SYS_set_zoom(int zoom)
+static int SYS_disable_avsync()
{
- if(zoom!=100)
- write_sys_int(SCREEN_MODE, 1); // full stretch
- write_sys_int(VIDEO_ZOOM, zoom);
+ write_sys_int(ENABLE_AVSYNC, 0);
return 0;
}
-extern "C" int SYS_reset_zoom(void)
+static int SYS_disable_video_pause()
{
- write_sys_int(SCREEN_MODE, 0);
- write_sys_int(VIDEO_ZOOM, 100);
+ write_sys_string(TSYNC_EVENT, "VIDEO_PAUSE:0x0");
return 0;
}
-#ifdef AMLOGIC_CAMERA_OVERLAY_SUPPORT
-#define ENABLE_AVSYNC "/sys/class/tsync/enable"
-#define TSYNC_EVENT "/sys/class/tsync/event"
-static int SYS_disable_avsync()
+extern "C" int SYS_set_zoom(int zoom)
{
- write_sys_int(ENABLE_AVSYNC, 0);
+ if(zoom!=100)
+ write_sys_int(SCREEN_MODE, 1); // full stretch
+ write_sys_int(VIDEO_ZOOM, zoom);
return 0;
}
-static int SYS_disable_video_pause()
+extern "C" int SYS_reset_zoom(void)
{
- write_sys_string(TSYNC_EVENT, "VIDEO_PAUSE:0x0");
+ write_sys_int(SCREEN_MODE, 0);
+ write_sys_int(VIDEO_ZOOM, 100);
return 0;
}
-#endif
extern "C" CameraAdapter* CameraAdapter_Factory(size_t);
@@ -2965,9 +2963,9 @@ CameraHal::CameraHal(int cameraId)
mCameraIndex = cameraId;
-#ifdef AMLOGIC_CAMERA_OVERLAY_SUPPORT
SYS_disable_avsync();
SYS_disable_video_pause();
+#ifdef AMLOGIC_CAMERA_OVERLAY_SUPPORT
SYS_enable_nextvideo();
#else
SYS_close_video();