amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-27 05:38:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,377 Commits 16 Branches 0 Tags 225 MiB
e58b9f7faf
Commit Graph

1336 Commits

Author SHA1 Message Date
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
xiongziliang
dd2abd7924 修复拼写错误 2020-10-24 23:30:06 +08:00
xiongziliang
c5f1b4cd52 程序退出时清空RtpProcess对象 2020-10-24 23:29:44 +08:00
xiongziliang
fd898254f2 修复fu rtp打包的bug 2020-10-24 23:29:21 +08:00
xiongziliang
84784f21c4 优化性能 2020-10-24 23:28:56 +08:00
xiongziliang
02c4aa3f4b 优化代码 2020-10-24 23:28:25 +08:00
xiongziliang
44bb1ba5ef rtp端口取偶数:#526 2020-10-20 10:38:31 +08:00
xiongziliang
130c411ae4 修复添加track太晚导致的bug: #528 2020-10-20 10:21:35 +08:00
xiongziliang
b7d6442870 tcp情况下，rtp长度不得超过2K，防止发送端存在缓存覆盖的bug 2020-10-18 23:05:24 +08:00
xiongziliang
e3364e9029 优化代码 2020-10-18 21:39:22 +08:00
xiongziliang
51fcaeda4c 更新第三方库 2020-10-18 21:33:36 +08:00
xiongziliang
fcf641dfb6 优化rtp排序算法 2020-10-17 14:46:59 +08:00
xiongziliang
2965248346 修复std::move后智能指针无效的问题 2020-10-10 18:44:48 +08:00
xiongziliang
209689121a 消除编译警告 2020-10-10 18:36:29 +08:00
xiongziliang
dfaa8b540c 使用临时变量和std::move减少智能指针的拷贝构造 2020-10-10 18:23:25 +08:00
xiongziliang
4d39176877 重写rtp排序算法:#510 2020-10-01 21:33:07 +08:00
xiongziliang
bc36e000b3 提炼rtp排序算法 2020-10-01 19:02:14 +08:00
xiongziliang
a1de3bfd30 添加流创建时间、在线时间 2020-10-01 18:57:15 +08:00
xiongziliang
cd27e5a9f9 注意！hls mp4录制的customized path字段改成录制根目录 相当于配置文件中hls mp4录制根目录相关设置 2020-10-01 14:55:34 +08:00
xiongziliang
728dd3ec3c 合并pr:#509 2020-10-01 14:53:15 +08:00
xiongziliang
eccb1a664c Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit 2020-10-01 13:39:19 +08:00
xiongziliang
7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
qiuzhouwei
4132df89cd 增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等 2020-09-28 10:45:59 +08:00
xiongziliang
bae52db6ba 修复关闭某些功能后，编译失败的问题 2020-09-27 16:54:55 +08:00
xiongziliang
5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang
4f42f508d5 复用代码 2020-09-26 09:39:38 +08:00
xiongziliang
efdc105b40 减少内存拷贝，提升性能 2020-09-21 14:56:58 +08:00
xiongziliang
416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang
08a5891bdc 修复url解析相关bug 2020-09-20 20:15:39 +08:00
xiongziliang
016ca9465f 添加bom头 2020-09-20 19:50:08 +08:00
xiongziliang
d971eccf92 新增支持HTTP-fMP4 WebSocket-fMP4直播 2020-09-20 19:45:37 +08:00
xiongziliang
4ce1a25f09 修复MP4解复用时不写入adts头的问题 2020-09-20 19:45:21 +08:00
xiongziliang
071d0a9fd1 提炼MP4相关接口和代码 2020-09-20 19:45:04 +08:00
xiongziliang
2dd1046131 合并fmp4和mov接口 2020-09-20 19:44:20 +08:00
xiongziliang
d3cb0e3d39 ts直播源注销时关闭播放器 2020-09-20 00:57:34 +08:00
xiongziliang
2d0cf5cdd9 解决http-ts直播与hls直播冲突的问题 2020-09-20 00:55:22 +08:00
xiongziliang
c76930e3cd 支持http-ts/websocket-ts直播 2020-09-20 00:21:46 +08:00
xiongziliang
f84981dc75 合并pr(添加录制ts完成通知): #479 2020-09-20 11:40:42 +08:00
xiongziliang
0fce108de5 Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr 2020-09-20 11:01:45 +08:00
xiongziliang
5104252474 修复HLS直播结束后，最后一个切片无法写入的问题 2020-09-20 10:56:54 +08:00
xiongziliang
100af97d51 修复死锁问题:#486 2020-09-20 10:43:25 +08:00
xiongziliang
07ef417250 优化HLS直播相关代码 2020-09-20 10:13:15 +08:00
xiongziliang
9c873e1d19 去除转协议开关参数 2020-09-20 09:26:00 +08:00
wxf
748bb8e488 统一 mp4 及 ts 录像信息定义 2020-09-15 19:09:26 +08:00
wxf
b22a6e3dbd 添加 ts 切片是否通知选项, 默认为不通知 2020-09-15 17:46:12 +08:00
wxf
188e087fc2 添加 hls ts 切片录制完成通知 2020-09-14 13:20:45 +08:00
wxf
a024c51536 修正警告: moving a local object in a return statement prevents copy elision 
https://www.viva64.com/en/w/v828/

编译器会对返回本地变量优化([Named] Return Value Optimization (RVO/NRVO)),
无论是 C++11 之前还是之后, 添加 move 后反而会影响该优化.

C++ Core Guidelines F.48: Do not return std::move(local)
 2020-09-13 11:07:19 +08:00
xiongziliang
9b305bd4ae 优化HLS播放个数统计 2020-09-12 21:27:34 +08:00
xiongziliang
d26b751273 修复hls播放器流量统计不准确的bug 2020-09-12 20:52:53 +08:00
xiongziliang
1e1b3794da HLS切片间隔以数据时间戳为准:#463 2020-09-12 20:49:00 +08:00
xiongziliang
1b9550cfc4 修复HLS按需生成相关bug 2020-09-12 20:42:58 +08:00
xiongziliang
3b5053af50 修复关闭HLS后，编译失败的问题 2020-09-12 19:46:58 +08:00
xiongziliang
be1e872f0c 完善按需转协议(包括hls) 2020-09-12 19:20:18 +08:00
xiongziliang
268a7fec10 修复hls播放鉴权相关bug 2020-09-12 19:14:35 +08:00
xiongziliang
898c6ff24f 修复mark bit相关错误 2020-09-12 19:13:58 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
xiongziliang
aff9963f95 兼容某些多帧粘合在一起的流 2020-09-12 19:06:26 +08:00