Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2013-12-21 21:13:55 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
632255f08f8c5b88613f1889965f24d73744607d
632255f0
1 parent
cb55f233
update the signature, when connect to server, parse the response.
显示空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
28 行增加
和
2 行删除
trunk/research/players/js/srs.js
trunk/research/players/srs_player/release/srs_player.swf
trunk/research/players/srs_player/src/srs_player.as
trunk/research/players/srs_publisher/release/srs_publisher.swf
trunk/research/players/srs_publisher/src/srs_publisher.as
trunk/src/core/srs_core_rtmp.cpp
trunk/research/players/js/srs.js
查看文件 @
632255f
...
...
@@ -90,7 +90,7 @@ function srs_get_player_width() { return srs_get_player_modal() - 30; }
function
srs_get_player_height
()
{
return
srs_get_player_width
()
*
9
/
19
;
}
// to query the swf anti cache.
function
srs_get_version_code
()
{
return
"1.
0
"
;
}
function
srs_get_version_code
()
{
return
"1.
1
"
;
}
/**
* initialize the page.
...
...
trunk/research/players/srs_player/release/srs_player.swf
查看文件 @
632255f
不能预览此文件类型
trunk/research/players/srs_player/src/srs_player.as
查看文件 @
632255f
...
...
@@ -293,6 +293,18 @@ package
this
.
media_conn
.
addEventListener
(
NetStatusEvent
.
NET_STATUS
,
function
(
evt
:
NetStatusEvent
)
:
void
{
trace
(
"NetConnection: code="
+
evt
.
info
.
code
)
;
if
(
evt
.
info
.
hasOwnProperty
(
"data"
)
&&
evt
.
info
.
data
)
{
// for context menu
var
customItems
:
Array
=
[
new
ContextMenuItem
(
"SrsPlayer"
)]
;
if
(
evt
.
info
.
data
.
hasOwnProperty
(
"srs_server"
))
{
customItems
.
push
(
new
ContextMenuItem
(
"Server: "
+
evt
.
info
.
data
.
srs_server
))
;
}
if
(
evt
.
info
.
data
.
hasOwnProperty
(
"srs_contributor"
))
{
customItems
.
push
(
new
ContextMenuItem
(
"Contributor: "
+
evt
.
info
.
data
.
srs_contributor
))
;
}
contextMenu
.
customItems
=
customItems
;
}
// TODO: FIXME: failed event.
if
(
evt
.
info
.
code
!=
"NetConnection.Connect.Success"
)
{
return
;
...
...
trunk/research/players/srs_publisher/release/srs_publisher.swf
查看文件 @
632255f
不能预览此文件类型
trunk/research/players/srs_publisher/src/srs_publisher.as
查看文件 @
632255f
...
...
@@ -14,6 +14,7 @@ package
import
flash
.
net
.
NetConnection
;
import
flash
.
net
.
NetStream
;
import
flash
.
ui
.
ContextMenu
;
import
flash
.
ui
.
ContextMenuItem
;
import
flash
.
utils
.
setTimeout
;
public
class
srs_publisher
extends
Sprite
...
...
@@ -159,6 +160,18 @@ package
this
.
media_conn
.
addEventListener
(
NetStatusEvent
.
NET_STATUS
,
function
(
evt
:
NetStatusEvent
)
:
void
{
trace
(
"NetConnection: code="
+
evt
.
info
.
code
)
;
if
(
evt
.
info
.
hasOwnProperty
(
"data"
)
&&
evt
.
info
.
data
)
{
// for context menu
var
customItems
:
Array
=
[
new
ContextMenuItem
(
"SrsPlayer"
)]
;
if
(
evt
.
info
.
data
.
hasOwnProperty
(
"srs_server"
))
{
customItems
.
push
(
new
ContextMenuItem
(
"Server: "
+
evt
.
info
.
data
.
srs_server
))
;
}
if
(
evt
.
info
.
data
.
hasOwnProperty
(
"srs_contributor"
))
{
customItems
.
push
(
new
ContextMenuItem
(
"Contributor: "
+
evt
.
info
.
data
.
srs_contributor
))
;
}
contextMenu
.
customItems
=
customItems
;
}
// TODO: FIXME: failed event.
if
(
evt
.
info
.
code
!=
"NetConnection.Connect.Success"
)
{
return
;
...
...
trunk/src/core/srs_core_rtmp.cpp
100644 → 100755
查看文件 @
632255f
...
...
@@ -595,7 +595,7 @@ int SrsRtmp::response_connect_app(SrsRequest* req)
pkt
->
info
->
set
(
"data"
,
data
);
data
->
set
(
"srs_version"
,
new
SrsAmf0String
(
RTMP_SIG_FMS_VER
));
data
->
set
(
"srs_server"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_
NAME
));
data
->
set
(
"srs_server"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_
KEY
" "
RTMP_SIG_SRS_VERSION
" ("
RTMP_SIG_SRS_URL_SHORT
")"
));
data
->
set
(
"srs_license"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_LICENSE
));
data
->
set
(
"srs_role"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_ROLE
));
data
->
set
(
"srs_url"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_URL
));
...
...
@@ -603,6 +603,7 @@ int SrsRtmp::response_connect_app(SrsRequest* req)
data
->
set
(
"srs_site"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_WEB
));
data
->
set
(
"srs_email"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_EMAIL
));
data
->
set
(
"srs_copyright"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_COPYRIGHT
));
data
->
set
(
"srs_contributor"
,
new
SrsAmf0String
(
RTMP_SIG_SRS_CONTRIBUTOR
));
msg
->
set_packet
(
pkt
,
0
);
...
...
请
注册
或
登录
后发表评论