diff --git a/README.md b/README.md
index c82901ab8..bd9f2eb03 100755
--- a/README.md
+++ b/README.md
@@ -31,8 +31,11 @@ step 4: publish live stream
FMS URL: rtmp://127.0.0.1:1935/live
Stream: livestream
For example, use ffmpeg to publish:
- ffmpeg -re -i source.flv -vcodec copy -acodec copy \
- -f flv -y rtmp://127.0.0.1:1935/live/livestream
+ for((;;)); do \
+ ./objs/ffmpeg/bin/ffmpeg -re -i doc/source.flv -vcodec copy -acodec copy \
+ -f flv -y rtmp://127.0.0.1:1935/live/livestream; \
+ sleep 1; \
+ done
step 5: play live stream
@@ -41,8 +44,8 @@ m3u8 url: http://127.0.0.1:80/live/livestream.m3u8step 6: play live stream auto transcoded
-rtmp url: rtmp://127.0.0.1:1935/live/livestream_fast -m3u8 url: http://127.0.0.1:80/live/livestream_fast.m3u8 +rtmp url: rtmp://127.0.0.1:1935/live/livestream_ld +m3u8 url: http://127.0.0.1:80/live/livestream_ld.m3u8 rtmp url: rtmp://127.0.0.1:1935/live/livestream_sd m3u8 url: http://127.0.0.1:80/live/livestream_sd.m3u8diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index f358323d2..72b8d0a6d 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -20,7 +20,7 @@ vhost __defaultVhost__ { enabled on; ffmpeg ./objs/ffmpeg/bin/ffmpeg; #ffmpeg ./research/ffempty/ffempty; - engine fast{ + engine ld{ enabled on; vfilter { #vf 'drawtext=text=SRS'; @@ -31,7 +31,7 @@ vhost __defaultVhost__ { vcodec libx264; vbitrate 300; vfps 20; - vwidth 480; + vwidth 768; vheight 320; vthreads 1; vprofile baseline; @@ -45,7 +45,7 @@ vhost __defaultVhost__ { aparams { profile:a aac_low; } - output rtmp://[vhost]:[port]/[app]/[stream]_fast; + output rtmp://[vhost]:[port]/[app]/[stream]_ld; } engine sd{ enabled on; @@ -55,8 +55,8 @@ vhost __defaultVhost__ { vcodec libx264; vbitrate 500; vfps 20; - vwidth 720; - vheight 480; + vwidth 768; + vheight 320; vthreads 1; vprofile main; vpreset fast; @@ -85,7 +85,7 @@ vhost all.transcode.vhost.com { # the transcode engine for matched stream. # all matched stream will transcoded to the following stream. # the transcode set name(ie. hd) is optional and not used. - engine super{ + engine ffsuper{ # whether the engine is enabled # default: off. enabled on; @@ -143,9 +143,9 @@ vhost all.transcode.vhost.com { # [port] the intput stream port. # [app] the input stream app. # [stream] the input stream name. - output rtmp://[vhost]:[port]/[app]/[stream]_super; + output rtmp://[vhost]:[port]/[app]/[stream]_ffsuper; } - engine hd{ + engine ffhd{ enabled on; vcodec libx264; vbitrate 1200; @@ -163,9 +163,9 @@ vhost all.transcode.vhost.com { achannels 2; aparams { } - output rtmp://[vhost]:[port]/[app]/[stream]_hd; + output rtmp://[vhost]:[port]/[app]/[stream]_ffhd; } - engine sd{ + engine ffsd{ enabled on; vcodec libx264; vbitrate 800; @@ -183,9 +183,9 @@ vhost all.transcode.vhost.com { achannels 2; aparams { } - output rtmp://[vhost]:[port]/[app]/[stream]_sd; + output rtmp://[vhost]:[port]/[app]/[stream]_ffsd; } - engine fast{ + engine fffast{ enabled on; vcodec libx264; vbitrate 300; @@ -203,7 +203,7 @@ vhost all.transcode.vhost.com { achannels 2; aparams { } - output rtmp://[vhost]:[port]/[app]/[stream]_fast; + output rtmp://[vhost]:[port]/[app]/[stream]_fffast; } } } diff --git a/trunk/doc/source.flv b/trunk/doc/source.flv new file mode 100644 index 000000000..84bbb0cd7 Binary files /dev/null and b/trunk/doc/source.flv differ