diff --git a/README.md b/README.md index 633188ca9..6181592dd 100755 --- a/README.md +++ b/README.md @@ -42,33 +42,33 @@ For example, use ffmpeg to publish: sleep 1; \ done -step 6: add server ip to hosts as dev.
+step 6: add server ip to hosts as demo.
 # edit the folowing file:
 # linux: /etc/hosts
 # windows: C:\Windows\System32\drivers\etc\hosts
-192.168.2.111 dev 
+192.168.2.111 demo 
 
step 7: play live stream.
-rtmp url: rtmp://dev:1935/live/livestream
-m3u8 url: http://dev:80/live/livestream.m3u8
+rtmp url: rtmp://demo:1935/live/livestream
+m3u8 url: http://demo:80/live/livestream.m3u8
 
step 8: play live stream auto transcoded
-rtmp url: rtmp://dev:1935/live/livestream_ld
-m3u8 url: http://dev:80/live/livestream_ld.m3u8
-rtmp url: rtmp://dev:1935/live/livestream_sd
-m3u8 url: http://dev:80/live/livestream_sd.m3u8
+rtmp url: rtmp://demo:1935/live/livestream_ld
+m3u8 url: http://demo:80/live/livestream_ld.m3u8
+rtmp url: rtmp://demo:1935/live/livestream_sd
+m3u8 url: http://demo:80/live/livestream_sd.m3u8
 
step 9: play live stream auto forwarded, the hls dir change to /forward
-rtmp url: rtmp://dev:19350/live/livestream
-m3u8 url: http://dev:80/forward/live/livestream.m3u8
-rtmp url: rtmp://dev:19350/live/livestream_ld
-m3u8 url: http://dev:80/forward/live/livestream_ld.m3u8
-rtmp url: rtmp://dev:19350/live/livestream_sd
-m3u8 url: http://dev:80/forward/live/livestream_sd.m3u8
+rtmp url: rtmp://demo:19350/live/livestream
+m3u8 url: http://demo:80/forward/live/livestream.m3u8
+rtmp url: rtmp://demo:19350/live/livestream_ld
+m3u8 url: http://demo:80/forward/live/livestream_ld.m3u8
+rtmp url: rtmp://demo:19350/live/livestream_sd
+m3u8 url: http://demo:80/forward/live/livestream_sd.m3u8
 
### System Requirements diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index a15d7ae75..c73fefb0c 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -8,6 +8,7 @@ listen 1935; chunk_size 65000; # vhost list, the __defaultVhost__ is the default vhost # for which cannot identify the required vhost. +# for default demo. vhost __defaultVhost__ { enabled on; gop_cache on; @@ -15,7 +16,7 @@ vhost __defaultVhost__ { hls_path ./objs/nginx/html; hls_fragment 5; hls_window 30; - #forward 127.0.0.1:19350; + forward 127.0.0.1:19350; transcode { enabled on; ffmpeg ./objs/ffmpeg/bin/ffmpeg; @@ -68,6 +69,42 @@ vhost __defaultVhost__ { } } } +# for development +vhost dev { + enabled on; + gop_cache on; + hls on; + hls_path ./objs/nginx/html; + hls_fragment 5; + hls_window 30; + forward dev:19350; + transcode { + enabled on; + ffmpeg ./objs/ffmpeg/bin/ffmpeg; + engine dev{ + enabled on; + vfilter { + } + vcodec libx264; + vbitrate 300; + vfps 20; + vwidth 768; + vheight 320; + vthreads 1; + vprofile baseline; + vpreset superfast; + vparams { + } + acodec libaacplus; + abitrate 30; + asample_rate 44100; + achannels 2; + aparams { + } + output rtmp://[vhost]:[port]/[app]/[stream]_dev; + } + } +} # the mirror filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#Filtering-Introduction vhost mirror.transcode.vhost.com { transcode {