Commit Graph

1392 Commits

Author SHA1 Message Date
xia-chu f939e0a894 添加一些rtcp fci相关定义 2021-04-13 18:50:20 +08:00
夏楚 136d126e74 Update RtpReceiver.cpp 2021-04-13 08:28:23 +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
xia-chu 52480717e3 p帧时间戳异常时确保rtmp播放正常:#724 2021-02-06 20:10:32 +08:00
xia-chu 34bbfc8bcb 修复编译警告 2021-02-06 20:10:32 +08:00
xia-chu bc6286553a 优化rtmp性能 2021-02-06 20:10:31 +08:00
xia-chu 827158af73 防止未开启录制功能时,使用该功能导致的bug 2021-02-06 20:10:31 +08:00
xia-chu 2b3ce0ec63 流量统计事件确保0字节时也能触发 2021-02-06 20:10:31 +08:00
xia-chu 39229f9e39 修复rtp padding相关bug:#722 2021-02-06 20:10:30 +08:00
xia-chu 3298184c5c 添加打印rtp详情功能 2021-02-06 20:10:30 +08:00
xia-chu 1539e4ed60 优化rtsp性能 2021-02-06 20:10:30 +08:00
xia-chu e4126809a6 实现28181 rtcp保活:#429 2021-02-06 20:10:29 +08:00
xiongziliang e695d76ce9 整理代码 2021-01-31 21:09:25 +08:00
xiongziliang ddd3438fc3 添加bom头 2021-01-31 20:46:55 +08:00
xiongziliang eef5407aab 性能优化 2021-01-31 20:36:19 +08:00
xiongziliang 8db9f86a0a 防止重复添加RtcpContext 2021-01-31 20:26:11 +08:00
xiongziliang 51435d955c 优化rtp统计性能 2021-01-31 20:22:01 +08:00
xiongziliang 070bf19cb5 重写rtp框架 2021-01-31 20:03:51 +08:00
xiongziliang 4d6d56f2b7 消除编译警告 2021-01-31 19:38:01 +08:00
xiongziliang 5c6560f55d 重写rtcp框架 2021-01-31 19:33:33 +08:00
xiongziliang 629c39685b rtp打包添加mark位:#713 2021-01-31 19:18:20 +08:00
xiongziliang ae8588089d 修复windows下组播拉流失败的问题:#708 2021-01-31 19:08:58 +08:00
xiongziliang 837597e162 防止可能内存越界的问题 2021-01-31 18:25:12 +08:00
xiongziliang 0f39565f67 修复http直播不发送content-type的问题 2021-01-31 18:24:03 +08:00
xiongziliang 272d1a8bd9 兼容一些rtmp推流器: #692 2021-01-23 10:06:38 +08:00
xiongziliang aa45590c13 添加对象统计接口 2021-01-23 09:44:37 +08:00
xiongziliang 291caf537a H265 rtp支持聚合包 2021-01-23 09:43:16 +08:00
xia-chu f63b2b1863 去除编译警告,修复bug 2021-01-19 16:05:38 +08:00
xiongziliang 5d752c89b5 修复编译问题 2021-01-17 20:15:08 +08:00
xia-chu b6cbc87712 全面整理代码,去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang 4cae88e242 调整代码 2021-01-17 10:28:52 +08:00
xiongziliang d879c5901d 延迟清空状态 2021-01-17 10:28:06 +08:00
xiongziliang c445ad2cdf 修复rtsp播放器在处理rtp包时,清空状态导致的bug 2021-01-17 10:25:00 +08:00
xiongziliang 2dd87c8b59 修复直接拉流代理失效的bug 2021-01-17 10:22:51 +08:00
xiongziliang a9be01fbec 播放flv流时,非AAC与H264编码时,打印警告日志 2021-01-09 19:03:02 +08:00
夏楚 48a1f6ea6c
兼容rtp时间戳一直为0的流 2021-01-09 17:53:21 +08:00
xia-chu 0e3c21932d 修复编译失败的问题 2021-01-03 15:55:26 +08:00
xiongziliang 4b22e189d5 轮流发送rtcp与GET_PARAMETER保活:#642 2021-01-02 22:32:13 +08:00
monktan 3ddc14d35d 合并pr(#661): 减少unsport code打印,新增git信息获取
(cherry picked from commit 47f2f5b349)
2021-01-02 22:02:23 +08:00
xiongziliang d37607026f 修复编译警告 2021-01-02 21:58:14 +08:00
xiongziliang 9715787060 bug fixed 2021-01-02 21:26:23 +08:00
xiongziliang 13221ad796 http回复根据状态码自动生成status message: #602 2021-01-02 21:24:06 +08:00
xiongziliang c69e9b8ec1 主动发送rtp接口(startSendRtp)支持返回本地端口: #538 2021-01-02 20:43:02 +08:00
xiongziliang 122c853119 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into open_src 2021-01-02 20:06:29 +08:00
xiongziliang bb5223e51a 不识别的rtp payload type按照ps处理:#673 2021-01-02 20:02:38 +08:00
陈晓林 2cb2fa1510
修复拉取rtsp流 SETUP 返回 454 Session Not Found 2020-12-29 12:16:35 +08:00
xiongziliang 61b29efe94 统一代码风格 2020-12-27 21:21:31 +08:00
夏楚 4244cbf29e
Merge pull request #656 from rmokerone/master
RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586)
2020-12-27 21:00:34 +08:00
夏楚 537ae2f412
Merge pull request #651 from sunhui2013/master
添加停止、恢复rtp代理rtp超时检查功能,解决播放器暂停后断流问题
2020-12-27 20:56:33 +08:00
ziyue fd15fe70b2 合并 https://gitee.com/kingyuanyuan/ZLMediaKit 2020-12-27 18:41:53 +08:00
ziyue 2941068724 优化rtsp客户端代码 2020-12-27 18:11:10 +08:00
Liu Jiang 923768623a L16格式消除unknown codec提醒,添加只支持RTSP协议推流拉流提醒 2020-12-26 16:52:36 +08:00
Liu Jiang d270a78089 getTrackType和getCodecName函数适配L16 2020-12-26 16:01:08 +08:00
Liu Jiang 525949c362 将CodecL16放置到enum最后,防止兼容性问题 2020-12-26 16:00:35 +08:00
Liu Jiang 66a3b7a9ca RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586) 2020-12-26 15:08:01 +08:00
sunny cbc1f91904
Update RtpServer.h 2020-12-25 17:08:51 +08:00
sunhui c32c2146b2 添加停止、恢复rtp代理rtp超时检查功能 2020-12-25 16:05:38 +08:00
xiongziliang 584ea17dc5 删除不必要的日志 2020-12-19 19:47:43 +08:00
xiongziliang 250d9f8e54 优化GB28181 tcp推流 2020-12-19 19:46:18 +08:00
xiongziliang 76a55c6c08 修复笔误 2020-12-19 18:59:22 +08:00
xiongziliang 544797e501 解决rtsp播放器TEARDOWN不传url的问题:#631 2020-12-19 09:20:24 +08:00
夏楚 a60cf0b9a4
Merge pull request #635 from mirsfang/master
fix disable hls and rtpproxy compile error
2020-12-19 09:14:48 +08:00
mirs 6c853008fc fix disable hls and rtpproxy compile error 2020-12-18 18:32:12 +08:00
wxf 2242f7ecc5 修正 CentOS 6 下使用 devtoolset 8 编译问题
使用 inttypes.h 提供的 PRIu64 需要定义 __STDC_FORMAT_MACROS,
而 cinttypes 会定义该宏.

https://stackoverflow.com/a/8132440/5218590
2020-12-17 20:47:31 +08:00
xiongziliang 8b134d5b2d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src 2020-12-13 09:56:26 +08:00
xiongziliang f1c9b7b09c 修复播放器线程安全问题:#611 2020-12-13 09:52:00 +08:00
xiongziliang b7d1a5059a 提高rtmp协议兼容性 2020-12-13 09:51:08 +08:00
ziyue dc3701e6cc 修复rtp存在ext时无法解析的bug:#585 2020-12-06 21:08:16 +08:00
xiongziliang b90ebf6511 合并pr:#607 2020-12-05 12:31:28 +08:00
夏楚 955ecde533
Merge pull request #607 from alongL/master
Update HttpTSPlayer.cpp
2020-12-05 12:29:20 +08:00
xiongziliang 3f37ef618d 删除文件太小的录像 2020-12-05 12:25:52 +08:00
xiongziliang 55cf411c1e 支持bitrate 2020-12-05 12:22:17 +08:00
along 7131649779
Update HttpTSPlayer.cpp
保存http status返回值,在非200或206的情况下,不再进行数据判断。
2020-12-03 10:23:46 +08:00
xiongziliang a64ce68592 解决单Track时,等待时间太长的问题 2020-11-29 09:38:04 +08:00
xiongziliang a5b4da7db5 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src 2020-11-29 09:36:12 +08:00
xiongziliang c4c978be44 去除编译警告 2020-11-29 09:34:02 +08:00
xiongziliang e7569c8cbc 删除多余日志 2020-11-29 09:33:49 +08:00
sunhui 48788cf25b 解决RtpServer启动UDPServer收流造成崩溃问题 2020-11-28 02:39:21 +08:00
hewenyuan 50927548e9 增加多路RTP视频流输出 2020-11-27 17:19:55 +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 9c585ce5a1 http客户端,host字段添加port,防止异常:#579 2020-11-21 22:16:58 +08:00
xiongziliang c512c1a02e 关闭vhost时,m3u8中ts文件不指定vhost:#560 2020-11-21 21:54:12 +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
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
xiongziliang d957b6816a rtp推流支持h264负载:#360 2020-11-01 22:27:44 +08:00
xiongziliang d36e64eff4 提升性能 2020-11-01 21:33:42 +08:00
xiongziliang 700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +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 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 8cb564de0a 优化直播源类型说明 2020-10-24 23:31:22 +08:00
xiongziliang bfdd02905c 重连时,注销直接拉流代理的流:#532 2020-10-24 23:30:25 +08:00