正在显示
3 个修改的文件
包含
22 行增加
和
8 行删除
| @@ -19,13 +19,19 @@ cd simple-rtmp-server-*.*/trunk | @@ -19,13 +19,19 @@ cd simple-rtmp-server-*.*/trunk | ||
| 19 | ./configure --with-ssl --with-hls --with-ffmpeg --with-http | 19 | ./configure --with-ssl --with-hls --with-ffmpeg --with-http |
| 20 | make | 20 | make |
| 21 | </pre> | 21 | </pre> |
| 22 | +or get the latest code:<br/> | ||
| 23 | +<pre> | ||
| 24 | +git clone https://github.com/winlinvip/simple-rtmp-server | ||
| 25 | +cd simple-rtmp-server/trunk | ||
| 26 | +./configure --with-ssl --with-hls --with-ffmpeg --with-http | ||
| 27 | +</pre> | ||
| 22 | step 2: start srs <br/> | 28 | step 2: start srs <br/> |
| 23 | <pre> | 29 | <pre> |
| 24 | -./objs/simple_rtmp_server -c conf/srs.conf | 30 | +./objs/srs -c conf/srs.conf |
| 25 | </pre> | 31 | </pre> |
| 26 | step 3(optinal): start srs listen at 19350 to forward to<br/> | 32 | step 3(optinal): start srs listen at 19350 to forward to<br/> |
| 27 | <pre> | 33 | <pre> |
| 28 | -./objs/simple_rtmp_server -c conf/srs.19350.conf | 34 | +./objs/srs -c conf/srs.19350.conf |
| 29 | </pre> | 35 | </pre> |
| 30 | step 4(optional): start nginx for HLS <br/> | 36 | step 4(optional): start nginx for HLS <br/> |
| 31 | <pre> | 37 | <pre> |
| @@ -82,6 +88,14 @@ rtmp url: rtmp://demo:19350/live/livestream_sd | @@ -82,6 +88,14 @@ rtmp url: rtmp://demo:19350/live/livestream_sd | ||
| 82 | m3u8 url: http://demo:80/forward/live/livestream_sd.m3u8 | 88 | m3u8 url: http://demo:80/forward/live/livestream_sd.m3u8 |
| 83 | for android: http://demo:80/forward/live/livestream_sd.html | 89 | for android: http://demo:80/forward/live/livestream_sd.html |
| 84 | </pre> | 90 | </pre> |
| 91 | +step 11: modify the config and reload it (all features support reload)<br/> | ||
| 92 | +<pre> | ||
| 93 | +killall -1 srs | ||
| 94 | +</pre> | ||
| 95 | +or use specified signal name to reload:<br/> | ||
| 96 | +<pre> | ||
| 97 | +killall -s SIGHUP srs | ||
| 98 | +</pre> | ||
| 85 | 99 | ||
| 86 | ### Architecture | 100 | ### Architecture |
| 87 | System Architecture: | 101 | System Architecture: |
| @@ -83,7 +83,7 @@ vhost __defaultVhost__ { | @@ -83,7 +83,7 @@ vhost __defaultVhost__ { | ||
| 83 | vhost dev { | 83 | vhost dev { |
| 84 | enabled on; | 84 | enabled on; |
| 85 | gop_cache on; | 85 | gop_cache on; |
| 86 | - forward 127.0.0.1:19350; | 86 | + #forward 127.0.0.1:19350; |
| 87 | hls { | 87 | hls { |
| 88 | hls off; | 88 | hls off; |
| 89 | hls_path ./objs/nginx/html; | 89 | hls_path ./objs/nginx/html; |
| @@ -57,11 +57,11 @@ help: | @@ -57,11 +57,11 @@ help: | ||
| 57 | @echo " server build the srs(simple rtmp server) over st(state-threads)" | 57 | @echo " server build the srs(simple rtmp server) over st(state-threads)" |
| 58 | 58 | ||
| 59 | clean: | 59 | clean: |
| 60 | - (rm -f Makefile; cd ${SRS_OBJS}; rm -rf Makefile *.hpp src st_*_load) | 60 | + (rm -f Makefile; cd ${SRS_OBJS}; rm -rf srs Makefile *.hpp src st_*_load) |
| 61 | 61 | ||
| 62 | server: _prepare_dir | 62 | server: _prepare_dir |
| 63 | @echo "build the srs(simple rtmp server) over st(state-threads)" | 63 | @echo "build the srs(simple rtmp server) over st(state-threads)" |
| 64 | - \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} simple_rtmp_server | 64 | + \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} srs |
| 65 | 65 | ||
| 66 | # the ./configure will generate it. | 66 | # the ./configure will generate it. |
| 67 | _prepare_dir: | 67 | _prepare_dir: |
| @@ -87,7 +87,7 @@ GCC = g++ | @@ -87,7 +87,7 @@ GCC = g++ | ||
| 87 | LINK = \$(GCC) | 87 | LINK = \$(GCC) |
| 88 | AR = ar | 88 | AR = ar |
| 89 | 89 | ||
| 90 | -.PHONY: default simple_rtmp_server | 90 | +.PHONY: default srs |
| 91 | 91 | ||
| 92 | default: | 92 | default: |
| 93 | 93 | ||
| @@ -142,7 +142,7 @@ if [ $SRS_SSL = YES ]; then | @@ -142,7 +142,7 @@ if [ $SRS_SSL = YES ]; then | ||
| 142 | else | 142 | else |
| 143 | LINK_OPTIONS="-ldl" | 143 | LINK_OPTIONS="-ldl" |
| 144 | fi | 144 | fi |
| 145 | -BUILD_KEY="simple_rtmp_server" APP_MAIN="srs_main_server" APP_NAME="simple_rtmp_server" SO_PATH="" . auto/apps.sh | 145 | +BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh |
| 146 | 146 | ||
| 147 | echo 'configure ok! ' | 147 | echo 'configure ok! ' |
| 148 | 148 | ||
| @@ -187,4 +187,4 @@ fi | @@ -187,4 +187,4 @@ fi | ||
| 187 | if [ $SRS_HTTP = YES ]; then | 187 | if [ $SRS_HTTP = YES ]; then |
| 188 | echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" | 188 | echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" |
| 189 | fi | 189 | fi |
| 190 | -echo "\" ./objs/simple_rtmp_server -c conf/srs.conf \" to start the srs live server" | 190 | +echo "\" ./objs/srs -c conf/srs.conf \" to start the srs live server" |
-
请 注册 或 登录 后发表评论