[Title] modified to use default FPS of the webcam

[Type] Bugfix
[Module] Emulator / Camera
[Priority] Minor
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/hw/maru_camera_linux_pci.c b/tizen/src/hw/maru_camera_linux_pci.c
index e6890b0f09312c1c59a8ec773530a595da486a75..e288e7a6226c326a2c039f2ae7239ef26c33f4f2 100644 (file)
--- a/tizen/src/hw/maru_camera_linux_pci.c
+++ b/tizen/src/hw/maru_camera_linux_pci.c
@@ -330,38 +330,23 @@ void marucam_device_stop_preview(MaruCamState* state)
 \r
 void marucam_device_s_param(MaruCamState* state)\r
 {\r
-    struct v4l2_streamparm sp;\r
     MaruCamParam *param = state->param;\r
 \r
+    /* We use default FPS of the webcam */\r
     param->top = 0;\r
-    memset(&sp, 0, sizeof(struct v4l2_streamparm));\r
-    sp.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;\r
-    sp.parm.capture.timeperframe.numerator = param->stack[0];\r
-    sp.parm.capture.timeperframe.denominator = param->stack[1];\r
-\r
-    if (xioctl(v4l2_fd, VIDIOC_S_PARM, &sp) < 0) {\r
-        ERR("failed to set FPS: %s\n", strerror(errno));\r
-        param->errCode = errno;\r
-    }\r
 }\r
 \r
 void marucam_device_g_param(MaruCamState* state)\r
 {\r
-    struct v4l2_streamparm sp;\r
     MaruCamParam *param = state->param;\r
-    \r
-    param->top = 0;\r
-    memset(&sp, 0, sizeof(struct v4l2_streamparm));\r
-    sp.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;\r
 \r
-    if (xioctl(v4l2_fd, VIDIOC_G_PARM, &sp) < 0) {\r
-        ERR("failed to get FPS: %s\n", strerror(errno));\r
-        param->errCode = errno;\r
-        return;\r
-    }\r
-    param->stack[0] = sp.parm.capture.capability;\r
-    param->stack[1] = sp.parm.capture.timeperframe.numerator;\r
-    param->stack[2] = sp.parm.capture.timeperframe.denominator;\r
+    /* We use default FPS of the webcam\r
+     * return a fixed value on guest ini file (1/30).\r
+     */\r
+    param->top = 0;\r
+    param->stack[0] = 0x1000; /* V4L2_CAP_TIMEPERFRAME */\r
+    param->stack[1] = 1; /* numerator */\r
+    param->stack[2] = 30; /* denominator */\r
 }\r
 \r
 void marucam_device_s_fmt(MaruCamState* state)\r

diff --git a/tizen/src/hw/maru_camera_win32_pci.c b/tizen/src/hw/maru_camera_win32_pci.c
index 504574d117f89b7a97621b9a04892ee03cbd8078..f9e6cd54435c015d65dd7f82c804bea504ede8e9 100644 (file)
--- a/tizen/src/hw/maru_camera_win32_pci.c
+++ b/tizen/src/hw/maru_camera_win32_pci.c
@@ -943,7 +943,6 @@ IGrabCallback *g_pCallback;
 DWORD g_dwFourcc;\r
 LONG g_dwWidth;\r
 LONG g_dwHeight;\r
-REFERENCE_TIME g_dwAvgInterval;\r
 \r
 // V4L2 defines copy from videodev2.h\r
 #define V4L2_CTRL_FLAG_SLIDER       0x0020\r
@@ -1340,7 +1339,6 @@ static STDMETHODIMP SetDefaultValues(void)
                         (pvi->bmiHeader.biHeight == g_dwHeight) &&\r
                         (pvi->bmiHeader.biCompression == g_dwFourcc))\r
                     {\r
-                        pvi->AvgTimePerFrame = g_dwAvgInterval;\r
                         hr = pSConfig->lpVtbl->SetFormat(pSConfig, pmtConfig);\r
                         DeleteMediaType(pmtConfig);\r
                         INFO("Setting default values.\n");\r
@@ -1383,7 +1381,6 @@ static STDMETHODIMP SetResolution(LONG width, LONG height)
             VIDEOINFOHEADER* pvi = (VIDEOINFOHEADER*)pmt->pbFormat;\r
             pvi->bmiHeader.biWidth = width;\r
             pvi->bmiHeader.biHeight = height;\r
-            pvi->AvgTimePerFrame = g_dwAvgInterval;\r
             pvi->bmiHeader.biSizeImage = ((width * pvi->bmiHeader.biBitCount) >> 3 ) * height;\r
             hr = vsc->lpVtbl->SetFormat(vsc, pmt);\r
             if (hr != S_OK) {\r
@@ -1560,7 +1557,6 @@ void marucam_device_open(MaruCamState* state)
         goto error_failed;\r
     }\r
 \r
-    g_dwAvgInterval = 666666;\r
     g_dwFourcc = MAKEFOURCC('Y','U','Y','2');\r
     g_dwHeight = 480;\r
     g_dwWidth = 640;\r
@@ -1662,6 +1658,7 @@ void marucam_device_s_param(MaruCamState* state)
 {\r
     MaruCamParam *param = state->param;\r
 \r
+    /* We use default FPS of the webcam */\r
     param->top = 0;\r
 }\r
 \r
@@ -1670,11 +1667,13 @@ void marucam_device_g_param(MaruCamState* state)
 {\r
     MaruCamParam *param = state->param;\r
 \r
+    /* We use default FPS of the webcam\r
+     * return a fixed value on guest ini file (1/30).\r
+     */\r
     param->top = 0;\r
-\r
-    param->stack[0] = 0x1000; // V4L2_CAP_TIMEPERFRAME\r
-    param->stack[1] = 1; // numerator;\r
-    param->stack[2] = 30; // denominator;\r
+    param->stack[0] = 0x1000; /* V4L2_CAP_TIMEPERFRAME */\r
+    param->stack[1] = 1; /* numerator */\r
+    param->stack[2] = 30; /* denominator */\r
 }\r
 \r
 // MARUCAM_CMD_S_FMT\r