正在显示
7 个修改的文件
包含
9 行增加
和
4 行删除
| @@ -63,6 +63,7 @@ For example, use ffmpeg to publish: | @@ -63,6 +63,7 @@ For example, use ffmpeg to publish: | ||
| 63 | </pre> | 63 | </pre> |
| 64 | <strong>step 8:</strong> play live stream. <br/> | 64 | <strong>step 8:</strong> play live stream. <br/> |
| 65 | <pre> | 65 | <pre> |
| 66 | +players: http://demo:80/players | ||
| 66 | rtmp url: rtmp://demo:1935/live/livestream | 67 | rtmp url: rtmp://demo:1935/live/livestream |
| 67 | m3u8 url: http://demo:80/live/livestream.m3u8 | 68 | m3u8 url: http://demo:80/live/livestream.m3u8 |
| 68 | for android: http://demo:80/live/livestream.html | 69 | for android: http://demo:80/live/livestream.html |
trunk/auto/depends.sh
100644 → 100755
| @@ -252,6 +252,9 @@ if [ $SRS_HLS = YES ]; then | @@ -252,6 +252,9 @@ if [ $SRS_HLS = YES ]; then | ||
| 252 | html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5 | 252 | html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5 |
| 253 | html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5 | 253 | html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5 |
| 254 | html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5 | 254 | html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5 |
| 255 | + | ||
| 256 | + # copy players to nginx html dir. | ||
| 257 | + cp research/players ${SRS_OBJS}/nginx/html/ -r | ||
| 255 | fi | 258 | fi |
| 256 | 259 | ||
| 257 | if [ $SRS_HLS = YES ]; then | 260 | if [ $SRS_HLS = YES ]; then |
| @@ -180,6 +180,7 @@ echo "\" make \" to build the srs(simple rtmp server)." | @@ -180,6 +180,7 @@ echo "\" make \" to build the srs(simple rtmp server)." | ||
| 180 | echo "\" make help \" to get the usage of make" | 180 | echo "\" make help \" to get the usage of make" |
| 181 | if [ $SRS_HLS = YES ]; then | 181 | if [ $SRS_HLS = YES ]; then |
| 182 | echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" | 182 | echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" |
| 183 | + echo "\" http://demo:80/players \" rtmp players(OSMF/JWPlayer)" | ||
| 183 | fi | 184 | fi |
| 184 | if [ $SRS_FFMPEG = YES ]; then | 185 | if [ $SRS_FFMPEG = YES ]; then |
| 185 | echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding" | 186 | echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding" |
trunk/research/players/jwplayer5/index.html
100644 → 100755
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | <div class="main"> | 17 | <div class="main"> |
| 18 | <div id="player"></div> | 18 | <div id="player"></div> |
| 19 | <div class="control" id="control"> | 19 | <div class="control" id="control"> |
| 20 | - Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://dev:1935/live/livestream"></input> | 20 | + Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://demo:1935/live/livestream"></input> |
| 21 | <input type="button" class="play" value="Play" onclick="play()"></input> | 21 | <input type="button" class="play" value="Play" onclick="play()"></input> |
| 22 | </div> | 22 | </div> |
| 23 | </div> | 23 | </div> |
trunk/research/players/jwplayer6/index.html
100644 → 100755
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | <div class="main"> | 17 | <div class="main"> |
| 18 | <div id="player"></div> | 18 | <div id="player"></div> |
| 19 | <div class="control" id="control"> | 19 | <div class="control" id="control"> |
| 20 | - Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://dev:1935/live/livestream"></input> | 20 | + Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://demo:1935/live/livestream"></input> |
| 21 | <input type="button" class="play" value="Play" onclick="play()"></input> | 21 | <input type="button" class="play" value="Play" onclick="play()"></input> |
| 22 | </div> | 22 | </div> |
| 23 | </div> | 23 | </div> |
trunk/research/players/osmf/index.html
100644 → 100755
| @@ -19,7 +19,7 @@ div.control{padding-bottom:10px; background-color:#333333; } | @@ -19,7 +19,7 @@ div.control{padding-bottom:10px; background-color:#333333; } | ||
| 19 | <div class="main" id="main"> | 19 | <div class="main" id="main"> |
| 20 | <div id="player" class="player"></div> | 20 | <div id="player" class="player"></div> |
| 21 | <div class="control" id="control"> | 21 | <div class="control" id="control"> |
| 22 | - Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://dev:1935/live/livestream"></input> | 22 | + Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://demo:1935/live/livestream"></input> |
| 23 | <select class="type" id="type"> | 23 | <select class="type" id="type"> |
| 24 | <option value="live" selected>live</option> | 24 | <option value="live" selected>live</option> |
| 25 | <option value="recorded">vod</option> | 25 | <option value="recorded">vod</option> |
trunk/research/players/rtmp/index.html
100644 → 100755
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | <script type="text/javascript"> | 21 | <script type="text/javascript"> |
| 22 | var o = new RtmpPlayer("player", "RtmpPlayer.swf", 1350, 1050); | 22 | var o = new RtmpPlayer("player", "RtmpPlayer.swf", 1350, 1050); |
| 23 | 23 | ||
| 24 | - o.setRtmpUrl("rtmp://dev:1935/live/livestream"); | 24 | + o.setRtmpUrl("rtmp://demo:1935/live/livestream"); |
| 25 | o.admin = "admin"; | 25 | o.admin = "admin"; |
| 26 | o.password = "123456"; | 26 | o.password = "123456"; |
| 27 | o.loop = false; | 27 | o.loop = false; |
-
请 注册 或 登录 后发表评论