胡斌

don't auto play the defult local streaming url,

just parse the input string of ss_start and start push to get the play url
正在显示 1 个修改的文件 包含 20 行增加8 行删除
... ... @@ -167,6 +167,16 @@ a:active {
initialize();
}
function checkAndPlayStream(inputstring){
var inputitem = inputstring.split(" ");
for(var i=0; i < inputitem.length; i++ ){
if(inputitem[i].indexOf("rtmp://")>=0){
playRTMPStream(inputitem[i]);
break;
}
}
}
var wsResult = [
"MOV_START_SUC",
"MOV_START_FAIL",
... ... @@ -309,7 +319,7 @@ a:active {
}
if(0 == result || 6 == result || 8 == result){//mov_start,mov_pause,mov_seek success
playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/ms");
//playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/ms");
}
else if(10 == result){//movie property
if(data_len > 7 * 4 + 8){
... ... @@ -330,7 +340,7 @@ a:active {
}
}
else if(11 == result){//ss_start success
playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/ss");
//playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/ss");
}
else if(24 <= result && 26 >= result){
if(data_len >= 4){
... ... @@ -340,10 +350,10 @@ a:active {
}
}
else if(55 == result){//ds_start success
playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/ds");
//playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/ds");
}
else if(59 == result){//as start success
playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/as");
//playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/as");
}
else if(result == 83){//get camera sucess
if(data_len > 4){
... ... @@ -389,7 +399,7 @@ a:active {
}
}
else if(85 == result){//cam_share success
playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/cs");
//playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/cs");
}
else if(95 == result){//get_videoparam success
var data = new Uint8Array(evt.target.result, 8, evt.target.result.byteLength - 8 -1);
... ... @@ -517,6 +527,7 @@ a:active {
//cmd.data = new TextEncoder("utf-8").encode(param.value);
cmd.data = utf16to8(param.value);
cmd.data_len = cmd.data.length;
checkAndPlayStream(param.value);
}
else if(cmdName == "ss_stop"){
cmd.type = 7;
... ... @@ -582,7 +593,7 @@ a:active {
for(var i=0;i< mic_name_array.length; i++){
mic_name[i] = mic_name_array[i];
}
var url_name = new Uint8Array(buffer, 8 + 256, 256);//todo: set push url
var url_name = new Uint8Array(buffer, 8 + 256, 256);
cmd.data = new Uint8Array(buffer, 0, cmd.data_len);
doSendWSCmd(cmd);
return;
... ... @@ -651,6 +662,7 @@ a:active {
var param = document.getElementById("start_push_input");
cmd.data = utf16to8(param.value);
cmd.data_len = cmd.data.length;
checkAndPlayStream(param.value);
}
else if(cmdName == "stop_push"){
cmd.type = 51;
... ... @@ -764,8 +776,8 @@ function getExplorerTitle() {
queryParameters['type'] = "live";
}
if( queryParameters['source'] == "" )
queryParameters['source'] = "rtmp://localhost/live/ss";
//if( queryParameters['source'] == "" )
// queryParameters['source'] = "rtmp://localhost/live/ss";
if( queryParameters['type'] == "" )
queryParameters['type'] = "live";
... ...