emulator: Modified the webcam feature

Change-Id: If750da4201b04d1dd809d02b4846da3342dd9ad6
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --git a/org.tizen.devtools/html/common_tools/emulator.htm b/org.tizen.devtools/html/common_tools/emulator.htm
index c31125f..ac2e623 100644 (file)
--- a/org.tizen.devtools/html/common_tools/emulator.htm
+++ b/org.tizen.devtools/html/common_tools/emulator.htm
@@ -230,14 +230,16 @@
 <ul>\r
   <li>Mobile\r
   <ul>\r
+    <li>Camera: Virtual, Webcam</li>\r
     <li>Sensor: accelerometer, gyroscope, geo-magnetic, proximity, light, haptic, pressure, ultraviolet, heartbeat rate meter</li>\r
-    <li>Device: camera, battery</li>\r
+    <li>Device: battery</li>\r
     <li>Jack: ear jack, charger, USB</li>\r
   </ul></li>\r
   <li>Wearable\r
   <ul>\r
+    <li>Camera: Virtual, Webcam</li>\r
     <li>Sensor: accelerometer, gyroscope, geomagnetic, proximity, light, haptic, pressure, ultraviolet, heartbeat rate meter</li>\r
-    <li>Device: camera, battery</li>\r
+    <li>Device: battery</li>\r
     <li>Jack: charger, USB</li>\r
   </ul></li>\r
 </ul>\r
@@ -1136,12 +1138,12 @@ $egrep -c &#39;(vmx|svm)&#39; /proc/cpuinfo</pre>
 \r
 <tr>\r
 <td>Camera</td>\r
-<td><p>Virtual camera device connecting a host machine&#39;s Webcam</p> \r
+<td><p>Virtual camera device is available. It can be connected to a host machine&#39;s Webcam and import image files, such as GIF, PNG, JPG(JPEG), and BMP.</p>\r
 <p>Support: preview, capture, and record</p>\r
-<p>Image format: YUYV, I420, and YV12</p> \r
-<p>Attributes: brightness and contrast </p>  \r
+<p>Image format: YUYV, I420, and YV12</p>\r
+<p>Attributes: brightness and contrast </p>\r
 <p>Resolution: 160 x 120, 176 x 144, 320 x 240, 352 x 288, and 640 x 480</p>\r
-<p>Video resolution: 1280 x 720 for the WVGA, 320 x 240 for the WQVGA, and 640 x 480 for the HVGA devices.</p> \r
+<p>Video resolution: 1280 x 720 for the WVGA, 320 x 240 for the WQVGA, and 640 x 480 for the HVGA devices.</p>\r
 <p>The supported video codecs are MPEG-4, H.263, H.264, and VC-1 for both encoding and decoding.</p>\r
 </td>\r
 <td>Supported</td>\r

diff --git a/org.tizen.devtools/html/common_tools/emulator_features.htm b/org.tizen.devtools/html/common_tools/emulator_features.htm
index 8f1eee7..9a84a38 100644 (file)
--- a/org.tizen.devtools/html/common_tools/emulator_features.htm
+++ b/org.tizen.devtools/html/common_tools/emulator_features.htm
@@ -25,7 +25,7 @@
                <ul class="toc">
                        <li><a href="#multi">Using Multi-point Touch</a></li>
                        <li><a href="#file">Sharing a Directory</a></li>
-                       <li><a href="#webcam">Using a Webcam</a></li>
+                       <li><a href="#camera">Using a Camera</a></li>
                        <li><a href="#net">Using Network Features</a></li>
                        <li><a href="#skin">Using Custom Skin Layout</a></li>
                        <li><a href="#eventcast">Using EventCast</a></li>
@@ -41,7 +41,7 @@
 <ul>
 <li><a href="#multi">Use multi-point touch</a></li>
 <li><a href="#file">Share a directory</a></li>
-<li><a href="#webcam">Use a Webcam</a></li>
+<li><a href="#camera">Use a Camera</a></li>
 <li><a href="#net">Use network features</a></li>
 <li><a href="#skin">Use custom skin layout</a></li>
 <li><a href="#eventcast">Use EventCast</a></li>
@@ -130,8 +130,18 @@ style="display: block; text-align: center; margin-left: auto; margin-right: auto
 </table>
 
 
-<h2 id="webcam" name="webcam">Using a Webcam</h2>
-<p>With the Emulator, you can host a Webcam just like a device camera.</p>
+<h2 id="camera" name="camera">Using a Camera</h2>
+<p>With the Emulator, you can develop an app using the Camera API. The Emulator provides a virtual camera. The virtual camera injects frames by using image files in host PC or using WebCam of PC.</p>
+<p>You can use the files in image formats listed below.</p>
+<ul>
+    <li>Animated GIF(recommended)</li>
+    <li>GIF, PNG, JPG(JPEG), BMP</li>
+</ul>
+
+<p>The Emulator provides an image file that can be used as the default.</p>
+<br>
+
+<p>In addition, you can host a Webcam just like a device camera.</p>
 
 <p>Before running the application, install a USB-connected Webcam or embedded Webcam on your machine. On Linux, the Webcam feature uses libv4l-0. If you do not have it on your machine, this feature does not work properly. You can check the feature status with the following command:</p>
 <pre class="prettyprint">$ dpkg -l | grep libv4l-0</pre>
@@ -210,14 +220,14 @@ VGA: 640 x 480<br/>
 QCIF: 176 x 144<br/>
 QVGA: 320 x 240<br/>
 CIF: 352 x 288<br/>
-VGA: 640 x 480<br/> 
+VGA: 640 x 480<br/>
 </td>
 <td>-</td>
 </tr>
 <tr>
 <td>Attributes</td>
 <td>Brightness<br/>
-Contrast<br/> 
+Contrast<br/>
 </td>
 <td>Unsupported attributes can return an error. For example, the <span style="font-family: Courier New,Courier,monospace">camera_start_focusing()</span> method returns an error.</td>
 </tr>
@@ -1017,4 +1027,4 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>