Commit Graph

1292 Commits

Author SHA1 Message Date
xia-chu 29c8c9bf26 Merge remote-tracking branch 'origin/dev' into dev 2021-04-13 18:51:16 +08:00
xia-chu f939e0a894 添加一些rtcp fci相关定义 2021-04-13 18:50:20 +08:00
xia-chu 46b84fcf39 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-12 13:48:34 +08:00
xia-chu 8a51bd2d9e 新增rtp ssrc异常处理逻辑 2021-04-11 20:35:00 +08:00
xiongziliang 753fe05813 采用pts 2021-04-11 12:07:04 +08:00
xiongziliang 8b7289a689 rtsp推流支持关闭直接代理模式 2021-04-11 12:06:40 +08:00
xiongziliang 012f58d27c 添加rtp 调试接口 2021-04-11 01:15:02 +08:00
xiongziliang b2afae0e8a 暂时屏蔽一些日志 2021-04-07 21:02:28 +08:00
xia-chu 155c59e17e 添加rtc类型的推流 2021-04-07 18:17:49 +08:00
xia-chu f374f72312 添加rtcp bye相关代码 2021-04-07 16:58:05 +08:00
xiongziliang 2abb5078f9 实现rtc转rtsp 2021-04-03 09:34:49 +08:00
ziyue 33d2e71368 合并代码,去除冗余代码 2021-04-02 16:23:40 +08:00
xiongziliang a328520c9c buf fixed 2021-04-01 22:24:35 +08:00
xiongziliang 2434470fb8 G711强制规格 2021-04-01 22:20:29 +08:00
xiongziliang d2fec801c9 兼容不规范的rtmp推流器:#764 2021-04-01 22:03:21 +08:00
xiongziliang 075756c4c6 提升兼容性:#789 2021-04-01 21:46:02 +08:00
ziyue 2065b6fea8 去掉最大枚举定义 2021-03-30 11:51:19 +08:00
ziyue a7a94f0885 sdp相关的代码移动到主目录 2021-03-30 10:59:15 +08:00
xiongziliang 81f29fea61 基本完成sdp的解析和生成 2021-03-28 18:10:43 +08:00
xiongziliang 8aa3ff425b 完善sdp相关定义 2021-03-27 22:23:38 +08:00
ziyue 2f0bdf2724 修复32位编译时,websocket相关bug 2021-03-21 18:22:32 +08:00
xiongziliang f2edf354de rtmp支持更新config帧 2021-03-21 16:50:15 +08:00
ziyue c5b0485519 修复sps太长生成sdp异常的问题 2021-03-18 16:10:46 +08:00
ziyue 51ac93a08c rtp超时检测最多暂停5分钟
更新zltoolkit
2021-03-16 15:37:34 +08:00
ziyue 060b654252 修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟 2021-03-16 11:31:41 +08:00
xiongziliang a0fc494ee3 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit 2021-03-14 10:34:33 +08:00
xiongziliang be8403c31c 完善代码 2021-03-14 10:29:17 +08:00
sunhui f5e8bae760 解决不指定流或者TCP暂停断流问题 2021-03-10 23:17:15 +08:00
xiongziliang c0f4899950 录制接口支持指定切片时间大小:#747 2021-03-07 10:41:57 +08:00
xiongziliang 5b4fe604cb 修复编译警告 2021-03-07 10:05:23 +08:00
xiongziliang 43828d4390 兼容某些rtmp流 2021-03-07 10:04:27 +08:00
xia-chu 9b7c9b9109 兼容sdp不规范的rtsp流 2021-02-28 21:02:23 +08:00
xiongziliang fb3603b433 兼容一些不规范的流 2021-02-28 20:58:30 +08:00
xiongziliang 56f044f8ed 修复线程安全bug 2021-02-28 20:58:25 +08:00
xia-chu 8d50d3c397 分包逻辑添加边界检测代码 2021-02-21 22:24:46 +08:00
xia-chu 0c728827aa 添加全局内存统计功能 2021-02-21 21:28:17 +08:00
xia-chu a19f67679a 兼容一些rtsp流 #735 2021-02-21 21:27:26 +08:00
xia-chu 19f3b1bd6f 防止打印过多调试信息 2021-02-21 21:26:45 +08:00
xia-chu 8d122625c5 修复28181相关bug:#731 2021-02-09 14:19:07 +08:00
xia-chu b7f4eae2bc 修复bug 2021-02-09 14:01:10 +08:00
xia-chu e4904623a7 修复rtmp兼容性bug 2021-02-07 23:01:22 +08:00
xia-chu 1f52c727ca 修复编译警告 2021-02-07 22:56:36 +08:00
xia-chu a142665375 确保线程安全 2021-02-07 22:02:03 +08:00
xia-chu 75d97b9221 优化H264 rtp相关代码 2021-02-07 18:29:48 +08:00
xia-chu 80bcf53ccf 更新ZLToolKit并适配代码 2021-02-06 20:10:34 +08:00
xia-chu 14b318525e 添加rtp rtmp个数统计 2021-02-06 20:10:33 +08:00
xia-chu 62ba87dd0f 优化frame性能及整理代码 2021-02-06 20:10:33 +08:00
xia-chu c5cfbce241 优化rtp性能 2021-02-06 20:10:33 +08:00
xia-chu b0e1d5d6aa 重写rtp去冲突逻辑 2021-02-06 20:10:32 +08:00
xia-chu d6fc56d950 时间戳异常时,确保合并帧逻辑正常:#724 2021-02-06 20:10:32 +08:00