Commit Graph

1215 Commits

Author SHA1 Message Date
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