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-25 14:59:19 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
3ab867d907c492fa4ef066e80027a27c758bd7e4
3ab867d9
1 parent
836bc413
fix bug of player dar.
显示空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
24 行增加
和
9 行删除
trunk/research/players/js/srs.player.js
trunk/research/players/srs_chat.html
trunk/research/players/srs_player.html
trunk/research/players/srs_player/release/srs_player.swf
trunk/research/players/srs_player/src/srs_player.as
trunk/research/players/srs_publisher.html
trunk/research/players/js/srs.player.js
查看文件 @
3ab867d
...
...
@@ -78,6 +78,9 @@ SrsPlayer.prototype.start = function(url) {
* @param volume the volume, 0 is mute, 1 is 100%, 2 is 200%.
*/
SrsPlayer
.
prototype
.
play
=
function
(
url
,
volume
)
{
this
.
stop
();
SrsPlayer
.
__players
.
push
(
this
);
if
(
url
)
{
this
.
stream_url
=
url
;
}
...
...
@@ -118,8 +121,8 @@ SrsPlayer.prototype.resume = function() {
* use metadata width if 0.
* use user specified width if -1.
*/
SrsPlayer
.
prototype
.
dar
=
function
(
num
,
den
)
{
this
.
callbackObj
.
ref
.
__dar
(
num
,
den
);
SrsPlayer
.
prototype
.
set_dar
=
function
(
num
,
den
)
{
this
.
callbackObj
.
ref
.
__set_dar
(
num
,
den
);
}
/**
* set the fullscreen size data.
...
...
trunk/research/players/srs_chat.html
查看文件 @
3ab867d
...
...
@@ -78,8 +78,11 @@
realtime_player
=
new
SrsPlayer
(
"realtime_player"
,
430
,
185
);
realtime_player
.
on_player_ready
=
function
()
{
this
.
set_bt
(
0.5
);
this
.
set_fs
(
"screen"
,
100
);
};
realtime_player
.
on_player_metadata
=
function
(
metadata
)
{
this
.
set_dar
(
0
,
0
);
this
.
set_fs
(
"screen"
,
100
);
}
realtime_player
.
start
();
}
...
...
@@ -230,8 +233,11 @@
var
_player
=
new
SrsPlayer
(
"rp_raw_"
+
chat
.
id
,
600
,
300
,
chat
);
_player
.
on_player_ready
=
function
()
{
this
.
set_bt
(
0.5
);
this
.
set_fs
(
"screen"
,
100
);
};
_player
.
on_player_metadata
=
function
(
metadata
)
{
this
.
set_dar
(
0
,
0
);
this
.
set_fs
(
"screen"
,
100
);
}
_player
.
start
(
chat
.
url
);
chat
.
player
=
_player
;
...
...
trunk/research/players/srs_player.html
查看文件 @
3ab867d
...
...
@@ -34,7 +34,7 @@
var
__active_dar
=
null
;
function
select_dar
(
dar_id
,
num
,
den
)
{
srs_player
.
dar
(
num
,
den
);
srs_player
.
set_
dar
(
num
,
den
);
if
(
__active_dar
)
{
__active_dar
.
removeClass
(
"active"
);
...
...
trunk/research/players/srs_player/release/srs_player.swf
查看文件 @
3ab867d
不能预览此文件类型
trunk/research/players/srs_player/src/srs_player.as
查看文件 @
3ab867d
...
...
@@ -115,7 +115,7 @@ package
flash
.
external
.
ExternalInterface
.
addCallback
(
"__stop"
,
this
.
js_call_stop
)
;
flash
.
external
.
ExternalInterface
.
addCallback
(
"__pause"
,
this
.
js_call_pause
)
;
flash
.
external
.
ExternalInterface
.
addCallback
(
"__resume"
,
this
.
js_call_resume
)
;
flash
.
external
.
ExternalInterface
.
addCallback
(
"__
dar"
,
this
.
js_call
_dar
)
;
flash
.
external
.
ExternalInterface
.
addCallback
(
"__
set_dar"
,
this
.
js_call_set
_dar
)
;
flash
.
external
.
ExternalInterface
.
addCallback
(
"__set_fs"
,
this
.
js_call_set_fs_size
)
;
flash
.
external
.
ExternalInterface
.
addCallback
(
"__set_bt"
,
this
.
js_call_set_bt
)
;
...
...
@@ -229,7 +229,7 @@ package
* use metadata width if 0.
* use user specified width if -1.
*/
private
function
js_call_dar
(
num
:
int
,
den
:
int
)
:
void
{
private
function
js_call_
set_
dar
(
num
:
int
,
den
:
int
)
:
void
{
user_dar_num
=
num
;
user_dar_den
=
den
;
...
...
trunk/research/players/srs_publisher.html
查看文件 @
3ab867d
...
...
@@ -80,16 +80,22 @@
remote_player
=
new
SrsPlayer
(
"remote_player"
,
430
,
185
);
remote_player
.
on_player_ready
=
function
()
{
this
.
set_bt
(
0.8
);
this
.
set_fs
(
"screen"
,
100
);
};
remote_player
.
on_player_metadata
=
function
(
metadata
)
{
this
.
set_dar
(
0
,
0
);
this
.
set_fs
(
"screen"
,
100
);
}
remote_player
.
start
();
// start the realtime player.
realtime_player
=
new
SrsPlayer
(
"realtime_player"
,
430
,
185
);
realtime_player
.
on_player_ready
=
function
()
{
this
.
set_bt
(
0.8
);
this
.
set_fs
(
"screen"
,
100
);
};
realtime_player
.
on_player_metadata
=
function
(
metadata
)
{
this
.
set_dar
(
0
,
0
);
this
.
set_fs
(
"screen"
,
100
);
}
realtime_player
.
start
();
}
});
...
...
请
注册
或
登录
后发表评论