amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,330 Commits 16 Branches 0 Tags 225 MiB
2cc69d1be6
Commit Graph

604 Commits

Author SHA1 Message Date
xiongziliang
8324a9fe43 修复rtsp推流访问空指针的bug:#1456 2022-02-28 17:20:20 +08:00
xiongziliang
b82cd5a500 确保ntp时间戳获取失败时，webrtc rtp重传缓存列队长度正常 2022-02-27 01:02:54 +08:00
ziyue
147ba6147c rtsp/rtp: 过滤干扰的rtp pt, 提高兼容性: #1445 2022-02-22 16:53:05 +08:00
ziyue
72caa43c97 主动关闭的流不支持断流续推: #1401 2022-02-09 14:31:40 +08:00
夏楚
c72cf4cbcc
整理命名空间 (#1409) 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
 2022-02-02 20:34:50 +08:00
JayChen0519
a3e628449e
解决rtsp以MULTICAST方式拉流导致的奔溃问题 (#1368) 2022-01-14 13:14:30 +08:00
ziyue
d52fc4c31f Refine: 优化rtsp相关代码 2022-01-12 15:24:28 +08:00
ziyue
412d280cd7 修复断连续推转协议失效的bug 2022-01-10 17:34:39 +08:00
ziyue
1dabc22347 修正错误注释 2022-01-10 17:00:25 +08:00
ziyue
f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
xiongziliang
6e445614b4 申请udp端口使用全局互斥锁保护，防止端口重复分配 2022-01-08 16:07:08 +08:00
ziyue
5a592e6db6 优化循环池性能 2022-01-06 14:30:44 +08:00
ziyue
7f6be9e118 Refine: 消除编译警告 2021-12-30 15:28:27 +08:00
xiongguangjie
50c6c2513d
修复rtsp tcp 推送到 rtsp-simple-server 失败的问题， (#1274) 
* for push rtsp  to rtsp-simple-server remeber annoce response sessionid and setup tcp add mode=record

* fix  push rtsp  to rtsp-simple-server over udp error add mode=record

* 优化代码

Co-authored-by: 夏楚 <771730766@qq.com>
 2021-12-14 17:17:05 +08:00
ziyue
afdc5e4267 Refine: 优化tcp/udp服务器异常管理断开机制 2021-11-19 15:26:33 +08:00
ziyue
b7e187d7af Player: 添加kWaitTrackReady选项决定播放器是否等待所有track ready再回调 2021-11-10 13:56:04 +08:00
ziyue
e38f2253ff Demuxer: 解复用减少一次MediaSink的数据过滤 2021-11-10 13:44:29 +08:00
ziyue
fdfde17ec7 Demuxer/Player: 修改解复用与播放器底层逻辑，确保触发播放成功回调时不丢帧 2021-11-10 11:38:54 +08:00
ziyue
37fdb8d135 MediaSource: 继承改成私有 2021-11-10 11:38:54 +08:00
ziyue
dad0c5e3cc MediaPusher: 抽象精简代码 2021-11-09 17:49:18 +08:00
ziyue
cd52a022f4 修复rtsp点播时长不准的bug 2021-10-25 19:39:45 +08:00
ziyue
f5f58196b5 修改常量命名 2021-10-16 16:58:03 +08:00
Johnny
722097be05 调整 RtspSession::_push_src类型，统一为 RtspMediaSource::Ptr _push_src; 2021-10-15 18:25:06 +08:00
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
Johnny
c98e85caec 增加 RtcpContextForSend/RtcpContextForRecv作为RtcpContext子类 2021-10-15 11:21:10 +08:00
ziyue
dd81497e5c 修复rtp pts 时间戳回退导致ntp时间戳计算异常的bug:#1152 2021-10-13 15:52:12 +08:00
xiongziliang
4ff206fa42 兼容一些不规范的rtsp sdp: #1128 2021-09-29 01:16:52 +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
ziyue
e9008afca0 addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
ziyue
415bc95dda 完善ntp时间戳计算逻辑 2021-09-02 21:39:10 +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
07c5341fb0 兼容一些奇怪的rtsp流:#1031 2021-08-23 21:29:23 +08:00
ziyue
b3ad0891e6 修复除0的bug 2021-08-22 15:13:20 +08:00
xiongziliang
41c09757a7 解决GB28181推流无ntp时间戳导致的问题 2021-08-21 18:52:52 +08:00
ziyue
7b60f8b093 优化完善代码 2021-08-12 20:55:11 +08:00
ziyue
4dbe0a1d3e 合并pr：#1025 2021-08-12 20:37:46 +08:00
ziyue
30b139eaf0 Merge branch 'feature_bafc' of https://github.com/xia-chu/ZLMediaKit 2021-08-12 11:18:34 +08:00
monktan
7ed7e5386c rtp包最大大小可配置 2021-08-11 15:48:15 +08:00
baiyfcu
0ed902509a player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件 2021-08-09 18:28:43 +08:00
lawrencehj
b6ce03b64f 解决Windows下编译出错问题 2021-07-19 10:31:24 +08:00
wxf
b891fc5654 _rtp_sort_cache_map -> _pkt_sort_cache_map, 不依赖于 RTP 2021-07-17 20:00:09 +08:00
wxf
ac01dc97af 修正对非 uint16_t 序号的支持 2021-07-17 20:00:02 +08:00
ziyue
892b2d2ef9 修复对象同名导致的bug 2021-07-16 15:58:01 +08:00
ziyue
8548753c28 修正SDES rtcp对象命名 2021-07-15 17:38:04 +08:00
ziyue
b12bd6e7ff 格式化代码 2021-07-14 21:41:26 +08:00
ziyue
6ddd420f1c 修复webrtc rtx包计入receiver report统计导致simulcast推流失效的问题 2021-07-14 21:40:08 +08:00
ziyue
298f6e3864 rtp使用ntp时间戳作为时间戳,用于实现rtsp音视频同步 2021-07-12 21:18:22 +08:00
ziyue
4c296488f1 修复rtcp rr/sr时间戳转换相关问题,计算rtt 2021-07-06 21:48:51 +08:00
ziyue
3165a2f81c 修改服务器版本信息声明相关代码 2021-06-29 11:16:05 +08:00
ziyue
a7f75774e9 整理RtpReceiver相关代码 2021-06-25 16:24:44 +08:00
ziyue
964cf39145 RtcpContext修改时间戳单位、整理WebRTC相关代码 2021-06-25 14:59:27 +08:00
ziyue
caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-21 17:51:15 +08:00
ziyue
f8467f21fb 推流失败时打印日志 2021-06-17 11:34:24 +08:00
ziyue
a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
ziyue
55c2b08c57 rtsp播放器在udp情况下超时时间延长4倍(防止vlc超时) 2021-06-08 20:51:54 +08:00
ziyue
98dc9bc78e ssrc切换时间改为3秒:#899 2021-06-08 20:05:45 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
ziyue
8f62365847 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-26 10:43:52 +08:00
夏楚
3b4e7619ad
Merge pull request #865 from yapingcat/master 
fix bug rtcp sr包的 ssrc 和rtp包中ssrc的不一致
 2021-05-22 11:04:50 +08:00
xiongziliang
9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-05-22 10:25:05 +08:00
xiongziliang
8cbec43ee8 合并代码 2021-05-22 09:26:49 +08:00
xiongziliang
a391d1e289 修复rtsp推流带参相关的bug:#840 2021-05-22 09:25:24 +08:00
yapingcat
3c49b3737e fix bug rtcp sr包的 ssrc 和rtp包中的一致 2021-05-17 09:20:03 +08:00
xiongziliang
d395d23eeb 由于在RtspSession类确保了函数执行顺序，所以回滚多余代码也能确保单track流迅速注册 2021-05-15 10:05:47 +08:00
xiongziliang
4cd618899b Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-15 10:02:58 +08:00
xiongziliang
e807a08f2e 单track rtsp推流加快媒体注册速度 2021-05-15 09:56:35 +08:00
xia-chu
5c90a1e137 完善nack与丢包重传 2021-05-11 11:18:55 +08:00
xia-chu
842257edaa 完善rtcp ext 2021-05-06 12:02:16 +08:00
xia-chu
6274cbdd28 统一代码风格 2021-04-30 14:31:08 +08:00
xgj
5145c7e658 optimize one track ready speed not wait 3000ms 2021-04-29 18:36:04 +08:00
xia-chu
743862d786 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-23 09:43:08 +08:00
xiongziliang
259247132a Merge remote-tracking branch 'origin/master' 2021-04-22 22:13:17 +08:00
xiongziliang
f70bfb5f8b 兼容GB28181 tcp推流缓存覆盖的垃圾设备 2021-04-22 22:02:21 +08:00
xia-chu
dc3d59952e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-20 17:58:21 +08:00
xia-chu
0bb87858a3 提升单track情况下秒开体验 2021-04-20 17:53:43 +08:00
xia-chu
c4fd9e294a Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-14 09:25:56 +08:00
xia-chu
29c8c9bf26 Merge remote-tracking branch 'origin/dev' into dev 2021-04-13 18:51:16 +08:00
夏楚
136d126e74 Update RtpReceiver.cpp 2021-04-13 08:28:23 +08:00
xia-chu
8a51bd2d9e 新增rtp ssrc异常处理逻辑 2021-04-11 20:35:00 +08:00
xiongziliang
8b7289a689 rtsp推流支持关闭直接代理模式 2021-04-11 12:06:40 +08:00
xiongziliang
012f58d27c 添加rtp 调试接口 2021-04-11 01:15:02 +08:00
xia-chu
9b7c9b9109 兼容sdp不规范的rtsp流 2021-02-28 21:02:23 +08:00
xia-chu
a19f67679a 兼容一些rtsp流 #735 2021-02-21 21:27:26 +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
c5cfbce241 优化rtp性能 2021-02-06 20:10:33 +08:00
xia-chu
34bbfc8bcb 修复编译警告 2021-02-06 20:10:32 +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
xiongziliang
e695d76ce9 整理代码 2021-01-31 21:09:25 +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
5c6560f55d 重写rtcp框架 2021-01-31 19:33:33 +08:00
xiongziliang
ae8588089d 修复windows下组播拉流失败的问题:#708 2021-01-31 19:08:58 +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
d879c5901d 延迟清空状态 2021-01-17 10:28:06 +08:00
xiongziliang
c445ad2cdf 修复rtsp播放器在处理rtp包时，清空状态导致的bug 2021-01-17 10:25:00 +08:00
xiongziliang
4b22e189d5 轮流发送rtcp与GET_PARAMETER保活:#642 2021-01-02 22:32:13 +08:00
陈晓林
2cb2fa1510
修复拉取rtsp流 SETUP 返回 454 Session Not Found 2020-12-29 12:16:35 +08:00
夏楚
537ae2f412
Merge pull request #651 from sunhui2013/master 
添加停止、恢复rtp代理rtp超时检查功能,解决播放器暂停后断流问题
 2020-12-27 20:56:33 +08:00
ziyue
2941068724 优化rtsp客户端代码 2020-12-27 18:11:10 +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
76a55c6c08 修复笔误 2020-12-19 18:59:22 +08:00
xiongziliang
544797e501 解决rtsp播放器TEARDOWN不传url的问题：#631 2020-12-19 09:20:24 +08:00
ziyue
dc3701e6cc 修复rtp存在ext时无法解析的bug:#585 2020-12-06 21:08:16 +08:00
ziyue
68926b4ae7 支持bitrate 2020-12-04 16:44:53 +08:00
xiongziliang
bb9b39d821 添加按需转协议开关，默认一直转协议：#569 2020-11-15 00:40:46 +08:00
xiongziliang
57a11f19dd 提高rtsp兼容性: #551 2020-11-07 17:45:58 +08:00
xiongziliang
d36e64eff4 提升性能 2020-11-01 21:33:42 +08:00
xiongziliang
700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
xiongziliang
289e4f695a 校验rtp是否合法 2020-10-24 23:32:43 +08:00
xiongziliang
38a002646d 修复FFmpeg拉流代理功能缺陷的问题：#533 2020-10-24 23:31:58 +08:00
xiongziliang
84784f21c4 优化性能 2020-10-24 23:28:56 +08:00
xiongziliang
02c4aa3f4b 优化代码 2020-10-24 23:28:25 +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
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
7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
xiongziliang
5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang
4f42f508d5 复用代码 2020-09-26 09:39:38 +08:00
xiongziliang
416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang
be1e872f0c 完善按需转协议(包括hls) 2020-09-12 19:20:18 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
xiongziliang
c711eedaa7 适配ZLToolKit代码,支持自定义创建Socket:#468 2020-09-12 19:03:52 +08:00
xiongziliang
ac70597216 优化getTrack接口相关代码 2020-09-06 17:54:52 +08:00
xiongziliang
28262b158f 优化性能 2020-09-06 17:53:22 +08:00
xiongziliang
636068b2b8 精简代码，改善代码结构 2020-09-06 17:52:33 +08:00
xiongziliang
a7e99b9d37 整理代码 2020-08-30 11:40:03 +08:00
xiongziliang
fbd711a6bb 整理代码 2020-08-30 10:48:34 +08:00
xiongziliang
f23e117751 MultiMediaSourceMuxer默认能处理大部分事件 2020-08-08 12:20:13 +08:00
xiongziliang
0087f50aaa 修复rtp组播性能问题 2020-08-08 12:17:43 +08:00
xiongziliang
a22f97c777 rtsp/rtmp/mp4支持opus并整理代码 2020-08-01 10:22:12 +08:00
xiongziliang
c7225dffbc 整理rtsp客户端代码 2020-08-01 10:14:42 +08:00
xiongziliang
7254c39fc2 rtsp推流采用相对时间戳,防止音视频不同步:#392 2020-07-16 16:36:26 +08:00
xiongziliang
b588053571 整理rtsp服务器相关代码 2020-07-10 10:42:23 +08:00
xiongziliang
a164b28608 优化rtp解析代码 2020-07-08 23:23:11 +08:00
xiongziliang
d191347839 修复bug 2020-07-08 22:49:08 +08:00
xiongziliang
d4908c3162 提高rtsp客户端健壮性 2020-07-08 22:29:08 +08:00