Commit Graph

1832 Commits

Author SHA1 Message Date
xiongziliang d30869d0c9 支持获取http反向代理真实客户端ip: #1388 2022-06-18 22:10:46 +08:00
xiongziliang 6291ee704c http文件服务器修复访问安全漏洞 2022-06-18 21:44:16 +08:00
xiongziliang d72af3e61a 兼容不规范的rtsp url: #904 2022-06-18 21:19:26 +08:00
xiongziliang ba0eaf26fc 时间戳跳变最大阈值调整为3秒 2022-06-18 21:08:34 +08:00
xiongziliang b351f4c7e5 优化日志提示 2022-06-18 21:06:18 +08:00
xiongziliang 7f98f9a750 删除重复的获取gmt offset相关代码 2022-06-18 13:27:23 +08:00
custompal 771844d065
去除rtp_sender_mtx (#1722)
* 去除rtp_sender_mtx
* 无人观看定时器指定为MediaSource对象所属poller以确保读取观看数是线程安全的

Co-authored-by: xiongziliang <771730766@qq.com>
2022-06-18 13:22:57 +08:00
xiongguangjie fe652e46b4 rtmp session when client stop publish not set push src null avoid judge player or pusher error 2022-06-16 10:57:48 +08:00
xiongguangjie b22e1cf937 fix g711u or g711a rtp judge error 2022-06-16 10:04:46 +08:00
xiongguangjie 5479820748 const payload type variable start's letter is lower case 2022-06-16 09:59:09 +08:00
xiongguangjie 6a337adc91 for rtp server can config pt 2022-06-15 00:20:53 +08:00
xiongguangjie f8373302d0 change srt streamid like srs srt streamid 2022-06-11 21:37:41 +08:00
xiongziliang 8fba694473 注释多余代码,消除编译警告 2022-06-11 15:14:14 +08:00
xiongziliang fd11c53a78 Merge branch 'feature/srt' of github.com:ZLMediaKit/ZLMediaKit 2022-06-11 15:07:58 +08:00
xiongziliang f6b4eb418f 优化录制相关代码 2022-06-11 14:18:55 +08:00
xiongziliang 97116e1208 完善getOwnerPoller相关逻辑 2022-06-11 13:08:58 +08:00
xiongziliang b6d3ec5251 完善获取丢包率pull request; 新增MediaSource::getOwnerPoller接口 2022-06-11 12:56:03 +08:00
Leon be995f9cd2 !17 【功能请求】 /index/api/getMediaList接口 增加LOSS字段用于统计每个轨道丢包率反馈
* update webrtc/WebRtcPusher.h.
* update webrtc/WebRtcPusher.cpp.
* update webrtc/WebRtcTransport.h.
* update webrtc/WebRtcTransport.cpp.
* update src/Common/MediaSource.h.
* update src/Common/MediaSource.cpp.
* update server/WebApi.cpp.
2022-06-11 04:31:06 +00:00
xiongguangjie 89b135400c Merge remote-tracking branch 'origin/master' into feature/srt 2022-06-04 15:47:47 +08:00
xiongziliang df9a9649b0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-06-04 11:08:13 +08:00
xiongziliang b23cbaa0f8 on_publish hook新增continue_push_ms参数,用于断连续推延时控制 2022-06-04 11:06:35 +08:00
xiongguangjie b9f66ca1ec add srt push string 2022-06-03 20:38:35 +08:00
xiongguangjie 1891c4e391 add srt push type 2022-06-03 15:02:07 +08:00
taojishou 59dcd03b70
修改hls拉流后closestream崩溃的bug (#1678)
* 修改hls拉流后closestream崩溃的bug

Co-authored-by: 夏楚 <771730766@qq.com>
2022-06-01 13:05:49 +08:00
xiongziliang cea30f8180 修复低版本gcc编译问题:#1667 2022-05-29 22:13:07 +08:00
xiongziliang ea6ef2779e 新增url判空逻辑 2022-05-29 21:36:34 +08:00
xiongziliang fd4145a622 完善对rtp负载为空处理逻辑:#1661 2022-05-28 10:34:54 +08:00
xiongziliang 6596eec069 Merge branch 'rtc_audio_delay' of github.com:mtdxc/ZLMediaKit 2022-05-28 10:21:48 +08:00
xiongziliang 93201f40d3 优化日志提示 2022-05-28 09:47:48 +08:00
cqm 3110284302 修复rtc单独播放音频延时高问题 2022-05-27 09:39:03 +08:00
夏楚 e2908e9775
cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660)
* 解决msvc下链接问题
* CMAKE添加自动生成mk api export头文件
* 兼容非cmake构建时情况

Co-authored-by: baiyfcu <baiyfcu@gmail.com>
2022-05-26 20:30:43 +08:00
ziyue cb0e5c6c57 全面更新整理c sdk 2022-05-25 15:51:24 +08:00
ziyue 9736badcea 优化编解码相关代码 2022-05-25 15:51:17 +08:00
ziyue fa70af7cce 移动FFmpeg相关代码 2022-05-25 15:51:02 +08:00
xiongziliang 30dbac2c70 提高对不规范GB28181流的兼容性,防止视频轨道被忽略 2022-05-20 21:52:53 +08:00
xiongguangjie b61cce85bd
修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) (#1644) 2022-05-19 19:01:23 +08:00
ziyue c7d7999f53 兼容gcc4.8编译器 2022-05-18 20:07:54 +08:00
xiongziliang 251fe1f77c 优化随机端口分配逻辑 2022-05-14 23:34:33 +08:00
xiongziliang 8231c5c293 新增GB28181 tcp passive被动发送接口(startSendRtpPassive) 2022-05-14 23:25:22 +08:00
xiongziliang b4166d5cfe 修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635 2022-05-14 17:14:38 +08:00
xiongziliang f1555a5501 防止忽略shutdown事件 2022-05-13 23:54:04 +08:00
xiongziliang 3e869c1f1d 修复https 302 跳转http相关bug 2022-05-13 23:24:17 +08:00
xiongziliang fdbfccb32e hls/http-ts播放器在消费完frame时再触发shutdown事件 2022-05-13 23:22:00 +08:00
xiongziliang 9e6ff0e798 优化头文件引用: #1627 2022-05-13 20:48:22 +08:00
WuPeng 5bc313bafe 增加长期保存hls切片的功能,segKeep=0为不长期保存,segKeep=1为长期保存。此功能部分等效于segNum=0的情况,不同的是这个保留不会在m3u8文件中体现。 2022-05-10 17:32:50 +08:00
ziyue 9861091b18 优先使用ipv4地址 2022-05-10 14:48:05 +08:00
ziyue 45494c020b bug fixed 2022-05-10 10:44:12 +08:00
ziyue d037acbf62 完善ipv6支持 2022-05-08 17:06:10 +08:00
ziyue a44334acaf 全面支持ipv6 2022-05-08 16:33:33 +08:00
xiongziliang a95bf960e0 完善ipv6支持 2022-05-08 09:25:47 +08:00