diff --git a/.gitignore b/.gitignore index 906bf72..758685e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ coverage.html *.flv logs testdata +lal_record /pre-commit.sh /coverage.txt diff --git a/conf/ConfigBrief.md b/conf/ConfigBrief.md index 3c6dc2f..1c9b645 100644 --- a/conf/ConfigBrief.md +++ b/conf/ConfigBrief.md @@ -34,7 +34,7 @@ // - `/hls/{streamName}/{streamName}-{timestamp}-{index}.ts` 或 // `/hls/{streamName}-{timestamp}-{index}.ts` // 注意,hls的url_pattern不能和httpflv、httpts的url_pattern相同 - "out_path": "/tmp/lal/hls/", //. HLS文件保存根目录 + "out_path": "./lal_record/hls/", //. HLS文件保存根目录 "fragment_duration_ms": 3000, //. 单个TS文件切片时长,单位毫秒 "fragment_num": 6, //. m3u8文件列表中ts文件的数量 "cleanup_mode": 1, //. HLS文件清理模式: @@ -56,10 +56,10 @@ "addr": ":5544" //. rtsp推流地址 }, "record": { - "enable_flv": true, //. 是否开启flv录制 - "flv_out_path": "/tmp/lal/flv/", //. flv录制目录 - "enable_mpegts": true, //. 是否开启mpegts录制。注意,此处是长ts文件录制,hls录制由上面的hls配置控制 - "mpegts_out_path": "/tmp/lal/mpegts" //. mpegts录制目录 + "enable_flv": true, //. 是否开启flv录制 + "flv_out_path": "./lal_record/flv/", //. flv录制目录 + "enable_mpegts": true, //. 是否开启mpegts录制。注意,此处是长ts文件录制,hls录制由上面的hls配置控制 + "mpegts_out_path": "./lal_record/mpegts" //. mpegts录制目录 }, "relay_push": { "enable": false, //. 是否开启中继转推功能,开启后,自身接收到的所有流都会转推出去 diff --git a/conf/benchonlyrtmp.conf.json b/conf/benchonlyrtmp.conf.json index 7be9b82..e7244a1 100644 --- a/conf/benchonlyrtmp.conf.json +++ b/conf/benchonlyrtmp.conf.json @@ -23,7 +23,7 @@ "enable": false, "enable_https": false, "url_pattern": "/hls/", - "out_path": "/tmp/lal/hls/", + "out_path": "./lal_record/hls/", "fragment_duration_ms": 3000, "fragment_num": 6, "cleanup_mode": 1, @@ -40,9 +40,9 @@ }, "record": { "enable_flv": false, - "flv_out_path": "/tmp/lal/flv/", + "flv_out_path": "./lal_record/flv/", "enable_mpegts": false, - "mpegts_out_path": "/tmp/lal/mpegts" + "mpegts_out_path": "./lal_record/mpegts" }, "relay_push": { "enable": false, diff --git a/conf/lalserver.conf.json b/conf/lalserver.conf.json index a6cd727..e55f72f 100644 --- a/conf/lalserver.conf.json +++ b/conf/lalserver.conf.json @@ -23,7 +23,7 @@ "enable": true, "enable_https": false, "url_pattern": "/hls/", - "out_path": "/tmp/lal/hls/", + "out_path": "./lal_record/hls/", "fragment_duration_ms": 3000, "fragment_num": 6, "cleanup_mode": 1, @@ -40,9 +40,9 @@ }, "record": { "enable_flv": false, - "flv_out_path": "/tmp/lal/flv/", + "flv_out_path": "./lal_record/flv/", "enable_mpegts": false, - "mpegts_out_path": "/tmp/lal/mpegts" + "mpegts_out_path": "./lal_record/mpegts" }, "relay_push": { "enable": false, diff --git a/conf/lalserver.conf.json.tmpl b/conf/lalserver.conf.json.tmpl index a6cd727..e55f72f 100644 --- a/conf/lalserver.conf.json.tmpl +++ b/conf/lalserver.conf.json.tmpl @@ -23,7 +23,7 @@ "enable": true, "enable_https": false, "url_pattern": "/hls/", - "out_path": "/tmp/lal/hls/", + "out_path": "./lal_record/hls/", "fragment_duration_ms": 3000, "fragment_num": 6, "cleanup_mode": 1, @@ -40,9 +40,9 @@ }, "record": { "enable_flv": false, - "flv_out_path": "/tmp/lal/flv/", + "flv_out_path": "./lal_record/flv/", "enable_mpegts": false, - "mpegts_out_path": "/tmp/lal/mpegts" + "mpegts_out_path": "./lal_record/mpegts" }, "relay_push": { "enable": false, diff --git a/test.sh b/test.sh index 27cde3e..dfcf61b 100755 --- a/test.sh +++ b/test.sh @@ -83,5 +83,6 @@ done rm -rf ./pkg/logic/logs ./pkg/rtmp/logs ./pkg/httpflv/logs ./pkg/hls/logs #rm -rf ./pkg/logic/testdata ./pkg/rtmp/testdata ./pkg/httpflv/testdata ./pkg/hls/testdata +rm -rf ./pkg/logic/lal_record ./pkg/rtmp/lal_record ./pkg/httpflv/lal_record ./pkg/hls/lal_record echo 'done.'