do get_rtmp_port,get_mic,get_mic_vol,get_cam etc when ws connected
正在显示
2 个修改的文件
包含
37 行增加
和
39 行删除
| @@ -145,22 +145,15 @@ a:active { | @@ -145,22 +145,15 @@ a:active { | ||
| 145 | var initload = true; | 145 | var initload = true; |
| 146 | var player; | 146 | var player; |
| 147 | var rtmp_port = 1935; | 147 | var rtmp_port = 1935; |
| 148 | - | ||
| 149 | 148 | ||
| 150 | - function testWebSocket() | ||
| 151 | - { | ||
| 152 | - websocket = new WebSocket(wsUri); | ||
| 153 | - websocket.onopen = function(evt) { onOpen(evt) }; | ||
| 154 | - websocket.onclose = function(evt) { onClose(evt) }; | ||
| 155 | - websocket.onmessage = function(evt) { onMessage(evt) }; | ||
| 156 | - websocket.onerror = function(evt) { onError(evt) }; | ||
| 157 | - } | ||
| 158 | - | ||
| 159 | function onOpen(evt) | 149 | function onOpen(evt) |
| 160 | { | 150 | { |
| 161 | writeToScreen("websocket connected"); | 151 | writeToScreen("websocket connected"); |
| 162 | wsState = "connected"; | 152 | wsState = "connected"; |
| 163 | - // doSend("get_mic_vol"); | 153 | + doCmd("get_rtmp_port"); |
| 154 | + doCmd("get_mic"); | ||
| 155 | + doCmd("get_cam"); | ||
| 156 | + doCmd("get_mic_vol"); | ||
| 164 | } | 157 | } |
| 165 | 158 | ||
| 166 | function onClose(evt) | 159 | function onClose(evt) |
| @@ -458,19 +451,24 @@ a:active { | @@ -458,19 +451,24 @@ a:active { | ||
| 458 | 451 | ||
| 459 | function onTestClick(obj) | 452 | function onTestClick(obj) |
| 460 | { | 453 | { |
| 461 | - writeToScreen(obj.id); | 454 | + doCmd(obj.id); |
| 455 | + } | ||
| 456 | + | ||
| 457 | + function doCmd(cmdName) | ||
| 458 | + { | ||
| 459 | + writeToScreen(cmdName); | ||
| 462 | var cmd = new Object(); | 460 | var cmd = new Object(); |
| 463 | cmd.data_len = 0; | 461 | cmd.data_len = 0; |
| 464 | cmd.data = ""; | 462 | cmd.data = ""; |
| 465 | - cmd.name = obj.id; | 463 | + cmd.name = cmdName; |
| 466 | 464 | ||
| 467 | - if(obj.id == "mov_start"){ | 465 | + if(cmdName == "mov_start"){ |
| 468 | cmd.type = 1; | 466 | cmd.type = 1; |
| 469 | } | 467 | } |
| 470 | - else if(obj.id == "mov_stop"){ | 468 | + else if(cmdName == "mov_stop"){ |
| 471 | cmd.type = 2; | 469 | cmd.type = 2; |
| 472 | } | 470 | } |
| 473 | - else if(obj.id == "mov_pause"){ | 471 | + else if(cmdName == "mov_pause"){ |
| 474 | cmd.type = 3; | 472 | cmd.type = 3; |
| 475 | var pos = document.getElementById("mov_pos").value; | 473 | var pos = document.getElementById("mov_pos").value; |
| 476 | if(pos.length > 0){ | 474 | if(pos.length > 0){ |
| @@ -481,10 +479,10 @@ a:active { | @@ -481,10 +479,10 @@ a:active { | ||
| 481 | cmd.data = new Uint8Array(buffer, 0, 4); | 479 | cmd.data = new Uint8Array(buffer, 0, 4); |
| 482 | } | 480 | } |
| 483 | } | 481 | } |
| 484 | - else if(obj.id == "mov_resume"){ | 482 | + else if(cmdName == "mov_resume"){ |
| 485 | cmd.type = 4; | 483 | cmd.type = 4; |
| 486 | } | 484 | } |
| 487 | - else if(obj.id == "mov_seek"){ | 485 | + else if(cmdName == "mov_seek"){ |
| 488 | cmd.type = 5; | 486 | cmd.type = 5; |
| 489 | var pos = document.getElementById("mov_pos").value; | 487 | var pos = document.getElementById("mov_pos").value; |
| 490 | if(pos.length > 0){ | 488 | if(pos.length > 0){ |
| @@ -495,20 +493,20 @@ a:active { | @@ -495,20 +493,20 @@ a:active { | ||
| 495 | cmd.data = new Uint8Array(buffer, 0, 4); | 493 | cmd.data = new Uint8Array(buffer, 0, 4); |
| 496 | } | 494 | } |
| 497 | } | 495 | } |
| 498 | - else if(obj.id == "ss_start"){ | 496 | + else if(cmdName == "ss_start"){ |
| 499 | cmd.type = 6; | 497 | cmd.type = 6; |
| 500 | var param = document.getElementById("ss_start_input"); | 498 | var param = document.getElementById("ss_start_input"); |
| 501 | //cmd.data = new TextEncoder("utf-8").encode(param.value); | 499 | //cmd.data = new TextEncoder("utf-8").encode(param.value); |
| 502 | cmd.data = utf16to8(param.value); | 500 | cmd.data = utf16to8(param.value); |
| 503 | cmd.data_len = cmd.data.length; | 501 | cmd.data_len = cmd.data.length; |
| 504 | } | 502 | } |
| 505 | - else if(obj.id == "ss_stop"){ | 503 | + else if(cmdName == "ss_stop"){ |
| 506 | cmd.type = 7; | 504 | cmd.type = 7; |
| 507 | } | 505 | } |
| 508 | - else if(obj.id == "get_mic"){ | 506 | + else if(cmdName == "get_mic"){ |
| 509 | cmd.type = 26; | 507 | cmd.type = 26; |
| 510 | } | 508 | } |
| 511 | - else if(obj.id == "ds_start"){ | 509 | + else if(cmdName == "ds_start"){ |
| 512 | cmd.type = 27; | 510 | cmd.type = 27; |
| 513 | cmd.data_len = 4*6 + 256 + 256; | 511 | cmd.data_len = 4*6 + 256 + 256; |
| 514 | var buffer = new ArrayBuffer(cmd.data_len); | 512 | var buffer = new ArrayBuffer(cmd.data_len); |
| @@ -543,10 +541,10 @@ a:active { | @@ -543,10 +541,10 @@ a:active { | ||
| 543 | doSendWSCmd(cmd); | 541 | doSendWSCmd(cmd); |
| 544 | return; | 542 | return; |
| 545 | } | 543 | } |
| 546 | - else if(obj.id == "ds_stop"){ | 544 | + else if(cmdName == "ds_stop"){ |
| 547 | cmd.type = 28; | 545 | cmd.type = 28; |
| 548 | } | 546 | } |
| 549 | - else if(obj.id == "aud_start"){ | 547 | + else if(cmdName == "aud_start"){ |
| 550 | cmd.type = 29; | 548 | cmd.type = 29; |
| 551 | cmd.data_len = 4 + 4 + 256 + 256; | 549 | cmd.data_len = 4 + 4 + 256 + 256; |
| 552 | var buffer = new ArrayBuffer(cmd.data_len); | 550 | var buffer = new ArrayBuffer(cmd.data_len); |
| @@ -568,13 +566,13 @@ a:active { | @@ -568,13 +566,13 @@ a:active { | ||
| 568 | doSendWSCmd(cmd); | 566 | doSendWSCmd(cmd); |
| 569 | return; | 567 | return; |
| 570 | } | 568 | } |
| 571 | - else if(obj.id == "aud_stop"){ | 569 | + else if(cmdName == "aud_stop"){ |
| 572 | cmd.type = 30; | 570 | cmd.type = 30; |
| 573 | } | 571 | } |
| 574 | - else if(obj.id == "get_cam"){ | 572 | + else if(cmdName == "get_cam"){ |
| 575 | cmd.type = 41; | 573 | cmd.type = 41; |
| 576 | } | 574 | } |
| 577 | - else if(obj.id == "cam_start"){ | 575 | + else if(cmdName == "cam_start"){ |
| 578 | cmd.type = 42; | 576 | cmd.type = 42; |
| 579 | cmd.data_len = 4 + 4 + 256 + 256; | 577 | cmd.data_len = 4 + 4 + 256 + 256; |
| 580 | var buffer = new ArrayBuffer(cmd.data_len); | 578 | var buffer = new ArrayBuffer(cmd.data_len); |
| @@ -596,17 +594,17 @@ a:active { | @@ -596,17 +594,17 @@ a:active { | ||
| 596 | doSendWSCmd(cmd); | 594 | doSendWSCmd(cmd); |
| 597 | return; | 595 | return; |
| 598 | } | 596 | } |
| 599 | - else if(obj.id == "cam_stop"){ | 597 | + else if(cmdName == "cam_stop"){ |
| 600 | cmd.type = 43; | 598 | cmd.type = 43; |
| 601 | } | 599 | } |
| 602 | - else if(obj.id == "set_videoparam"){ | 600 | + else if(cmdName == "set_videoparam"){ |
| 603 | cmd.type = 46; | 601 | cmd.type = 46; |
| 604 | var param = document.getElementById("videoparam"); | 602 | var param = document.getElementById("videoparam"); |
| 605 | //cmd.data = new TextEncoder("utf-8").encode(param.value); | 603 | //cmd.data = new TextEncoder("utf-8").encode(param.value); |
| 606 | cmd.data = utf16to8(param.value); | 604 | cmd.data = utf16to8(param.value); |
| 607 | cmd.data_len = cmd.data.length; | 605 | cmd.data_len = cmd.data.length; |
| 608 | } | 606 | } |
| 609 | - else if(obj.id == "get_videoparam"){ | 607 | + else if(cmdName == "get_videoparam"){ |
| 610 | cmd.type = 47; | 608 | cmd.type = 47; |
| 611 | var sourceSel = document.getElementById("sources"); | 609 | var sourceSel = document.getElementById("sources"); |
| 612 | var index = sourceSel.selectedIndex; | 610 | var index = sourceSel.selectedIndex; |
| @@ -614,41 +612,41 @@ a:active { | @@ -614,41 +612,41 @@ a:active { | ||
| 614 | cmd.data = utf16to8(sourceSel.options[index].text); | 612 | cmd.data = utf16to8(sourceSel.options[index].text); |
| 615 | cmd.data_len = cmd.data.length; | 613 | cmd.data_len = cmd.data.length; |
| 616 | } | 614 | } |
| 617 | - else if(obj.id == "start_record"){ | 615 | + else if(cmdName == "start_record"){ |
| 618 | cmd.type = 48; | 616 | cmd.type = 48; |
| 619 | var param = document.getElementById("start_record_input"); | 617 | var param = document.getElementById("start_record_input"); |
| 620 | //cmd.data = new TextEncoder("utf-8").encode(param.value); | 618 | //cmd.data = new TextEncoder("utf-8").encode(param.value); |
| 621 | cmd.data = utf16to8(param.value); | 619 | cmd.data = utf16to8(param.value); |
| 622 | cmd.data_len = cmd.data.length; | 620 | cmd.data_len = cmd.data.length; |
| 623 | } | 621 | } |
| 624 | - else if(obj.id == "stop_record"){ | 622 | + else if(cmdName == "stop_record"){ |
| 625 | cmd.type = 49; | 623 | cmd.type = 49; |
| 626 | var param = document.getElementById("start_record_input"); | 624 | var param = document.getElementById("start_record_input"); |
| 627 | cmd.data = utf16to8(param.value); | 625 | cmd.data = utf16to8(param.value); |
| 628 | cmd.data_len = cmd.data.length; | 626 | cmd.data_len = cmd.data.length; |
| 629 | } | 627 | } |
| 630 | - else if(obj.id == "start_push"){ | 628 | + else if(cmdName == "start_push"){ |
| 631 | cmd.type = 50; | 629 | cmd.type = 50; |
| 632 | var param = document.getElementById("start_push_input"); | 630 | var param = document.getElementById("start_push_input"); |
| 633 | cmd.data = utf16to8(param.value); | 631 | cmd.data = utf16to8(param.value); |
| 634 | cmd.data_len = cmd.data.length; | 632 | cmd.data_len = cmd.data.length; |
| 635 | } | 633 | } |
| 636 | - else if(obj.id == "stop_push"){ | 634 | + else if(cmdName == "stop_push"){ |
| 637 | cmd.type = 51; | 635 | cmd.type = 51; |
| 638 | var param = document.getElementById("start_push_input"); | 636 | var param = document.getElementById("start_push_input"); |
| 639 | cmd.data = utf16to8(param.value); | 637 | cmd.data = utf16to8(param.value); |
| 640 | cmd.data_len = cmd.data.length; | 638 | cmd.data_len = cmd.data.length; |
| 641 | } | 639 | } |
| 642 | - else if(obj.id == "get_rtmp_port"){ | 640 | + else if(cmdName == "get_rtmp_port"){ |
| 643 | cmd.type = 52; | 641 | cmd.type = 52; |
| 644 | } | 642 | } |
| 645 | - else if(obj.id == "set_mic_vol"){ | 643 | + else if(cmdName == "set_mic_vol"){ |
| 646 | cmd.type = 53; | 644 | cmd.type = 53; |
| 647 | var param = document.getElementById("mic_vol"); | 645 | var param = document.getElementById("mic_vol"); |
| 648 | cmd.data = utf16to8(param.value); | 646 | cmd.data = utf16to8(param.value); |
| 649 | cmd.data_len = cmd.data.length; | 647 | cmd.data_len = cmd.data.length; |
| 650 | } | 648 | } |
| 651 | - else if(obj.id == "get_mic_vol"){ | 649 | + else if(cmdName == "get_mic_vol"){ |
| 652 | cmd.type = 54; | 650 | cmd.type = 54; |
| 653 | } | 651 | } |
| 654 | 652 | ||
| @@ -731,7 +729,7 @@ a:active { | @@ -731,7 +729,7 @@ a:active { | ||
| 731 | queryParameters['source'] = "rtmp://localhost/live/ss"; | 729 | queryParameters['source'] = "rtmp://localhost/live/ss"; |
| 732 | 730 | ||
| 733 | if( queryParameters['type'] == "" ) | 731 | if( queryParameters['type'] == "" ) |
| 734 | - queryParameters['type'] = "recorded"; | 732 | + queryParameters['type'] = "live"; |
| 735 | 733 | ||
| 736 | if( queryParameters['idx'] == "" ) | 734 | if( queryParameters['idx'] == "" ) |
| 737 | queryParameters['idx'] = "2"; | 735 | queryParameters['idx'] = "2"; |
| @@ -896,7 +894,7 @@ a:active { | @@ -896,7 +894,7 @@ a:active { | ||
| 896 | <tr> | 894 | <tr> |
| 897 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> | 895 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> |
| 898 | <td colspan="3"><button type="button" id="get_rtmp_port" onclick="onTestClick(this)">get_rtmp_port</button></td> | 896 | <td colspan="3"><button type="button" id="get_rtmp_port" onclick="onTestClick(this)">get_rtmp_port</button></td> |
| 899 | - <td colspan="3"><input id="rtmp_port" width="400"/></td> | 897 | + <td colspan="3"><input id="rtmp_port" width="400" readonly="readonly"/></td> |
| 900 | </tr> | 898 | </tr> |
| 901 | <tr> | 899 | <tr> |
| 902 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> | 900 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> |
-
请 注册 或 登录 后发表评论