Commit Graph

4229 Commits

Author SHA1 Message Date
ziyue
902c25ae67 删除无效代码 2021-07-20 12:42:53 +08:00
夏楚
09d5fdaf41
Merge pull request #994 from lawrencehj/master
解决Windows下编译出错问题
2021-07-19 10:39:45 +08:00
lawrencehj
b6ce03b64f 解决Windows下编译出错问题 2021-07-19 10:31:24 +08:00
夏楚
f47e1ecd31
Merge pull request #993 from ZLMediaKit/feature/update-splitter-usage
Http/HttpRequestSplitter: 添加使用注意事项
2021-07-18 20:11:59 +08:00
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
夏楚
a9de3723df
Merge pull request #990 from ZLMediaKit/feature/packet-sorter-fix-seq
调整 packet sorter
2021-07-18 19:39: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
54dae13177 Merge branch 'feature/extract-test-case-name' of https://github.com/xia-chu/ZLMediaKit 2021-07-15 11:45:02 +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
wxf
e679404701 tests: 调整测试程序名称获取方式 2021-07-15 11:15:34 +08:00
ziyue
0d48275115 更新zltoolkit库,优化打印日志性能 2021-07-14 21:41:46 +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
xiongziliang
eba3758b30 支持设置、获取线程名 2021-07-10 23:54:08 +08:00
xiongziliang
b9e4350dd2 支持线程帮核 2021-07-10 22:02:59 +08:00
xiongziliang
99a8154fa5 修复webrtc单track功能异常的问题 2021-07-10 20:36:32 +08:00
xiongziliang
76d6e68ecc 修复windows下编译问题:#978 2021-07-10 19:14:53 +08:00
xiongziliang
9a4c179b0d 修复windows下编译问题:#978 2021-07-10 19:13:54 +08:00
夏楚
f29c44cc07
Merge pull request #974 from xyyangkun/master
fix publish type
2021-07-09 15:25:26 +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
d62cdd81b8 webrtc不支持的mline设置为inactive 2021-07-07 17:58:29 +08:00
ziyue
4b694ccde8 http-ts直播减少一次内存拷贝 2021-07-07 16:17:56 +08:00
ziyue
6220db77e8 修复webrtc纯音频推流时不能注册流的bug:#963 2021-07-07 14:47:41 +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
756b6a4cff Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-07-06 23:12:52 +08:00