diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 01408120d..dded4bba3 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -259,6 +259,13 @@ if [ $SRS_HLS = YES ]; then ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && rm -f ${SRS_OBJS}/nginx/crossdomain.xml && ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml + + # override the default index. + cat < ${SRS_OBJS}/nginx/html/index.html + +END fi if [ $SRS_HLS = YES ]; then diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html index 043268b3f..75c4f26ea 100755 --- a/trunk/research/players/index.html +++ b/trunk/research/players/index.html @@ -15,7 +15,9 @@ diff --git a/trunk/research/players/js/srs.js b/trunk/research/players/js/srs.js index 75301b849..ac1305112 100755 --- a/trunk/research/players/js/srs.js +++ b/trunk/research/players/js/srs.js @@ -1,3 +1,6 @@ +////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////// /** * padding the output. * padding(3, 5, '0') is 00003 @@ -112,6 +115,10 @@ function srs_init(rtmp_url, hls_url, modal_player) { ////////////////////////////////////////////////////////////////////////////////// /** * the SrsPlayer object. +* @param container the html container id. +* @param stream_url the url of stream, rtmp or http. +* @param width a float value specifies the width of player. +* @param height a float value specifies the height of player. */ function SrsPlayer(container, stream_url, width, height) { if (!SrsPlayer.__id) { @@ -275,3 +282,8 @@ function __srs_on_player_timer(id, time, buffer_length) { player.on_player_timer(time, buffer_length); } + +////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////// + diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index dd6023fe7..6c74d028e 100755 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -15,7 +15,7 @@ diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf index e7966ab25..a4076939e 100755 Binary files a/trunk/research/players/srs_player/release/srs_player.swf and b/trunk/research/players/srs_player/release/srs_player.swf differ diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as index 0abde2d12..5be20f65e 100755 --- a/trunk/research/players/srs_player/src/srs_player.as +++ b/trunk/research/players/srs_player/src/srs_player.as @@ -85,9 +85,6 @@ package if (!flashvars.hasOwnProperty("id")) { throw new Error("must specifies the id"); } - if (!flashvars.hasOwnProperty("on_player_ready")) { - throw new Error("must specifies the on_player_ready"); - } this.js_id = flashvars.id; this.js_on_player_ready = flashvars.on_player_ready; diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index 82684c56e..835524f55 100755 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -15,7 +15,7 @@ diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf index 924a50049..5267e3cde 100755 Binary files a/trunk/research/players/srs_publisher/release/srs_publisher.swf and b/trunk/research/players/srs_publisher/release/srs_publisher.swf differ diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index 01f3ed87b..27dd236a6 100755 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -15,7 +15,7 @@