From ec5e33f3bc4edd66b85f8fb17e83315a6f9bf195 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 25 Dec 2013 22:01:59 +0800
Subject: [PATCH] refine the filter of camera and microphone

---
 trunk/research/players/js/srs.page.js | 48 ++++++++++++++++++++-------
 trunk/research/players/srs_chat.html  |  4 +--
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 93d9fce83..2463fd3fd 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -148,17 +148,29 @@ function srs_initialize_codec_page(
     for (var i = 0; i < cameras.length; i++) {
         $(sl_cameras).append("<option value='" + i + "'>" + cameras[i] + "</option");
     }
-    // optional: select the first no "virtual" signed.
+    // optional: select the except matches
+    matchs = ["virtual"];
     for (var i = 0; i < cameras.length; i++) {
-        if (cameras[i].toLowerCase().indexOf("virtual") == -1) {
-            $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (cameras[i].toLowerCase().indexOf(matchs[j]) == -1) {
+                $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
-    // optional: select the first "integrated" signed.
+    // optional: select the first matched.
+    matchs = ["turevision", "integrated"];
     for (var i = 0; i < cameras.length; i++) {
-        if (cameras[i].toLowerCase().indexOf("integrated") >= 0) {
-            $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (cameras[i].toLowerCase().indexOf(matchs[j]) >= 0) {
+                $(sl_cameras + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
@@ -167,17 +179,29 @@ function srs_initialize_codec_page(
     for (var i = 0; i < microphones.length; i++) {
         $(sl_microphones).append("<option value='" + i + "'>" + microphones[i] + "</option");
     }
-    // optional: select the first no "default" signed.
+    // optional: select the except matches
+    matchs = ["default"];
     for (var i = 0; i < microphones.length; i++) {
-        if (microphones[i].toLowerCase().indexOf("default") == -1) {
-            $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (microphones[i].toLowerCase().indexOf(matchs[j]) == -1) {
+                $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
-    // optional: select the first "realtek" signed.
+    // optional: select the first matched.
+    matchs = ["realtek", "内置式麦克风"];
     for (var i = 0; i < microphones.length; i++) {
-        if (microphones[i].toLowerCase().indexOf("realtek") >= 0) {
-            $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+        for (var j = 0; j < matchs.length; j++) {
+            if (microphones[i].toLowerCase().indexOf(matchs[j]) >= 0) {
+                $(sl_microphones + " option[value='" + i + "']").attr("selected", true);
+                break;
+            }
+        }
+        if (j < matchs.length) {
             break;
         }
     }
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 4e1a9c7de..7e2a513d3 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -373,7 +373,7 @@
         }
         
         function on_user_publish() {
-            if ($("#txt_name").val().trim() == "") {
+            if ($("#txt_name").val() == "") {
                 $("#txt_name").focus().parent().parent().addClass("error");
                 warn(100, "请输入您的名字");
                 return;
@@ -460,7 +460,7 @@
             
             var chat = {};
             chat.id = -1;
-            chat.username = $("#txt_name").val().trim();
+            chat.username = $("#txt_name").val();
             chat.agent = navigator.userAgent;
             chat.url = url;
             chat.vcodec = vcodec;