diff --git a/CHANGELOG.md b/CHANGELOG.md index 310677e..226eb89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +#### v0.24.0 (2021-07-31) + +- [feat] lalserver支持用rtsp sub协议拉取rtmp的pub推流 (#97) +- [feat] 新增demo pullrtmp2pushrtsp,可以从远端拉取rtmp流并使用rtsp转推出去 (#96) +- [feat] package rtprtcp: 支持h264,h265,aac rtp打包 (#83) +- [feat] package sdp: 支持sdp打包 (#82) +- [fix] 确保rtsp sub拉流从关键帧开始发送数据,避免因此引起的花屏 +- [fix] rtsp: 提高兼容性。兼容rtsp auth同时存在Digest和Basic两种字段的情况 +- [fix] rtsp: 提高兼容性。兼容rtsp摄像头的sdp中包含aac,但是没有config字段(后续也没有aac rtp包)的情况 +- [fix] rtmp: 提高兼容性。兼容rtmp client session处理对端回复两次publish或play信令的情况 +- [fix] rtmp: 提高兼容性。修复没有解析amf object中null类型数据导致和其他rtmp开源服务无法建连的问题 (#102) +- [fix] rtmp: 信令打包参考本地chunk size +- [fix] rtsp: 修复rtsp sub session没有正常释放导致协程泄漏的问题 +- [fix] 修复lalserver arm32编译失败的问题 (#92) +- [fix] 修复lalserver http服务全部配置为不使用时崩溃的问题 (#58) +- [fix] 修复hls.Muxer没有设置回调会导致崩溃的问题 (#101) +- [fix] 修复demo calcrtmpdelay码率计算大了5倍的问题 (#58) +- [refactor] package httpflv: 新增FlvFilePump,可循环匀速读取flv文件 +- [refactor] package aac: 增加adts, asc, seqheader间的转换代码;重构了整个包 +- [refactor] package avc: 部分函数提供复用传入参数内存和新申请内存两种实现 +- [refactor] demo benchrtmpconnect: 关闭日志,超时时长改为30秒,优化建连时长小于1毫秒的展示 (#58) +- [chore] 增加Dockerfile (#91) + #### v0.23.0 (2021-06-06) - [feat] HTTP端口复用:HTTP-FLV, HTTP-TS, HLS可使用相同的监听端口。HTTPS也支持端口复用 #64 diff --git a/conf/bench.conf.json b/conf/bench.conf.json new file mode 100644 index 0000000..7be9b82 --- /dev/null +++ b/conf/bench.conf.json @@ -0,0 +1,84 @@ +{ + "# doc of config": "https://pengrl.com/lal/#/ConfigBrief", + "conf_version": "v0.2.2", + "rtmp": { + "enable": true, + "addr": ":1935", + "gop_num": 0, + "merge_write_size": 0 + }, + "default_http": { + "http_listen_addr": ":8080", + "https_listen_addr": ":4433", + "https_cert_file": "./conf/cert.pem", + "https_key_file": "./conf/key.pem" + }, + "httpflv": { + "enable": false, + "enable_https": false, + "url_pattern": "/live/", + "gop_num": 0 + }, + "hls": { + "enable": false, + "enable_https": false, + "url_pattern": "/hls/", + "out_path": "/tmp/lal/hls/", + "fragment_duration_ms": 3000, + "fragment_num": 6, + "cleanup_mode": 1, + "use_memory_as_disk_flag": false + }, + "httpts": { + "enable": false, + "enable_https":false, + "url_pattern": "/live/" + }, + "rtsp": { + "enable": false, + "addr": ":5544" + }, + "record": { + "enable_flv": false, + "flv_out_path": "/tmp/lal/flv/", + "enable_mpegts": false, + "mpegts_out_path": "/tmp/lal/mpegts" + }, + "relay_push": { + "enable": false, + "addr_list":[ + ] + }, + "relay_pull": { + "enable": false, + "addr": "" + }, + "http_api": { + "enable": false, + "addr": ":8083" + }, + "server_id": "1", + "http_notify": { + "enable": false, + "update_interval_sec": 5, + "on_server_start": "http://127.0.0.1:10101/on_server_start", + "on_update": "http://127.0.0.1:10101/on_update", + "on_pub_start": "http://127.0.0.1:10101/on_pub_start", + "on_pub_stop": "http://127.0.0.1:10101/on_pub_stop", + "on_sub_start": "http://127.0.0.1:10101/on_sub_start", + "on_sub_stop": "http://127.0.0.1:10101/on_sub_stop", + "on_rtmp_connect": "http://127.0.0.1:10101/on_rtmp_connect" + }, + "pprof": { + "enable": false, + "addr": ":8084" + }, + "log": { + "level": 7, + "filename": "./logs/lalserver.log", + "is_to_stdout": true, + "is_rotate_daily": true, + "short_file_flag": true, + "assert_behavior": 1 + } +}