external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

add todo for ffmpeg

Browse source
This commit is contained in:
winlin 2013-12-03 00:26:40 +08:00
parent 5afe746e69
commit 464d78b762
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
trunk/conf/srs.conf
View file

@ -72,19 +72,18 @@ vhost __defaultVhost__ {
vhost dev { vhost dev {
enabled on; enabled on;
gop_cache on; gop_cache on;
hls off; hls on;
hls_path ./objs/nginx/html; hls_path ./objs/nginx/html;
hls_fragment 5; hls_fragment 5;
hls_window 30; hls_window 30;
#forward 127.0.0.1:19350; #forward 127.0.0.1:19350;
#forward 127.0.0.1:1936; #forward 127.0.0.1:1936;
transcode { transcode {
enabled on; enabled off;
ffmpeg ./objs/ffmpeg/bin/ffmpeg; ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine dev { engine dev {
enabled on; enabled on;
vfilter { vfilter {
t 10;
} }
vcodec libx264; vcodec libx264;
vbitrate 300; vbitrate 300;

4
trunk/src/core/srs_core_encoder.cpp
View file

@ -374,6 +374,8 @@ int SrsFFMPEG::cycle()
return ret; return ret;
} }
// TODO: to support rewind.
if (p == 0) { if (p == 0) {
srs_info("transcode process pid=%d is running.", pid); srs_info("transcode process pid=%d is running.", pid);
return ret; return ret;
@ -391,6 +393,8 @@ void SrsFFMPEG::stop()
return; return;
} }
// TODO: kill the ffmpeg process when stop.
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
it = std::find(_transcoded_url.begin(), _transcoded_url.end(), output); it = std::find(_transcoded_url.begin(), _transcoded_url.end(), output);
if (it != _transcoded_url.end()) { if (it != _transcoded_url.end()) {