diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 8d3276674..d4c3bf497 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -72,19 +72,18 @@ vhost __defaultVhost__ { vhost dev { enabled on; gop_cache on; - hls off; + hls on; hls_path ./objs/nginx/html; hls_fragment 5; hls_window 30; #forward 127.0.0.1:19350; #forward 127.0.0.1:1936; transcode { - enabled on; + enabled off; ffmpeg ./objs/ffmpeg/bin/ffmpeg; engine dev { enabled on; vfilter { - t 10; } vcodec libx264; vbitrate 300; diff --git a/trunk/src/core/srs_core_encoder.cpp b/trunk/src/core/srs_core_encoder.cpp index 97aac00d1..5ad23e83c 100644 --- a/trunk/src/core/srs_core_encoder.cpp +++ b/trunk/src/core/srs_core_encoder.cpp @@ -374,6 +374,8 @@ int SrsFFMPEG::cycle() return ret; } + // TODO: to support rewind. + if (p == 0) { srs_info("transcode process pid=%d is running.", pid); return ret; @@ -391,6 +393,8 @@ void SrsFFMPEG::stop() return; } + // TODO: kill the ffmpeg process when stop. + std::vector::iterator it; it = std::find(_transcoded_url.begin(), _transcoded_url.end(), output); if (it != _transcoded_url.end()) {