From 7445fe1da497eddc393f569f3f87ce97db232e1a Mon Sep 17 00:00:00 2001 From: "Liu, Xin" Date: Fri, 21 Jun 2013 11:32:56 +0800 Subject: [PATCH] Improve CameraViaUserMedia by adding observation eare in behavior Signed-off-by: Liu, Xin --- tests/CameraViaUserMedia/index.html | 14 +++++++++----- tests/CameraViaUserMedia/js/main.js | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tests/CameraViaUserMedia/index.html b/tests/CameraViaUserMedia/index.html index 61f5e24..a811379 100755 --- a/tests/CameraViaUserMedia/index.html +++ b/tests/CameraViaUserMedia/index.html @@ -44,13 +44,17 @@ Authors:

+
+

+
+ +
+
- + +
-

-
-
- +
diff --git a/tests/CameraViaUserMedia/js/main.js b/tests/CameraViaUserMedia/js/main.js index 1bb9282..5e1556a 100755 --- a/tests/CameraViaUserMedia/js/main.js +++ b/tests/CameraViaUserMedia/js/main.js @@ -30,6 +30,7 @@ Authors: */ $(document).ready(function(){ DisablePassButton(); + $("#errormassage").html("No video"); //getUserMedia $("#getUserMeida")[0].onclick = function() { try { @@ -37,6 +38,7 @@ $(document).ready(function(){ navigator.getUserMedia({video: true}, function(s){ var url = webkitURL.createObjectURL(s); $("#localView")[0].src = url; + $("#localView").show(); $("#errormassage").hide(); EnablePassButton(); }, function(error){ @@ -48,4 +50,18 @@ $(document).ready(function(){ $("#errormassage").html("Get usr media occur error,with error message:"+e.message+""); } } + + //stop getUserMedia + $("#stopUserMeida")[0].onclick = function() { + try { + navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia; + navigator.getUserMedia(); + $("#errormassage").show(); + $("#errormassage").html("No video"); + } catch (e) { + $("#localView").hide(); + $("#errormassage").show(); + $("#errormassage").html("No video"); + } + } }); -- 2.7.4