Commit Graph

1554 Commits

Author SHA1 Message Date
ziyue
a408197493 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-10-15 14:12:41 +08:00
Xiaofeng Wang
fe450ba2cb
支持生成 sdp 时指定端口 (#1161) 2021-10-15 14:10:04 +08:00
Xiaofeng Wang
2a2597a874
初始化内存 (#1162) 2021-10-15 14:09:32 +08:00
ziyue
702c505a17 合并pr:#1158 2021-10-15 11:21:10 +08:00
Johnny
22c68a297e 调整 RtcpContext 成员函数 2021-10-15 11:21:10 +08:00
Johnny
f64129177e 调整 RtcpContext 成员变量 2021-10-15 11:21:10 +08:00
Johnny
c98e85caec 增加 RtcpContextForSend/RtcpContextForRecv作为RtcpContext子类 2021-10-15 11:21:10 +08:00
ziyue
76ae292ae7 防呆设计 2021-10-13 20:56:22 +08:00
ziyue
dd81497e5c 修复rtp pts 时间戳回退导致ntp时间戳计算异常的bug:#1152 2021-10-13 15:52:12 +08:00
xiongziliang
ea1fa03f13 修复twcc fci生成相关bug 2021-10-07 15:39:02 +08:00
xiongziliang
0ae1d46892 基本完成twcc rtcp fci的生成 2021-10-07 12:28:59 +08:00
xiongziliang
e02bc9ce67 修复twcc StatusVecChunk生成相关bug 2021-10-07 12:26:16 +08:00
xiongziliang
dbc377a1f9 初步添加twcc rtcp发送逻辑 2021-10-06 22:42:17 +08:00
ziyue
15edbeac3e 整理http相关代码 2021-09-30 16:10:09 +08:00
夏楚
a548fcd709
Feature/dev (#1143)
* 防止每次cmake后导致重复编译
2021-09-30 11:27:42 +08:00
haorui wang
adc6f652bd
修复zlm推流FMS,修正zlm的RTMP协议 (#1140)
* 修复zlm推流FMS,修正zlm的RTMP协议
Co-authored-by: 夏楚 <771730766@qq.com>
2021-09-29 16:57:19 +08:00
xiongziliang
4ff206fa42 兼容一些不规范的rtsp sdp: #1128 2021-09-29 01:16:52 +08:00
xiongziliang
892e151063 响应http head命令后不关闭socket:#1136 2021-09-29 00:46:09 +08:00
xiongziliang
8d2d1e135c 修改rtsp点播ntp时间戳 2021-09-29 00:25:34 +08:00
xiongziliang
b1666eb651 实现媒体源pause/speed接口:#1129 2021-09-29 00:16:56 +08:00
xiongziliang
507eadf20b Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2021-09-28 22:49:59 +08:00
xiongziliang
7d1b2583e6 优化代码 2021-09-28 22:44:02 +08:00
xiongziliang
305d9bc259 完善twcc rtcp包相关代码 2021-09-28 22:44:02 +08:00
ziyue
3bc0769ccb 完善mk_media接口 2021-09-27 14:34:26 +08:00
ziyue
c493f0da1b 完善添加静音音频相关功能 2021-09-27 14:12:11 +08:00
ziyue
e20718fbde 确保静音音频track不影响后续添加的正常音频track 2021-09-27 13:27:07 +08:00
ziyue
afec4b62b9 全局自动添加静音音频 2021-09-27 13:20:34 +08:00
ziyue
e9008afca0 addTrack/inputFrame接口支持返回值;新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
hejilin
dcb775c6e8 去除非第三方库的编译告警 2021-09-16 16:00:46 +08:00
ziyue
3034f19a66 完善http直播url解析逻辑 2021-09-15 15:31:00 +08:00
ziyue
83ee396405 全局关闭音频时,加快单视频流注册速度 2021-09-14 16:27:11 +08:00
zqsong
23ae6911ab
Update GB28181Process.cpp
修复ENABLE_MP4 false时编译报错
2021-09-04 09:38:23 +08:00
夏楚
ad1ae2ac66
修复ntp时间戳计算精度导致的bug:#1086 2021-09-04 09:28:41 +08:00
ziyue
c2bf2928d0 完善key-value解析代码 2021-09-03 18:11:20 +08:00
ziyue
246f446142 确保http请求合法 2021-09-03 18:02:31 +08:00
ziyue
5f2e4ff2c0 修复http文件目录相关bug:#1083 2021-09-03 17:58:23 +08:00
ziyue
415bc95dda 完善ntp时间戳计算逻辑 2021-09-02 21:39:10 +08:00
ziyue
186c15364a 精简Frame对象实例化相关代码 2021-09-02 10:56:21 +08:00
ziyue
57e91054af 合并日志相关pr: #1077 2021-08-30 20:47:11 +08:00
kevin cheng
7d456a0513 Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit 2021-08-30 19:04:50 +08:00
kevin cheng
5bd169e6de 新增C API 广播日志到上层应用 2021-08-30 19:03:20 +08:00
ziyue
b9a699588e Merge remote-tracking branch 'origin/master' 2021-08-30 18:05:46 +08:00
ziyue
04bf829540 非rtsp协议减少一帧延时 2021-08-30 18:05:21 +08:00
xiongziliang
d2f02c0a0c 修复rtsp sdp解析的bug 2021-08-28 13:02:53 +08:00
ziyue
2242577661 优化解析复杂数据结构配置项时的性能 2021-08-27 11:11:05 +08:00
ziyue
848774271f 合并并完善http虚拟目录相关代码 2021-08-26 19:50:19 +08:00
ziyue
03e9c09c42 修复FullUrl()未url转义导致的bug 2021-08-26 19:10:04 +08:00
baiyfcu
626bf3dcf9 添加http文件服务可挂载物理目录,新增ENABLE_API_STATIC_LIB
sa
2021-08-25 14:30:31 +08:00
ziyue
bb63273c73 计算dts逻辑兼容一些奇怪的rtsp流:#1031 2021-08-23 21:48:30 +08:00
ziyue
07c5341fb0 兼容一些奇怪的rtsp流:#1031 2021-08-23 21:29:23 +08:00