Commit Graph

2053 Commits

Author SHA1 Message Date
monktan
575a231ba0 新增自定义rtmp command 2020-11-30 10:00:26 +08:00
monktan
8e575c0c78 解决合并冲突 2020-11-24 14:49:21 +08:00
xiongziliang
f7433b0f90 头文件中隐藏不必要的宏,避免宏蔓延:#554 2020-11-21 22:39:32 +08:00
xiongziliang
408a678ade 修复编译问题:#584 2020-11-21 22:32:01 +08:00
xiongziliang
751f42fe1e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src 2020-11-21 22:17:36 +08:00
xiongziliang
9c585ce5a1 http客户端,host字段添加port,防止异常:#579 2020-11-21 22:16:58 +08:00
xiongziliang
f05422bb65 c api支持国标推流:#578 2020-11-21 22:13:08 +08:00
xiongziliang
c512c1a02e 关闭vhost时,m3u8中ts文件不指定vhost:#560 2020-11-21 21:54:12 +08:00
monktan
6e8d19704e Refactoring log 2020-11-18 12:00:23 +08:00
monktan
ccd96f676c 重构变量名 2020-11-17 16:00:37 +08:00
monktan
80ddf018d9 添加用户自定义serverid 2020-11-17 14:59:39 +08:00
monktan
634acdbdaf Merge remote-tracking branch 'upstream/master' 2020-11-17 14:57:15 +08:00
monktan
2975a61d4a 修改配置文件表达错误 2020-11-16 14:58:16 +08:00
夏楚
e89459a935
修正错误 2020-11-16 11:46:04 +08:00
monktan
45ec80656d 修改配置文件表达错误 2020-11-16 10:27:49 +08:00
monktan
50f1b4ad4f Merge remote-tracking branch 'upstream/master' 2020-11-16 10:26:31 +08:00
xiongziliang
1cc3add97f 提升按需转协议性能与体验 2020-11-15 00:59:31 +08:00
xiongziliang
0f54351811 按需转协议默认关闭(意即一直转协议) 2020-11-15 00:43:42 +08:00
xiongziliang
bb9b39d821 添加按需转协议开关,默认一直转协议:#569 2020-11-15 00:40:46 +08:00
xiongziliang
ebbe124d00 修复不能立即关闭拉流代理的问题:#559 2020-11-15 00:00:22 +08:00
xiongziliang
3d8f015f5d GB28181推流,无人观看时不解复用数据 2020-11-14 23:11:28 +08:00
monktan
2b7d8ae295 Merge remote-tracking branch 'upstream/master' 2020-11-09 10:58:45 +08:00
monktan
67d80c94fa 合并代码 2020-11-09 10:58:33 +08:00
xiongziliang
6c8f1c9403 更新ZLToolKit,修复bug: #558 2020-11-08 21:42:36 +08:00
xiongziliang
9618748c65 默认hook地址置空,方便关闭hook
同时整理简化代码
2020-11-08 09:28:46 +08:00
xiongziliang
a93c57eb59 修复ehome推流相关bug: #549 2020-11-07 17:46:37 +08:00
xiongziliang
57a11f19dd 提高rtsp兼容性: #551 2020-11-07 17:45:58 +08:00
xiongziliang
ba7251f345 修复偶尔获取H265宽高失败的问题 2020-11-07 17:45:16 +08:00
xiongziliang
bad419e41f 修复cts小于0的问题 2020-11-07 17:44:30 +08:00
monktan
2107e58295 重置rtmp时间戳 2020-11-03 21:26:48 +08:00
monktan
4fb7e4841f Merge remote-tracking branch 'upstream/master' into master 2020-11-02 10:09:27 +08:00
xiongziliang
d957b6816a rtp推流支持h264负载:#360 2020-11-01 22:27:44 +08:00
xiongziliang
d36e64eff4 提升性能 2020-11-01 21:33:42 +08:00
xiongziliang
69d53990a9 修改默认配置文件 2020-11-01 03:42:51 +08:00
xiongziliang
700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
monktan
67719899b7 remove redundant log 2020-10-28 10:53:19 +08:00
monktan
039ce00211 优化日志流异常标识 2020-10-26 11:26:12 +08:00
monktan
a1fe5ee817 merge upstream 2020-10-25 17:48:37 +08:00
xiongziliang
5c7a08eb7c 添加bom头 2020-10-24 23:37:43 +08:00
xiongziliang
b5a25793c4 修复rtp tcp推流情况下获取Origin相关失败的问题 2020-10-24 23:34:22 +08:00
xiongziliang
d74604e014 支持海康ehome推流 2020-10-24 23:33:58 +08:00
xiongziliang
bb5edcb8b4 更新第三方库 2020-10-24 23:33:40 +08:00
xiongziliang
ab9a605a66 优化代码结构 2020-10-24 23:33:13 +08:00
xiongziliang
289e4f695a 校验rtp是否合法 2020-10-24 23:32:43 +08:00
xiongziliang
18459db8f1 支持ehome推流:#514 2020-10-24 23:32:23 +08:00
xiongziliang
38a002646d 修复FFmpeg拉流代理功能缺陷的问题:#533 2020-10-24 23:31:58 +08:00
xiongziliang
67e49cb66e 修复close stream接口返回code不正确的问题 2020-10-24 23:31:40 +08:00
xiongziliang
8cb564de0a 优化直播源类型说明 2020-10-24 23:31:22 +08:00
xiongziliang
bfdd02905c 重连时,注销直接拉流代理的流:#532 2020-10-24 23:30:25 +08:00
xiongziliang
dd2abd7924 修复拼写错误 2020-10-24 23:30:06 +08:00