amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-29 22:55:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,901 Commits 16 Branches 0 Tags 225 MiB
01086d8eaa
Commit Graph

1568 Commits

Author SHA1 Message Date
xiongziliang
49f59fb993 Merge branch 'feature/ps-decoder-cache-buffer' of https://github.com/xia-chu/ZLMediaKit 2021-07-18 19:43:12 +08:00
夏楚
6dbad3fb59
Merge pull request #992 from ZLMediaKit/feature/ignore-hik-ps-0xbd 
忽略海康 PS 流中的 0xBD 包
 2021-07-18 19:40:38 +08:00
wxf
f0c5633bfb Http/HttpRequestSplitter: 添加使用注意事项 2021-07-18 17:36:46 +08:00
wxf
2f82c89278 忽略海康 PS 流中的 0xBD 包 2021-07-18 17:31:27 +08:00
wxf
9dd602c242 GB28181Process: 不再需要缓存未处理完的 PS/TS 帧 
* PS 帧已由 PSDecoder 缓存;
* TS 帧在 TSDecoder 中有判断是否为 TS, 即使出错缓存也无意义;
 2021-07-18 15:08:49 +08:00
wxf
5172b846d3 PSDecoder: 缓存未处理完的数据 2021-07-18 15:08:44 +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
c25da5a222 修复H265 vlc帧判断逻辑bug 2021-07-15 17:36:44 +08:00
ziyue
8d5f29d94c Merge branch 'feature/find-async-by-session' of https://github.com/xia-chu/ZLMediaKit 2021-07-15 11:50:10 +08:00
ziyue
c8f00cefa0 完善获取flv是否包含音视频相关逻辑 2021-07-15 11:29:21 +08:00
wxf
ece7186e6c 改为按 Session 查找媒体源以支持 TCP/UDP Session 2021-07-15 11:25:48 +08:00
ziyue
fe42ea30fc 整理flv复用器 2021-07-15 11:16:11 +08:00
ziyue
b12bd6e7ff 格式化代码 2021-07-14 21:41:26 +08:00
ziyue
09d7670fdf 收到sender report包前，通过系统时间戳产生ntp时间戳 2021-07-14 21:41:13 +08:00
ziyue
6ddd420f1c 修复webrtc rtx包计入receiver report统计导致simulcast推流失效的问题 2021-07-14 21:40:08 +08:00
ziyue
6bc39058ab 加大时间戳跳变容忍度，防止网络抖动时导致音视频不同步 2021-07-13 17:30:54 +08:00
ziyue
77283f3973 优化ntp时间戳获取性能 2021-07-13 10:10:23 +08:00
ziyue
1cf79e886b 新增rtp时间戳大幅跳跃处理逻辑 2021-07-12 21:47:56 +08:00
ziyue
298f6e3864 rtp使用ntp时间戳作为时间戳,用于实现rtsp音视频同步 2021-07-12 21:18:22 +08:00
yangkun
03f6f4c4c0 fix publish type 2021-07-09 14:58:58 +08:00
ziyue
9217a5dbcd 精简代码 2021-07-09 14:04:34 +08:00
ziyue
4b0d0efdfb 修复笔误 2021-07-09 14:02:25 +08:00
ziyue
35d9321b93 整理H264/H265 Frame对象及相关代码 2021-07-09 13:38:20 +08:00
ziyue
4fb4471647 修复265 rtmp/flv相关bug:#965 2021-07-08 17:09:42 +08:00
ziyue
4b694ccde8 http-ts直播减少一次内存拷贝 2021-07-07 16:17:56 +08:00
ziyue
039be5444e 修复m3u8中extinf不准的问题：#816 2021-07-07 11:53:01 +08:00
ziyue
03addaf0b7 由于frame merge时已经过滤无效帧，所以移除多余代码 2021-07-07 11:37:22 +08:00
ziyue
59131e3b0a 修复ts/ps解析后组帧逻辑bug：#964 2021-07-07 11:02:36 +08:00
xiongziliang
9f9b3a5a64 提高http-ts直播性能：#961 2021-07-06 23:57:39 +08:00
xiongziliang
c393cc7c0e 修复GB28181粘帧导致花屏的问题: #964,#954 2021-07-06 23:37:04 +08:00
xiongziliang
986e9511a2 完善rtt相关代码 2021-07-06 23:09:56 +08:00
ziyue
4c296488f1 修复rtcp rr/sr时间戳转换相关问题,计算rtt 2021-07-06 21:48:51 +08:00
ziyue
1485be266a 查找MediaSource时，app与stream id不能为空 2021-07-01 10:56:59 +08:00
xiongziliang
09fa6b7aae 精简代码 2021-06-30 23:35:19 +08:00
xiongziliang
c470016316 优化MediaSource遍历性能 2021-06-30 23:03:27 +08:00
ziyue
69c3b24d06 优化遍历MediaSource接口性能 2021-06-30 21:24:16 +08:00
ziyue
66f28f52b4 添加Ptr定义 2021-06-29 17:42:32 +08:00
ziyue
df377fc1f4 修改宏定义，防止频繁重新全量编译 2021-06-29 17:41:56 +08:00
ziyue
3165a2f81c 修改服务器版本信息声明相关代码 2021-06-29 11:16:05 +08:00
ziyue
dfbfd65ab3 宏定义移至macros.h文件 2021-06-28 20:29:56 +08:00
ziyue
de5cf86050 http最大请求加大到40 KB 2021-06-28 20:12:35 +08:00
ziyue
397c1c7c57 整理宏 2021-06-28 20:12:07 +08:00
ziyue
48d82daa5c 添加bom头 2021-06-28 16:02:13 +08:00
ziyue
8f730b8dab 整理代码 2021-06-28 10:36:50 +08:00
ziyue
430229fe94 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev_test 2021-06-28 10:11:39 +08:00
ziyue
02bd01c83b 完善http option命令 2021-06-28 10:10:09 +08:00
夏楚
fae86a9b4b !11 合帧逻辑 加强判断，防止 SPS PPS VPS 作为一帧，rtmp h264/h265 打包 保证帧内必须有VCL 
Merge pull request !11 from xiongguangjie/dev
 2021-06-28 02:02:49 +00:00
xiongziliang
3f36a10bee Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-26 18:28:31 +08:00
夏楚
4609716ba3
Merge pull request #933 from CharleyWangHZ/master 2021-06-26 03:55:17 +08:00
xiongguangjie
6d8d64caf6 for mergen 2021-06-25 21:24:53 +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
CharleyWangHZ
332e8fa180
Update HttpSession.cpp 2021-06-25 11:17:21 +08:00
CharleyWangHZ
248c9e8f9a
Update HttpSession.h 2021-06-25 10:59:56 +08:00
CharleyWangHZ
e3d17848f6
Update HttpSession.cpp 2021-06-25 10:59:06 +08:00
ziyue
3862c8f1da 删除多余行 2021-06-24 17:53:37 +08:00
xgj
e9d28c1386 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-24 11:53:15 +08:00
ziyue
307be4339f Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test 2021-06-23 17:32:09 +08:00
ziyue
8717cd2f3d 优化代码 2021-06-23 11:09:53 +08:00
ziyue
d9de40526d 解决开启rtp推流鉴权导致udp丢包的问题，提升GB28181推流秒开体验 2021-06-23 11:02:39 +08:00
ziyue
e8c9666af0 支持hls直播文件延时删除: #913 2021-06-23 10:30:58 +08:00
xiongziliang
ce2122d3b6 优化rtmp chunk相关处理代码 2021-06-22 10:39:16 +08:00
ziyue
510d908bc4 rtp服务器支持opus推流 2021-06-21 20:32:13 +08:00
ziyue
c90f348801 RTP服务器支持ES混合流, 同时新增H265/G711的支持 2021-06-21 20:00:58 +08:00
ziyue
caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-21 17:51:15 +08:00
xiongguangjie
9b111fac62 add to do for h265 rtmp 2021-06-19 02:01:28 +08:00
xiongguangjie
d215502ff5 rtmp packet must has vlc when flush 2021-06-19 01:54:57 +08:00
xiongguangjie
a28aeb2148 for frame merge must has vlc(video codec layer) data and flush rtmp a frame must has vcl 2021-06-19 01:27:13 +08:00
xgj
2335043cdf drop SEI and AUD for h264 and h265 avoid sei as a frame 2021-06-18 15:19:21 +08:00
xgj
a6e9652da8 for h264/h265 judge a frame start more safe(h264 is first_mb_in_slice h265 is first_slice_segment_in_pic_flag) and for h265 only idr is key frame 2021-06-18 12:40:42 +08:00
xgj
3429690d75 for h264 pps sps aud sei not check first_mb_in_slice 2021-06-17 19:26:58 +08:00
xgj
1920802764 for h264 multi slice on frame compatibility 2021-06-17 18:08:35 +08:00
ziyue
f8467f21fb 推流失败时打印日志 2021-06-17 11:34:24 +08:00
ziyue
60a2346819 媒体源注销后不做无谓推流重试 2021-06-17 11:32:57 +08:00
ziyue
752590f804 完善addStreamPusherProxy相关功能并修复自动删除相关的bug 2021-06-17 11:01:14 +08:00
monktan
cd7ae27276 添加推流代理器 2021-06-16 19:40:08 +08:00
ziyue
fadef1cac3 完善添加track日志打印 2021-06-16 11:39:46 +08:00
ziyue
807f9626d5 webrtc新增对av1的支持 2021-06-16 11:14:10 +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
14d70426ed 加快GB28181推流时注册速度 2021-06-16 10:26:17 +08:00
ziyue
a09de23271 修复调用mk_media_stop_send_rtp函数导致崩溃的bug 2021-06-16 10:14:24 +08:00
ziyue
4d0db1b7c1 兼容时间戳不规范的H265流：#894 2021-06-15 12:55:55 +08:00
ziyue
92f879d703 完善PlayerProxy关闭机制,重试次数超限后自动关闭 2021-06-09 15:01:45 +08:00
ziyue
ad2cd11eec 优化判断h265是否为关键帧的代码 2021-06-09 10:19:58 +08:00
baiyfcu
ca192a4286 H265 I帧多slice情况下导致花屏问题 
H265 I帧分片多包情况下，GPO缓冲只保存了I帧最后一个分片导致花屏
 2021-06-09 09:51:28 +08:00
ziyue
b0af056356 删除过多的日志 2021-06-08 21:06:14 +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
40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 17:52:44 +08:00
ziyue
6ccf512367 完善内存统计 2021-06-08 17:49:12 +08:00
ziyue
0593f65fcb 完善代码 2021-06-08 14:50:12 +08:00
ziyue
e88281b2ff 删除无效代码 2021-06-08 14:49:48 +08:00
ziyue
9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-06-08 14:41:52 +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
c4817c6d5f GB28181单端口接收流支持多线程 2021-06-08 14:03:25 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xgj
8721c5a62b for joy4 rtmp push onMetaData compatibility 2021-06-08 10:07:51 +08:00
xgj
0f3a8f4a9d fix webrtc to rtmp multi slice on frame error 2021-06-07 17:32:28 +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
975c11b74c 支持http响应无content-length字段的情况:#850 2021-05-22 10:22:56 +08:00
xiongziliang
7067472a18 转协议支持全局关闭音频:#883 2021-05-22 10:17:52 +08:00
xiongziliang
f54e02f511 修复http文件服务器相关bug 2021-05-22 09:28:19 +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
xiongziliang
08d4edddb0 修复http文件服务器相关bug 2021-05-22 09:13:00 +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
125b703ea9 Merge remote-tracking branch 'origin/master' 2021-05-15 09:57:21 +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
xiongziliang
e8d3dec050 getBitArray方法返回nack第一个包状态 2021-05-11 00:34:17 +08:00
xiongziliang
ec8e518180 完善fci相关代码 2021-05-10 23:27:11 +08:00
xia-chu
45abc23e87 放宽fci长度校验 2021-05-10 10:14:00 +08:00
xiongziliang
0377796c03 修复clang下编译警告和错误 2021-05-08 19:33:51 +08:00
xia-chu
842257edaa 完善rtcp ext 2021-05-06 12:02:16 +08:00
xia-chu
cbee3210a0 完善twcc fci 2021-05-06 12:01:56 +08:00
xia-chu
6274cbdd28 统一代码风格 2021-04-30 14:31:08 +08:00
夏楚
1d0eca512b !6 优化rtsp推流单个Track其他协议的注册速度，不需要等待3s 
Merge pull request !6 from xiongguangjie/dev
 2021-04-30 14:29:36 +08:00
xia-chu
3cc640f96e 删除无效配置 2021-04-30 11:44:06 +08:00
xia-chu
88e1c323c3 删除无效配置 2021-04-30 09:24:09 +08:00
xgj
5145c7e658 optimize one track ready speed not wait 3000ms 2021-04-29 18:36:04 +08:00
xia-chu
e021279fab 修复"Too short data for FU-A H.264 RTP packet"的问题 2021-04-28 16:07:01 +08:00
xia-chu
514a028eac 修复fu-a打包时，无rtp负载的情况 2021-04-28 16:03:05 +08:00
xia-chu
ac55ae79fb 修复fci内存越界问题 2021-04-28 13:55:00 +08:00
xia-chu
1d84bb5458 完善twcc相关逻辑 2021-04-26 21:50:31 +08:00
xia-chu
6c951c8ca9 完善rtcp padding相关逻辑 2021-04-26 21:50:10 +08:00
xia-chu
2d8ef45e4d 完善fci相关代码 2021-04-26 21:03:04 +08:00
xia-chu
aa54adb1ab 修复编译问题 2021-04-26 20:29:06 +08:00
xia-chu
cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-26 19:50:17 +08:00
xia-chu
af2b1246fd 统一帧合并逻辑 2021-04-26 18:35:01 +08:00
xia-chu
a28c76a33c 限制未就绪状态track的最大帧缓存数量 2021-04-26 14:58:06 +08:00
xia-chu
fbc8c2286e 等待添加fci相关适配代码 2021-04-23 18:30:37 +08:00
xia-chu
8702ad101b 完善rtcp feedback相关代码 2021-04-23 18:27:47 +08:00
xia-chu
93160c0ec7 添加rtpfb枚举与工具类 2021-04-23 15:25:33 +08:00
xia-chu
48338af700 完善FCI相关代码 2021-04-23 15:06:55 +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
99a1d06d9b 修正TWCC错误理解 2021-04-22 18:56:12 +08:00
xia-chu
90ad90cb78 初步完成TWCC包的解析 2021-04-22 17:34:26 +08:00
xia-chu
5db6154707 添加TWCC部分代码 2021-04-22 11:43:33 +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
9b951ab69a 单track情况下最多等待3秒 2021-04-20 17:32:40 +08:00