external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

add players to nginx

Browse source
This commit is contained in:
winlin 2013-12-17 11:30:00 +08:00
parent 9080c2e559
commit c4477cd64f
7 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -63,6 +63,7 @@ For example, use ffmpeg to publish:
</pre> </pre>
<strong>step 8:</strong> play live stream. <br/> <strong>step 8:</strong> play live stream. <br/>
<pre> <pre>
players: http://demo:80/players
rtmp url: rtmp://demo:1935/live/livestream rtmp url: rtmp://demo:1935/live/livestream
m3u8 url: http://demo:80/live/livestream.m3u8 m3u8 url: http://demo:80/live/livestream.m3u8
for android: http://demo:80/live/livestream.html for android: http://demo:80/live/livestream.html

3
trunk/auto/depends.sh Normal file → Executable file
View file

@ -252,6 +252,9 @@ if [ $SRS_HLS = YES ]; then
html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5 html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5
html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5 html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5
html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5 html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5
# copy players to nginx html dir.
cp research/players ${SRS_OBJS}/nginx/html/ -r
fi fi
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then

1
trunk/configure vendored
View file

@ -180,6 +180,7 @@ echo "\" make \" to build the srs(simple rtmp server)."
echo "\" make help \" to get the usage of make" echo "\" make help \" to get the usage of make"
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then
echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls"
echo "\" http://demo:80/players \" rtmp players(OSMF/JWPlayer)"
fi fi
if [ $SRS_FFMPEG = YES ]; then if [ $SRS_FFMPEG = YES ]; then
echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding" echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding"

2
trunk/research/players/jwplayer5/index.html Normal file → Executable file
View file

@ -17,7 +17,7 @@
<div class="main"> <div class="main">
<div id="player"></div> <div id="player"></div>
<div class="control" id="control"> <div class="control" id="control">
Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://dev:1935/live/livestream"></input> Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://demo:1935/live/livestream"></input>
<input type="button" class="play" value="Play" onclick="play()"></input> <input type="button" class="play" value="Play" onclick="play()"></input>
</div> </div>
</div> </div>

2
trunk/research/players/jwplayer6/index.html Normal file → Executable file
View file

@ -17,7 +17,7 @@
<div class="main"> <div class="main">
<div id="player"></div> <div id="player"></div>
<div class="control" id="control"> <div class="control" id="control">
Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://dev:1935/live/livestream"></input> Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://demo:1935/live/livestream"></input>
<input type="button" class="play" value="Play" onclick="play()"></input> <input type="button" class="play" value="Play" onclick="play()"></input>
</div> </div>
</div> </div>

2
trunk/research/players/osmf/index.html Normal file → Executable file
View file

@ -19,7 +19,7 @@ div.control{padding-bottom:10px; background-color:#333333; }
<div class="main" id="main"> <div class="main" id="main">
<div id="player" class="player"></div> <div id="player" class="player"></div>
<div class="control" id="control"> <div class="control" id="control">
Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://dev:1935/live/livestream"></input> Url(RTMP/HTTP): <input id="url" type="text" class="url" value="rtmp://demo:1935/live/livestream"></input>
<select class="type" id="type"> <select class="type" id="type">
<option value="live" selected>live</option> <option value="live" selected>live</option>
<option value="recorded">vod</option> <option value="recorded">vod</option>

2
trunk/research/players/rtmp/index.html Normal file → Executable file
View file

@ -21,7 +21,7 @@
<script type="text/javascript"> <script type="text/javascript">
var o = new RtmpPlayer("player", "RtmpPlayer.swf", 1350, 1050); var o = new RtmpPlayer("player", "RtmpPlayer.swf", 1350, 1050);
o.setRtmpUrl("rtmp://dev:1935/live/livestream"); o.setRtmpUrl("rtmp://demo:1935/live/livestream");
o.admin = "admin"; o.admin = "admin";
o.password = "123456"; o.password = "123456";
o.loop = false; o.loop = false;