正在显示
2 个修改的文件
包含
6 行增加
和
3 行删除
| @@ -72,19 +72,18 @@ vhost __defaultVhost__ { | @@ -72,19 +72,18 @@ vhost __defaultVhost__ { | ||
| 72 | vhost dev { | 72 | vhost dev { |
| 73 | enabled on; | 73 | enabled on; |
| 74 | gop_cache on; | 74 | gop_cache on; |
| 75 | - hls off; | 75 | + hls on; |
| 76 | hls_path ./objs/nginx/html; | 76 | hls_path ./objs/nginx/html; |
| 77 | hls_fragment 5; | 77 | hls_fragment 5; |
| 78 | hls_window 30; | 78 | hls_window 30; |
| 79 | #forward 127.0.0.1:19350; | 79 | #forward 127.0.0.1:19350; |
| 80 | #forward 127.0.0.1:1936; | 80 | #forward 127.0.0.1:1936; |
| 81 | transcode { | 81 | transcode { |
| 82 | - enabled on; | 82 | + enabled off; |
| 83 | ffmpeg ./objs/ffmpeg/bin/ffmpeg; | 83 | ffmpeg ./objs/ffmpeg/bin/ffmpeg; |
| 84 | engine dev { | 84 | engine dev { |
| 85 | enabled on; | 85 | enabled on; |
| 86 | vfilter { | 86 | vfilter { |
| 87 | - t 10; | ||
| 88 | } | 87 | } |
| 89 | vcodec libx264; | 88 | vcodec libx264; |
| 90 | vbitrate 300; | 89 | vbitrate 300; |
| @@ -374,6 +374,8 @@ int SrsFFMPEG::cycle() | @@ -374,6 +374,8 @@ int SrsFFMPEG::cycle() | ||
| 374 | return ret; | 374 | return ret; |
| 375 | } | 375 | } |
| 376 | 376 | ||
| 377 | + // TODO: to support rewind. | ||
| 378 | + | ||
| 377 | if (p == 0) { | 379 | if (p == 0) { |
| 378 | srs_info("transcode process pid=%d is running.", pid); | 380 | srs_info("transcode process pid=%d is running.", pid); |
| 379 | return ret; | 381 | return ret; |
| @@ -391,6 +393,8 @@ void SrsFFMPEG::stop() | @@ -391,6 +393,8 @@ void SrsFFMPEG::stop() | ||
| 391 | return; | 393 | return; |
| 392 | } | 394 | } |
| 393 | 395 | ||
| 396 | + // TODO: kill the ffmpeg process when stop. | ||
| 397 | + | ||
| 394 | std::vector<std::string>::iterator it; | 398 | std::vector<std::string>::iterator it; |
| 395 | it = std::find(_transcoded_url.begin(), _transcoded_url.end(), output); | 399 | it = std::find(_transcoded_url.begin(), _transcoded_url.end(), output); |
| 396 | if (it != _transcoded_url.end()) { | 400 | if (it != _transcoded_url.end()) { |
-
请 注册 或 登录 后发表评论